Disabled ability to disable whisper. Closes #334

2015-02-18 11:42:01 +01:00
parent 60318c96d0
commit 05b1ec008b
4 changed files with 8 additions and 3 deletions
--- 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 {