allow p2p meshThreadInner called for relays with GossipFanout=0

Author: algorandskiy

network/hybridNetwork.go

@@ -188,7 +188,12 @@ func (n *HybridP2PNetwork) RegisterHTTPHandlerFunc(path string, handlerFunc func
 }
 
 // RequestConnectOutgoing implements GossipNode
-func (n *HybridP2PNetwork) RequestConnectOutgoing(replace bool, quit <-chan struct{}) {}
+func (n *HybridP2PNetwork) RequestConnectOutgoing(replace bool, quit <-chan struct{}) {
+	_ = n.runParallel(func(net GossipNode) error {
+		net.RequestConnectOutgoing(replace, quit)
+		return nil
+	})
+}
 
 // GetPeers implements GossipNode
 func (n *HybridP2PNetwork) GetPeers(options ...PeerOption) []Peer {

network/mesh.go

@@ -244,7 +244,9 @@ func (c hybridRelayMeshCreator) create(opts ...meshOption) (mesher, error) {
 		wsConnections := cfg.wsnet.meshThreadInner(targetConnCount)
 
 		var p2pConnections int
-		if wsConnections < targetConnCount {
+		if wsConnections <= targetConnCount {
+			// note "less or equal". Even if p2pTarget is zero it makes sense to call
+			// p2p meshThreadInner to fetch DHT peers
 			p2pTarget := targetConnCount - wsConnections
 			p2pConnections = cfg.p2pnet.meshThreadInner(p2pTarget)
 
@@ -325,9 +327,6 @@ func (c noopMeshPubSubFilteredCreator) create(opts ...meshOption) (mesher, error
 }
 func (c noopMeshPubSubFilteredCreator) makeConfig(wsnet *WebsocketNetwork, p2pnet *P2PNetwork) networkConfig {
 	return networkConfig{
-		pubsubOpts: []p2p.PubSubOption{
-			// p2p.DisablePubSubPeerExchange(),
-			p2p.SetPubSubPeerFilter(p2pnet.p2pRelayPeerFilter, p2pnet.pstore),
-		},
+		pubsubOpts: []p2p.PubSubOption{},
 	}
 }

network/p2pNetwork.go

@@ -380,10 +380,6 @@ func (n *P2PNetwork) setup() error {
 	return nil
 }
 
-func (n *P2PNetwork) p2pRelayPeerFilter(checker peerstore.RoleChecker, pid peer.ID) bool {
-	return !checker.HasRole(pid, phonebook.RelayRole)
-}
-
 // PeerID returns this node's peer ID.
 func (n *P2PNetwork) PeerID() p2p.PeerID {
 	return p2p.PeerID(n.service.ID())

node/node_test.go

@@ -1020,6 +1020,10 @@ func TestNodeHybridTopology(t *testing.T) {
 		return node0Conn && node1Conn && node2Conn
 	}, 60*time.Second, 500*time.Millisecond)
 
+	// node 0 has GossipFanout=0 but we still want to run all the machinery to update phonebooks
+	// (it this particular case to update peerstore with DHT nodes)
+	nodes[0].net.RequestConnectOutgoing(false, nil)
+
 	initialRound := nodes[0].ledger.NextRound()
 	targetRound := initialRound + 10