swarm/network: Refactor peer suggestion engine

p2p/simulations/adapters/types.go

@@ -97,7 +97,7 @@ type NodeConfig struct {
 	Services []string
 
 	// function to sanction or prevent suggesting a peer
-	Reachable func(id enode.ID) bool
+	// Reachable func(id enode.ID) bool
 
 	Port uint16
 }

p2p/simulations/network.go

@@ -88,15 +88,15 @@ func (net *Network) NewNodeWithConfig(conf *adapters.NodeConfig) (*Node, error)
 	net.lock.Lock()
 	defer net.lock.Unlock()
 
-	if conf.Reachable == nil {
-		conf.Reachable = func(otherID enode.ID) bool {
-			_, err := net.InitConn(conf.ID, otherID)
-			if err != nil && bytes.Compare(conf.ID.Bytes(), otherID.Bytes()) < 0 {
-				return false
-			}
-			return true
-		}
-	}
+	//	if conf.Reachable == nil {
+	//		conf.Reachable = func(otherID enode.ID) bool {
+	//			_, err := net.InitConn(conf.ID, otherID)
+	//			if err != nil && bytes.Compare(conf.ID.Bytes(), otherID.Bytes()) < 0 {
+	//				return false
+	//			}
+	//			return true
+	//		}
+	//	}
 
 	// check the node doesn't already exist
 	if node := net.getNode(conf.ID); node != nil {

swarm/network/discovery.go

@@ -20,34 +20,58 @@ import (
 	"context"
 	"fmt"
 	"sync"
+	"time"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/swarm/pot"
 )
 
 // discovery bzz extension for requesting and relaying node address records
 
+// encapsulates connectivity information related to discovery mechanics
+type connectivity struct {
+	seenAt  time.Time
+	retries int
+	depth   uint8
+}
+
+// encapsulates peer information exchange related to discovery mechanics
+type exchange struct {
+	sentPeers bool            // whether we already sent peer closer to this address
+	peers     map[string]bool // tracks node records sent to the peer
+}
+
 // Peer wraps BzzPeer and embeds Kademlia overlay connectivity driver
 type Peer struct {
 	*BzzPeer
-	kad       *Kademlia
-	sentPeers bool            // whether we already sent peer closer to this address
-	mtx       sync.RWMutex    //
-	peers     map[string]bool // tracks node records sent to the peer
-	depth     uint8           // the proximity order advertised by remote as depth of saturation
+	*connectivity
+	*exchange
+	kad *Kademlia
+	mtx sync.RWMutex
+	up  bool
 }
 
 // NewPeer constructs a discovery peer
 func NewPeer(p *BzzPeer, kad *Kademlia) *Peer {
 	d := &Peer{
+		exchange: &exchange{
+			peers: make(map[string]bool),
+		},
 		kad:     kad,
 		BzzPeer: p,
-		peers:   make(map[string]bool),
 	}
 	// record remote as seen so we never send a peer its own record
 	d.seen(p.BzzAddr)
 	return d
 }
 
+// Label is a short tag for the entry for debug
+// TODO: move this to common utility function
+func Label(d pot.BytesAddress) string {
+	//return fmt.Sprintf("%s (%d)", common.Bytes2Hex(d.Address())[:4]) //, d.retries)
+	return fmt.Sprintf("%s", common.Bytes2Hex(d.Address())[:4])
+}
+
 // HandleMsg is the message handler that delegates incoming messages
 func (d *Peer) HandleMsg(ctx context.Context, msg interface{}) error {
 	switch msg := msg.(type) {
@@ -64,6 +88,7 @@ func (d *Peer) HandleMsg(ctx context.Context, msg interface{}) error {
 }
 
 // NotifyDepth sends a message to all connections if depth of saturation is changed
+// TODO rename depth to unambiguous term and make sure cast properly from source throughout (ideally not cast)
 func NotifyDepth(depth uint8, kad *Kademlia) {
 	f := func(val *Peer, po int, _ bool) bool {
 		val.NotifyDepth(depth)
@@ -161,7 +186,7 @@ func (d *Peer) handleSubPeersMsg(msg *subPeersMsg) error {
 		d.setDepth(msg.Depth)
 		var peers []*BzzAddr
 		d.kad.EachConn(d.Over(), 255, func(p *Peer, po int, isproxbin bool) bool {
-			if pob, _ := pof(d, d.kad.BaseAddr(), 0); pob > po {
+			if pob, _ := Pof(d, d.kad.BaseAddr(), 0); pob > po {
 				return false
 			}
 			if !d.seen(p.BzzAddr) {