diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-28 16:54:05 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-28 16:54:05 +0800 |
| commit | a05c420371aa56657b86ba3dce6ebb087adb708d (patch) | |
| tree | 3e0853dcff756c503764d0f73c1757c585be2aa9 /eth/backend.go | |
| parent | 182d484aa70bcd5b22117f02333b1fd3b1535dcb (diff) | |
| parent | 978ffd3097242a5faeb7b23b9c72590170004dc6 (diff) | |
| download | dexon-a05c420371aa56657b86ba3dce6ebb087adb708d.tar dexon-a05c420371aa56657b86ba3dce6ebb087adb708d.tar.gz dexon-a05c420371aa56657b86ba3dce6ebb087adb708d.tar.bz2 dexon-a05c420371aa56657b86ba3dce6ebb087adb708d.tar.lz dexon-a05c420371aa56657b86ba3dce6ebb087adb708d.tar.xz dexon-a05c420371aa56657b86ba3dce6ebb087adb708d.tar.zst dexon-a05c420371aa56657b86ba3dce6ebb087adb708d.zip | |
Merge pull request #738 from karalabe/whisper-cleanup
Whisper cleanup, part 3
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 6 |
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 { |