muxer: remove support for mplex

libp2p · Aug 17, 2023 · 6ce9d8c · 6ce9d8c
1 parent e935729
commit 6ce9d8c
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 215 deletions.
diff --git a/go.mod b/go.mod
@@ -25,7 +25,6 @@ require (
 	github.com/libp2p/go-flow-metrics v0.1.0
 	github.com/libp2p/go-libp2p-asn-util v0.3.0
 	github.com/libp2p/go-libp2p-testing v0.12.0
-	github.com/libp2p/go-mplex v0.7.0
 	github.com/libp2p/go-msgio v0.3.0
 	github.com/libp2p/go-nat v0.2.0
 	github.com/libp2p/go-netroute v0.2.1

diff --git a/go.sum b/go.sum
@@ -299,8 +299,6 @@ github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLE
 github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
 github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
 github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg=
-github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
-github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
 github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
 github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
 github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=

diff --git a/p2p/muxer/mplex/conn.go b/p2p/muxer/mplex/conn.go
diff --git a/p2p/muxer/mplex/stream.go b/p2p/muxer/mplex/stream.go
diff --git a/p2p/muxer/mplex/transport.go b/p2p/muxer/mplex/transport.go
diff --git a/p2p/muxer/mplex/transport_test.go b/p2p/muxer/mplex/transport_test.go
diff --git a/p2p/net/swarm/swarm_metrics_test.go b/p2p/net/swarm/swarm_metrics_test.go
@@ -53,7 +53,7 @@ func TestMetricsNoAllocNoCover(t *testing.T) {
 		{StreamMultiplexer: "yamux", Security: "tls", Transport: "tcp", UsedEarlyMuxerNegotiation: true},
 		{StreamMultiplexer: "yamux", Security: "noise", Transport: "tcp", UsedEarlyMuxerNegotiation: false},
 		{StreamMultiplexer: "", Security: "", Transport: "quic"},
-		{StreamMultiplexer: "mplex", Security: "noise", Transport: "tcp"},
+		{StreamMultiplexer: "another-yamux", Security: "noise", Transport: "tcp"},
 	}
 
 	directions := []network.Direction{network.DirInbound, network.DirOutbound}

diff --git a/p2p/test/negotiation/muxer_test.go b/p2p/test/negotiation/muxer_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/core/sec/insecure"
-	"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	"github.com/libp2p/go-libp2p/p2p/security/noise"
 	tls "github.com/libp2p/go-libp2p/p2p/security/tls"
@@ -21,8 +20,8 @@ import (
 )
 
 var (
-	yamuxOpt = libp2p.Muxer("/yamux", yamux.DefaultTransport)
-	mplexOpt = libp2p.Muxer("/mplex", mplex.DefaultTransport)
+	yamuxOpt        = libp2p.Muxer("/yamux", yamux.DefaultTransport)
+	anotherYamuxOpt = libp2p.Muxer("/another-yamux", yamux.DefaultTransport)
 )
 
 type testcase struct {
@@ -43,32 +42,32 @@ func TestMuxerNegotiation(t *testing.T) {
 	testcases := []testcase{
 		{
 			Name:             "server and client have the same preference",
-			ServerPreference: []libp2p.Option{yamuxOpt, mplexOpt},
-			ClientPreference: []libp2p.Option{yamuxOpt, mplexOpt},
+			ServerPreference: []libp2p.Option{yamuxOpt, anotherYamuxOpt},
+			ClientPreference: []libp2p.Option{yamuxOpt, anotherYamuxOpt},
 			Expected:         "/yamux",
 		},
 		{
 			Name:             "client only supports one muxer",
-			ServerPreference: []libp2p.Option{yamuxOpt, mplexOpt},
+			ServerPreference: []libp2p.Option{yamuxOpt, anotherYamuxOpt},
 			ClientPreference: []libp2p.Option{yamuxOpt},
 			Expected:         "/yamux",
 		},
 		{
 			Name:             "server only supports one muxer",
 			ServerPreference: []libp2p.Option{yamuxOpt},
-			ClientPreference: []libp2p.Option{mplexOpt, yamuxOpt},
+			ClientPreference: []libp2p.Option{anotherYamuxOpt, yamuxOpt},
 			Expected:         "/yamux",
 		},
 		{
 			Name:             "client preference preferred",
-			ServerPreference: []libp2p.Option{yamuxOpt, mplexOpt},
-			ClientPreference: []libp2p.Option{mplexOpt, yamuxOpt},
-			Expected:         "/mplex",
+			ServerPreference: []libp2p.Option{yamuxOpt, anotherYamuxOpt},
+			ClientPreference: []libp2p.Option{anotherYamuxOpt, yamuxOpt},
+			Expected:         "/another-yamux",
 		},
 		{
 			Name:             "no preference overlap",
 			ServerPreference: []libp2p.Option{yamuxOpt},
-			ClientPreference: []libp2p.Option{mplexOpt},
+			ClientPreference: []libp2p.Option{anotherYamuxOpt},
 			Error:            "failed to negotiate stream multiplexer: protocols not supported",
 		},
 	}

diff --git a/test-plans/cmd/ping/main.go b/test-plans/cmd/ping/main.go
@@ -18,10 +18,9 @@ import (
 	"github.com/go-redis/redis/v8"
 	"github.com/libp2p/go-libp2p"
 	"github.com/libp2p/go-libp2p/core/peer"
-	"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	"github.com/libp2p/go-libp2p/p2p/protocol/ping"
-	noise "github.com/libp2p/go-libp2p/p2p/security/noise"
+	"github.com/libp2p/go-libp2p/p2p/security/noise"
 	libp2ptls "github.com/libp2p/go-libp2p/p2p/security/tls"
 	libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
@@ -139,8 +138,6 @@ func main() {
 		switch muxer {
 		case "yamux":
 			options = append(options, libp2p.Muxer("/yamux/1.0.0", yamux.DefaultTransport))
-		case "mplex":
-			options = append(options, libp2p.Muxer("/mplex/6.7.0", mplex.DefaultTransport))
 		default:
 			log.Fatalf("Unsupported muxer: %s", muxer)
 		}

diff --git a/test-plans/go.mod b/test-plans/go.mod
@@ -41,7 +41,6 @@ require (
 	github.com/libp2p/go-cidranger v1.1.0 // indirect
 	github.com/libp2p/go-flow-metrics v0.1.0 // indirect
 	github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
-	github.com/libp2p/go-mplex v0.7.0 // indirect
 	github.com/libp2p/go-msgio v0.3.0 // indirect
 	github.com/libp2p/go-nat v0.2.0 // indirect
 	github.com/libp2p/go-netroute v0.2.1 // indirect

diff --git a/test-plans/go.sum b/test-plans/go.sum
@@ -142,8 +142,6 @@ github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnF
 github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
 github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
 github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
-github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
-github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
 github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
 github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
 github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=

diff --git a/test-plans/ping-version.json b/test-plans/ping-version.json
@@ -13,7 +13,6 @@
         "noise"
     ],
     "muxers": [
-        "mplex",
         "yamux"
     ]
 }