Merge pull request ethereum#101 from ethersphere/network-testing-fram…

…ework-nodepssmerge

swarm/pss: pssclient, pss tests

les/handler.go

@@ -259,7 +259,7 @@ func (pm *ProtocolManager) removePeer(id string) {
 func (pm *ProtocolManager) Start(srvr *p2p.Server) {
 	var topicDisc *discv5.Network
 	if srvr != nil {
-		topicDisc = srvr.DiscV5
+		topicDisc = srvr.DiscV5()
 	}
 	lesTopic := discv5.Topic("LES@" + common.Bytes2Hex(pm.blockchain.Genesis().Hash().Bytes()[0:8]))
 	if pm.lightSync {

les/serverpool.go

@@ -143,7 +143,7 @@ func newServerPool(db ethdb.Database, dbPrefix []byte, server *p2p.Server, topic
 		pool.discSetPeriod = make(chan time.Duration, 1)
 		pool.discNodes = make(chan *discv5.Node, 100)
 		pool.discLookups = make(chan bool, 100)
-		go pool.server.DiscV5.SearchTopic(topic, pool.discSetPeriod, pool.discNodes, pool.discLookups)
+		go pool.server.DiscV5().SearchTopic(topic, pool.discSetPeriod, pool.discNodes, pool.discLookups)
 	}
 
 	go pool.eventLoop()

swarm/network/hive.go

@@ -127,23 +127,23 @@ func (self *Hive) Start(server *p2p.Server) error {
 			log.Debug("hive delegate to overlay driver: suggest addr to connect to")
 			// log.Trace("hive delegate to overlay driver: suggest addr to connect to")
 			addr, order, want := self.SuggestPeer()
-
-			if addr != nil {
-				log.Info(fmt.Sprintf("========> connect to bee %v", addr))
-				under, err := discover.ParseNode(string(addr.(Addr).Under()))
-				if err == nil {
-					server.AddPeer(under)
+			if self.Discovery {
+				if addr != nil {
+					log.Info(fmt.Sprintf("========> connect to bee %v", addr))
+					under, err := discover.ParseNode(string(addr.(Addr).Under()))
+					if err == nil {
+						server.AddPeer(under)
+					} else {
+						log.Error(fmt.Sprintf("===X====> connect to bee %v failed: invalid node URL: %v", addr, err))
+					}
 				} else {
-					log.Error(fmt.Sprintf("===X====> connect to bee %v failed: invalid node URL: %v", addr, err))
+					log.Trace("cannot suggest peers")
 				}
-			} else {
-				log.Trace("cannot suggest peers")
-			}
 
-			want = want && self.Discovery
-			if want {
-				log.Debug(fmt.Sprintf("========> request peers nearest %v", addr))
-				RequestOrder(self.Overlay, uint8(order), self.PeersBroadcastSetSize, self.MaxPeersPerRequest)
+				if want {
+					log.Debug(fmt.Sprintf("========> request peers nearest %v", addr))
+					RequestOrder(self.Overlay, uint8(order), self.PeersBroadcastSetSize, self.MaxPeersPerRequest)
+				}
 			}
 
 			log.Info(fmt.Sprintf("%v", self))