From 62ad6dc8e4b0b2c74661d195e5f5a7b08f68a146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 20 Apr 2015 14:58:23 +0300 Subject: [PATCH] eth: pull in a lost merge change Ref: https://github.com/Gustav-Simonsson/go-ethereum/commit/21c4c155ee68890a069654dcc5bc083a867f65cd --- eth/backend.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eth/backend.go b/eth/backend.go index c7a5b233f077..1cb4b8c1071f 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -198,10 +198,11 @@ func New(config *Config) (*Ethereum, error) { eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State) 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) - + if config.Shh { + eth.whisper = whisper.New() + eth.shhVersionId = int(eth.whisper.Version()) + } hasBlock := eth.chainManager.HasBlock insertChain := eth.chainManager.InsertChain td := eth.chainManager.Td()