diff options
| author | zelig <viktor.tron@gmail.com> | 2014-12-15 02:08:18 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-12-15 04:42:08 +0800 |
| commit | 01dc1c13942867d0579f5010a560da4073ece05e (patch) | |
| tree | 204b05bbedbc456583961a6faf7bddbe5bee8ef9 /eth/block_pool.go | |
| parent | 4dfce4624dcc89302ec0b1f22cf853a8382fb7c7 (diff) | |
| download | dexon-01dc1c13942867d0579f5010a560da4073ece05e.tar dexon-01dc1c13942867d0579f5010a560da4073ece05e.tar.gz dexon-01dc1c13942867d0579f5010a560da4073ece05e.tar.bz2 dexon-01dc1c13942867d0579f5010a560da4073ece05e.tar.lz dexon-01dc1c13942867d0579f5010a560da4073ece05e.tar.xz dexon-01dc1c13942867d0579f5010a560da4073ece05e.tar.zst dexon-01dc1c13942867d0579f5010a560da4073ece05e.zip | |
blockpool rewritten , tests broken FIXME
Diffstat (limited to 'eth/block_pool.go')
| -rw-r--r-- | eth/block_pool.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/eth/block_pool.go b/eth/block_pool.go index 7cfbc63f8..a5cda7b58 100644 --- a/eth/block_pool.go +++ b/eth/block_pool.go @@ -55,7 +55,11 @@ 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 { @@ -74,7 +78,11 @@ 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, |