diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-28 17:17:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-28 17:17:41 +0800 |
| commit | 99027c79fe7406919d654ab482d8ad37fcf098ce (patch) | |
| tree | 9f6625b30b9d63d28f7e86c69d31991daac4fbf7 /eth/backend.go | |
| parent | bac455c0117f7095ee9c60ac75a249ddd66c2660 (diff) | |
| parent | a05c420371aa56657b86ba3dce6ebb087adb708d (diff) | |
| download | dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.gz dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.bz2 dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.lz dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.xz dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.zst dexon-99027c79fe7406919d654ab482d8ad37fcf098ce.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
rpc/api.go
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 { |