diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-21 05:47:27 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-21 05:47:27 +0800 |
| commit | 81800ca39ea03da7f63d8ecfbd74773f4ca73323 (patch) | |
| tree | 6d56577858304d970c7754bcd5ac24c2b282f079 /eth/backend.go | |
| parent | b95ff54632d9a31286f5b629556071b6043d274a (diff) | |
| parent | f4e9638867f5dab01eeb6db5fdbd85737a11fbd6 (diff) | |
| download | dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.gz dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.bz2 dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.lz dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.xz dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.tar.zst dexon-81800ca39ea03da7f63d8ecfbd74773f4ca73323.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eth/backend.go b/eth/backend.go index afe314d74..b086d6a56 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -195,7 +195,8 @@ func New(config *Config) (*Ethereum, error) { hasBlock := eth.chainManager.HasBlock insertChain := eth.chainManager.InsertChain - eth.blockPool = blockpool.New(hasBlock, insertChain, eth.pow.Verify) + td := eth.chainManager.Td() + eth.blockPool = blockpool.New(hasBlock, insertChain, eth.pow.Verify, eth.EventMux(), td) netprv, err := config.nodeKey() if err != nil { @@ -205,7 +206,7 @@ func New(config *Config) (*Ethereum, error) { ethProto := EthProtocol(config.ProtocolVersion, config.NetworkId, eth.txPool, eth.chainManager, eth.blockPool) protocols := []p2p.Protocol{ethProto} if config.Shh { - protocols = append(protocols, eth.whisper.Protocol()) + //protocols = append(protocols, eth.whisper.Protocol()) } eth.net = &p2p.Server{ |