fix(p2p.QriConnectePeers): properly tag QriPeers on both ends of the …

…ConnManager

turns out we weren't properly tagging Qri peers in the ConnManager, which was preventing
the receiving end of a p2p connection from reporting a peer as supporting Qri when
ConnectedQriPeers is called. This is fixed by moving peerstore and connmanager manipluation
lower in the connection ceremony

p2p/node.go

@@ -300,6 +300,11 @@ func (n *QriNode) SendMessage(msg Message, replies chan Message, pids ...peer.ID
 		}
 		defer s.Close()
 
+		// now that we have a confirmed working connection
+		// tag this peer as supporting the qri protocol in the connection manager
+		n.Host.ConnManager().TagPeer(peerID, qriConnManagerTag, qriConnManagerValue)
+		n.Host.Peerstore().AddAddr(peerID, s.Conn().RemoteMultiaddr(), pstore.TempAddrTTL)
+
 		ws := WrapStream(s)
 		go n.handleStream(ws, replies)
 		if err := ws.sendMessage(msg); err != nil {
@@ -333,6 +338,10 @@ func (n *QriNode) handleStream(ws *WrappedStream, replies chan Message) {
 			break
 		}
 
+		conn := ws.stream.Conn()
+		n.Host.ConnManager().TagPeer(conn.RemotePeer(), qriConnManagerTag, qriConnManagerValue)
+		n.Host.Peerstore().AddAddr(conn.RemotePeer(), conn.RemoteMultiaddr(), pstore.TempAddrTTL)
+
 		if replies != nil {
 			go func() { replies <- msg }()
 		}
@@ -385,9 +394,8 @@ func (n *QriNode) HostNetwork() net.Network {
 // MakeHandlers generates a map of MsgTypes to their corresponding handler functions
 func MakeHandlers(n *QriNode) map[MsgType]HandlerFunc {
 	return map[MsgType]HandlerFunc{
-		MtPing:    n.handlePing,
-		MtProfile: n.handleProfile,
-		// MtProfiles:          n.handleProfiles,
+		MtPing:              n.handlePing,
+		MtProfile:           n.handleProfile,
 		MtDatasetInfo:       n.handleDataset,
 		MtDatasets:          n.handleDatasetsList,
 		MtEvents:            n.handleEvents,

p2p/peers.go

@@ -114,9 +114,9 @@ func (n *QriNode) PeerInfo(pid peer.ID) pstore.PeerInfo {
 // AddQriPeer negotiates a connection with a peer to get their profile details
 // and peer list.
 func (n *QriNode) AddQriPeer(pinfo pstore.PeerInfo) error {
-	// add this peer to our store
+	// add this peer to our store so libp2p has the provided addresses of
+	// the peer in the next call
 	n.Host.Peerstore().AddAddrs(pinfo.ID, pinfo.Addrs, pstore.TempAddrTTL)
-	n.Host.ConnManager().TagPeer(pinfo.ID, qriConnManagerTag, qriConnManagerValue)
 
 	if _, err := n.RequestProfile(pinfo.ID); err != nil {
 		log.Debug(err.Error())

p2p/profile.go

@@ -3,6 +3,7 @@ package p2p
 import (
 	"encoding/json"
 	"fmt"
+
 	// "time"
 
 	"github.com/qri-io/qri/config"

p2p/profile_test.go

@@ -60,11 +60,11 @@ func TestRequestProfileConnectNodes(t *testing.T) {
 
 				addrsP1 := p1.Host.Peerstore().Addrs(p2.ID)
 				if len(addrsP1) == 0 {
-					t.Errorf("%s (request node) should have addrs of %s (response node)", p1.ID.Pretty(), p2.ID.Pretty())
+					t.Errorf("%s (request node) should have addrs of %s (response node)", p1.ID, p2.ID)
 				}
 				addrsP2 := p2.Host.Peerstore().Addrs(p1.ID)
 				if len(addrsP2) == 0 {
-					t.Errorf("%s (request node) should have addrs of %s (response node)", p2.ID.Pretty(), p1.ID.Pretty())
+					t.Errorf("%s (request node) should have addrs of %s (response node)", p2.ID, p1.ID)
 				}
 
 				pid := pro.PeerIDs[0]
@@ -147,11 +147,11 @@ func TestRequestProfileOneWayConnection(t *testing.T) {
 
 		peerInfo2 := p1.Host.Peerstore().PeerInfo(p2.ID)
 		if len(peerInfo2.Addrs) == 0 {
-			t.Errorf("%s (request node) should have addrs of %s (response node)", p1.ID.Pretty(), p2.ID.Pretty())
+			t.Errorf("%s (request node) should have addrs of %s (response node)", p1.ID, p2.ID)
 		}
 		peerInfo1 := p2.Host.Peerstore().PeerInfo(p1.ID)
 		if len(peerInfo1.Addrs) == 0 {
-			t.Errorf("%s (request node) should have addrs of %s (response node)", p2.ID.Pretty(), p1.ID.Pretty())
+			t.Errorf("%s (response node) should have addrs of %s (request node)", p2.ID, p1.ID)
 		}
 
 		pid := pro.PeerIDs[0]

p2p/qri_peers_test.go

@@ -2,7 +2,6 @@ package p2p
 
 import (
 	"context"
-	"fmt"
 	"testing"
 	"time"
 
@@ -14,7 +13,6 @@ import (
 // Test passes when the fifth node connects to the other three nodes by asking
 // it's one connection for the other three peer's profiles
 func TestSharePeers(t *testing.T) {
-	fmt.Println("hallo?")
 	ctx := context.Background()
 	f := p2ptest.NewTestNodeFactory(NewTestableQriNode)
 	testPeers, err := p2ptest.NewTestNetwork(ctx, f, 5)
@@ -33,9 +31,8 @@ func TestSharePeers(t *testing.T) {
 	done := make(chan bool)
 	deadline := time.NewTimer(time.Second * 2)
 	go func() {
-		for msg := range nasma.ReceiveMessages() {
+		for range nasma.ReceiveMessages() {
 			if len(nasma.ConnectedPeers()) == len(group) {
-				fmt.Println(msg.Type, len(nasma.ConnectedPeers()))
 				done <- true
 			}
 		}