diff options
Diffstat (limited to 'eth/block_pool.go')
| -rw-r--r-- | eth/block_pool.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/eth/block_pool.go b/eth/block_pool.go index a5cda7b58..7cfbc63f8 100644 --- a/eth/block_pool.go +++ b/eth/block_pool.go @@ -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, |