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

blockpool rewritten , tests broken FIXME

Browse Source
This commit is contained in:
zelig
2014-12-14 18:08:18 +00:00
parent 4dfce4624d
commit 01dc1c1394
2 changed files with 8 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eth/block_pool.go
View File

@ -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,