diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-18 18:42:01 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-18 18:42:01 +0800 |
| commit | 05b1ec008b771d9856e83a6269a5267eb18e1f51 (patch) | |
| tree | 001e9a721f7d7611b5907b819fcdc334609fc847 /eth | |
| parent | 60318c96d03bcaaf731802b1080a3d87cb482124 (diff) | |
| download | go-tangerine-05b1ec008b771d9856e83a6269a5267eb18e1f51.tar go-tangerine-05b1ec008b771d9856e83a6269a5267eb18e1f51.tar.gz go-tangerine-05b1ec008b771d9856e83a6269a5267eb18e1f51.tar.bz2 go-tangerine-05b1ec008b771d9856e83a6269a5267eb18e1f51.tar.lz go-tangerine-05b1ec008b771d9856e83a6269a5267eb18e1f51.tar.xz go-tangerine-05b1ec008b771d9856e83a6269a5267eb18e1f51.tar.zst go-tangerine-05b1ec008b771d9856e83a6269a5267eb18e1f51.zip | |
Disabled ability to disable whisper. Closes #334
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go index 690c7136d..d109ab98e 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -160,7 +160,11 @@ func New(config *Config) (*Ethereum, error) { eth.blockPool = NewBlockPool(hasBlock, insertChain, ezp.Verify) ethProto := EthProtocol(eth.txPool, eth.chainManager, eth.blockPool) - protocols := []p2p.Protocol{ethProto, eth.whisper.Protocol()} + protocols := []p2p.Protocol{ethProto} + if config.Shh { + protocols = append(protocols, eth.whisper.Protocol()) + } + netprv := config.NodeKey if netprv == nil { if netprv, err = crypto.GenerateKey(); err != nil { |