From 6072822d5fb1602c81b1ed079e52e3b3f752971c Mon Sep 17 00:00:00 2001
From: Anton Evangelatov <anton.evangelatov@gmail.com>
Date: Mon, 21 Jan 2019 14:32:36 +0100
Subject: [PATCH] cmd/swarm, swarm/network: always set nodiscover option

---
 cmd/swarm/main.go         | 5 ++++-
 swarm/network/kademlia.go | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go
index 44131bade6..f8fa159f80 100644
--- a/cmd/swarm/main.go
+++ b/cmd/swarm/main.go
@@ -154,7 +154,6 @@ func init() {
 		utils.BootnodesFlag,
 		utils.KeyStoreDirFlag,
 		utils.ListenPortFlag,
-		utils.NoDiscoverFlag,
 		utils.DiscoveryV5Flag,
 		utils.NetrestrictFlag,
 		utils.NodeKeyFileFlag,
@@ -274,6 +273,10 @@ func bzzd(ctx *cli.Context) error {
 	setSwarmBootstrapNodes(ctx, &cfg)
 	//setup the ethereum node
 	utils.SetNodeConfig(ctx, &cfg)
+
+	//always disable discovery from p2p package - swarm discovery is done with the `hive` protocol
+	cfg.NoDiscovery = true
+
 	stack, err := node.New(&cfg)
 	if err != nil {
 		utils.Fatalf("can't create node: %v", err)
diff --git a/swarm/network/kademlia.go b/swarm/network/kademlia.go
index f9b38fc48d..2c22762516 100644
--- a/swarm/network/kademlia.go
+++ b/swarm/network/kademlia.go
@@ -279,7 +279,7 @@ func (k *Kademlia) SuggestPeer() (suggestedPeer *BzzAddr, saturationDepth int, c
 	return suggestedPeer, 0, false
 }
 
-// On inserts  the peer as a kademlia peer into the live peers
+// On inserts the peer as a kademlia peer into the live peers
 func (k *Kademlia) On(p *Peer) (uint8, bool) {
 	k.lock.Lock()
 	defer k.lock.Unlock()