Skip to content

G
Geth-Modification
Commit 01dc1c13 authored by zelig's avatar zelig
Browse files
Options

blockpool rewritten , tests broken FIXME

parent 4dfce462
Expand all Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 292 deletions
eth/block_pool.go
View file @ 01dc1c13
......@@ -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,
......
eth/protocol.go
View file @ 01dc1c13
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment