aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2015-04-20 19:58:23 +0800
committerPéter Szilágyi <peterke@gmail.com>2015-04-28 15:49:04 +0800
commit19bc4624eaefc2c8201260e7afa1a5893159bffc (patch)
treeb673f1b43bfec98a3017365f021765b095d8dafb /eth
parent7948cc0029db76557d6540341bdfeb818ce32c65 (diff)
downloadgo-tangerine-19bc4624eaefc2c8201260e7afa1a5893159bffc.tar
go-tangerine-19bc4624eaefc2c8201260e7afa1a5893159bffc.tar.gz
go-tangerine-19bc4624eaefc2c8201260e7afa1a5893159bffc.tar.bz2
go-tangerine-19bc4624eaefc2c8201260e7afa1a5893159bffc.tar.lz
go-tangerine-19bc4624eaefc2c8201260e7afa1a5893159bffc.tar.xz
go-tangerine-19bc4624eaefc2c8201260e7afa1a5893159bffc.tar.zst
go-tangerine-19bc4624eaefc2c8201260e7afa1a5893159bffc.zip
eth: pull in a lost merge change
Ref: https://github.com/Gustav-Simonsson/go-ethereum/commit/21c4c155ee68890a069654dcc5bc083a867f65cd
Diffstat (limited to 'eth')
-rw-r--r--eth/backend.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/eth/backend.go b/eth/backend.go
index 783f33908..466912899 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -222,10 +222,12 @@ func New(config *Config) (*Ethereum, error) {
eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State, eth.chainManager.GasLimit)
eth.blockProcessor = core.NewBlockProcessor(stateDb, extraDb, eth.pow, eth.txPool, eth.chainManager, eth.EventMux())
eth.chainManager.SetProcessor(eth.blockProcessor)
- eth.whisper = whisper.New()
- eth.shhVersionId = int(eth.whisper.Version())
eth.miner = miner.New(eth, eth.pow, config.MinerThreads)
eth.protocolManager = NewProtocolManager(config.ProtocolVersion, config.NetworkId, eth.eventMux, eth.txPool, eth.chainManager, eth.downloader)
+ if config.Shh {
+ eth.whisper = whisper.New()
+ eth.shhVersionId = int(eth.whisper.Version())
+ }
netprv, err := config.nodeKey()
if err != nil {