diff options
| author | zelig <viktor.tron@gmail.com> | 2014-12-15 04:08:24 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-12-15 04:53:20 +0800 |
| commit | 4c89d5331f41fa93e6840893c6727b05eabe5f99 (patch) | |
| tree | dd221008e8ee584a574148a53dc8e228cdf95bec | |
| parent | 61940b2275a8f3c77d906947b2d1126bb6c3b21d (diff) | |
| download | dexon-4c89d5331f41fa93e6840893c6727b05eabe5f99.tar dexon-4c89d5331f41fa93e6840893c6727b05eabe5f99.tar.gz dexon-4c89d5331f41fa93e6840893c6727b05eabe5f99.tar.bz2 dexon-4c89d5331f41fa93e6840893c6727b05eabe5f99.tar.lz dexon-4c89d5331f41fa93e6840893c6727b05eabe5f99.tar.xz dexon-4c89d5331f41fa93e6840893c6727b05eabe5f99.tar.zst dexon-4c89d5331f41fa93e6840893c6727b05eabe5f99.zip | |
adapt blockpool/backend to use pow/ezp with pow.Block for VerifyPoW func
| -rw-r--r-- | eth/backend.go | 7 | ||||
| -rw-r--r-- | eth/block_pool.go | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/eth/backend.go b/eth/backend.go index a7824e5d7..6235fc824 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -7,12 +7,12 @@ import ( "sync" "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/event" ethlogger "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" + "github.com/ethereum/go-ethereum/pow/ezp" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/state" ) @@ -111,9 +111,8 @@ func New(db ethutil.Database, identity p2p.ClientIdentity, keyManager *crypto.Ke hasBlock := eth.chainManager.HasBlock insertChain := eth.chainManager.InsertChain - // pow := ezp.New() - // verifyPoW := pow.Verify - verifyPoW := func(*types.Block) bool { return true } + pow := ezp.New() + verifyPoW := pow.Verify eth.blockPool = NewBlockPool(hasBlock, insertChain, verifyPoW) // Start the tx pool 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, |