Merge new go-multistream changes

Author: sukunrt

p2p/host/autorelay/relay_finder.go

@@ -13,7 +13,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/event"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
-	"github.com/libp2p/go-libp2p/core/protocol"
 	basic "github.com/libp2p/go-libp2p/p2p/host/basic"
 	relayv1 "github.com/libp2p/go-libp2p/p2p/protocol/circuitv1/relay"
 	circuitv2 "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/client"
@@ -24,8 +23,8 @@ import (
 )
 
 const (
-	protoIDv1 = protocol.ID(relayv1.ProtoID)
-	protoIDv2 = protocol.ID(circuitv2_proto.ProtoIDv2Hop)
+	protoIDv1 = relayv1.ProtoID
+	protoIDv2 = circuitv2_proto.ProtoIDv2Hop
 )
 
 // Terminology:

p2p/host/basic/basic_host_test.go

@@ -158,8 +158,8 @@ func TestProtocolHandlerEvents(t *testing.T) {
 
 	h.SetStreamHandler(protocol.TestingID, func(s network.Stream) {})
 	assert([]protocol.ID{protocol.TestingID}, nil)
-	h.SetStreamHandler(protocol.ID("foo"), func(s network.Stream) {})
-	assert([]protocol.ID{protocol.ID("foo")}, nil)
+	h.SetStreamHandler("foo", func(s network.Stream) {})
+	assert([]protocol.ID{"foo"}, nil)
 	h.RemoveStreamHandler(protocol.TestingID)
 	assert(nil, []protocol.ID{protocol.TestingID})
 }
@@ -273,9 +273,9 @@ func TestHostProtoPreference(t *testing.T) {
 	defer h2.Close()
 
 	const (
-		protoOld   = protocol.ID("/testing")
-		protoNew   = protocol.ID("/testing/1.1.0")
-		protoMinor = protocol.ID("/testing/1.2.0")
+		protoOld   = "/testing"
+		protoNew   = "/testing/1.1.0"
+		protoMinor = "/testing/1.2.0"
 	)
 
 	connectedOn := make(chan protocol.ID)

p2p/host/peerstore/test/peerstore_suite.go

@@ -221,7 +221,7 @@ func testPeerstoreProtoStore(ps pstore.Peerstore) func(t *testing.T) {
 			require.NoError(t, err)
 			require.Len(t, out, len(protos), "got wrong number of protocols back")
 
-			sort.Slice(out, func(i, j int) bool { return out[i] < out[j] })
+			sortProtos(out)
 			for i, p := range protos {
 				if out[i] != p {
 					t.Fatal("got wrong protocol")

p2p/host/resource-manager/extapi.go

@@ -87,7 +87,7 @@ func (r *resourceManager) ListProtocols() []protocol.ID {
 	}
 
 	sort.Slice(result, func(i, j int) bool {
-		return strings.Compare(string(result[i]), string(result[j])) < 0
+		return result[i] < result[j]
 	})
 
 	return result

p2p/protocol/identify/id_test.go

@@ -383,7 +383,7 @@ func TestIdentifyPushWhileIdentifyingConn(t *testing.T) {
 	handler := func(s network.Stream) {
 		<-block
 		w := pbio.NewDelimitedWriter(s)
-		w.WriteMsg(&pb.Identify{Protocols:protocol.ConvertToStrings(h1.Mux().Protocols())})
+		w.WriteMsg(&pb.Identify{Protocols: protocol.ConvertToStrings(h1.Mux().Protocols())})
 		s.Close()
 	}
 	h1.RemoveStreamHandler(identify.ID)
@@ -613,9 +613,9 @@ func TestLargeIdentifyMessage(t *testing.T) {
 	// add protocol strings to make the message larger
 	// about 2K of protocol strings
 	for i := 0; i < 500; i++ {
-		r := fmt.Sprintf("rand%d", i)
-		h1.SetStreamHandler(protocol.ID(r), func(network.Stream) {})
-		h2.SetStreamHandler(protocol.ID(r), func(network.Stream) {})
+		r := protocol.ID(fmt.Sprintf("rand%d", i))
+		h1.SetStreamHandler(r, func(network.Stream) {})
+		h2.SetStreamHandler(r, func(network.Stream) {})
 	}
 
 	h1p := h1.ID()
@@ -719,9 +719,9 @@ func TestLargePushMessage(t *testing.T) {
 	// add protocol strings to make the message larger
 	// about 2K of protocol strings
 	for i := 0; i < 500; i++ {
-		r := fmt.Sprintf("rand%d", i)
-		h1.SetStreamHandler(protocol.ID(r), func(network.Stream) {})
-		h2.SetStreamHandler(protocol.ID(r), func(network.Stream) {})
+		r := protocol.ID(fmt.Sprintf("rand%d", i))
+		h1.SetStreamHandler(r, func(network.Stream) {})
+		h2.SetStreamHandler(r, func(network.Stream) {})
 	}
 
 	h1p := h1.ID()

p2p/security/tls/transport_test.go

@@ -188,37 +188,37 @@ func TestHandshakeWithNextProtoSucceeds(t *testing.T) {
 		{
 			clientProtos:   []protocol.ID{"muxer1", "muxer2"},
 			serverProtos:   []protocol.ID{"muxer2", "muxer1"},
-			expectedResult: protocol.ID("muxer1"),
+			expectedResult: "muxer1",
 		},
 		{
 			clientProtos:   []protocol.ID{"muxer1", "muxer2", "libp2p"},
 			serverProtos:   []protocol.ID{"muxer2", "muxer1", "libp2p"},
-			expectedResult: protocol.ID("muxer1"),
+			expectedResult: "muxer1",
 		},
 		{
 			clientProtos:   []protocol.ID{"muxer1", "libp2p"},
 			serverProtos:   []protocol.ID{"libp2p"},
-			expectedResult: protocol.ID(""),
+			expectedResult: "",
 		},
 		{
 			clientProtos:   []protocol.ID{"libp2p"},
 			serverProtos:   []protocol.ID{"libp2p"},
-			expectedResult: protocol.ID(""),
+			expectedResult: "",
 		},
 		{
 			clientProtos:   []protocol.ID{"muxer1"},
 			serverProtos:   []protocol.ID{},
-			expectedResult: protocol.ID(""),
+			expectedResult: "",
 		},
 		{
 			clientProtos:   []protocol.ID{},
 			serverProtos:   []protocol.ID{"muxer1"},
-			expectedResult: protocol.ID(""),
+			expectedResult: "",
 		},
 		{
 			clientProtos:   []protocol.ID{"muxer2"},
 			serverProtos:   []protocol.ID{"muxer1"},
-			expectedResult: protocol.ID(""),
+			expectedResult: "",
 		},
 	}
 

p2p/test/negotiation/security_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/libp2p/go-libp2p"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
-	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/p2p/security/noise"
 	tls "github.com/libp2p/go-libp2p/p2p/security/tls"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
@@ -84,7 +83,7 @@ func TestSecurityNegotiation(t *testing.T) {
 			require.NoError(t, err)
 			conns := client.Network().ConnsToPeer(server.ID())
 			require.Len(t, conns, 1, "expected exactly one connection")
-			require.Equal(t, tc.Expected, protocol.ID(conns[0].ConnState().Security))
+			require.Equal(t, tc.Expected, conns[0].ConnState().Security)
 		})
 	}
 }