Merge pull request #104 from libp2p/fix/nil-peer-scope

Fix nil peer scope issues

Author: vyzo

listener_test.go

@@ -363,6 +363,7 @@ func TestListenerResourceManagement(t *testing.T) {
 	connScope := mocknetwork.NewMockConnManagementScope(ctrl)
 	gomock.InOrder(
 		rcmgr.EXPECT().OpenConnection(network.DirInbound, true).Return(connScope, nil),
+		connScope.EXPECT().PeerScope(),
 		connScope.EXPECT().SetPeer(id),
 		connScope.EXPECT().PeerScope(),
 	)

upgrader.go

@@ -157,9 +157,9 @@ func (u *upgrader) upgrade(ctx context.Context, t transport.Transport, maconn ma
 		return nil, fmt.Errorf("gater rejected connection with peer %s and addr %s with direction %d",
 			sconn.RemotePeer().Pretty(), maconn.RemoteMultiaddr(), dir)
 	}
-	// Only call SetPeer if we didn't know the peer ID in advance.
-	// Otherwise, the caller will already have called it before calling Upgrade.
-	if p == "" {
+	// Only call SetPeer if it hasn't already been set -- this can happen when we don't know
+	// the peer in advance and in some bug scenarios.
+	if connScope.PeerScope() == nil {
 		if err := connScope.SetPeer(sconn.RemotePeer()); err != nil {
 			log.Debugw("resource manager blocked connection for peer", "peer", sconn.RemotePeer(), "addr", conn.RemoteAddr(), "error", err)
 			if err := maconn.Close(); err != nil {

upgrader_test.go

@@ -153,7 +153,11 @@ func TestOutboundResourceManagement(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
 		connScope := mocknetwork.NewMockConnManagementScope(ctrl)
-		connScope.EXPECT().PeerScope().Return(network.NullScope)
+		gomock.InOrder(
+			connScope.EXPECT().PeerScope(),
+			connScope.EXPECT().SetPeer(id),
+			connScope.EXPECT().PeerScope().Return(network.NullScope),
+		)
 		_, dialUpgrader := createUpgrader(t)
 		conn, err := dial(t, dialUpgrader, ln.Multiaddr(), id, connScope)
 		require.NoError(t, err)
@@ -171,6 +175,8 @@ func TestOutboundResourceManagement(t *testing.T) {
 		defer ctrl.Finish()
 		connScope := mocknetwork.NewMockConnManagementScope(ctrl)
 		gomock.InOrder(
+			connScope.EXPECT().PeerScope(),
+			connScope.EXPECT().SetPeer(id),
 			connScope.EXPECT().PeerScope().Return(network.NullScope),
 			connScope.EXPECT().Done(),
 		)