gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adapt blockpool/backend to use pow/ezp with pow.Block for VerifyPoW func

Browse Source
This commit is contained in:
zelig
2014-12-14 20:08:24 +00:00
parent 61940b2275
commit 4c89d5331f
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eth/block_pool.go
View File

@ -55,11 +55,7 @@ type BlockPool struct {
// the minimal interface with blockchain
hasBlock func(hash []byte) bool
insertChain func(types.Blocks) error
<<<<<<< HEAD
verifyPoW func(pow.Block) bool
=======
verifyPoW func(*types.Block) bool
>>>>>>> blockpool rewritten , tests broken FIXME
}
type peerInfo struct {
@ -78,11 +74,7 @@ type peerInfo struct {
quitC chan bool
}
<<<<<<< HEAD
func NewBlockPool(hasBlock func(hash []byte) bool, insertChain func(types.Blocks) error, verifyPoW func(pow.Block) bool,
=======
func NewBlockPool(hasBlock func(hash []byte) bool, insertChain func(types.Blocks) error, verifyPoW func(*types.Block) bool,
>>>>>>> blockpool rewritten , tests broken FIXME
) *BlockPool {
return &BlockPool{
hasBlock: hasBlock,