Skip to content

Commit 1a038ef

Browse files
marten-seemannmarten-seemann
authored
muxer: remove support for mplex (#2498)
1 parent 9bd8502 commit 1a038ef

File tree

12 files changed

+12
-215
lines changed

12 files changed

+12
-215
lines changed

Diff for: ‎go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ require (
2525
github.com/libp2p/go-flow-metrics v0.1.0
2626
github.com/libp2p/go-libp2p-asn-util v0.3.0
2727
github.com/libp2p/go-libp2p-testing v0.12.0
28-
github.com/libp2p/go-mplex v0.7.0
2928
github.com/libp2p/go-msgio v0.3.0
3029
github.com/libp2p/go-nat v0.2.0
3130
github.com/libp2p/go-netroute v0.2.1

Diff for: ‎go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,6 @@ github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLE
299299
github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
300300
github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
301301
github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg=
302-
github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
303-
github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
304302
github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
305303
github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
306304
github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=

Diff for: ‎p2p/muxer/mplex/conn.go

-48
This file was deleted.

Diff for: ‎p2p/muxer/mplex/stream.go

-64
This file was deleted.

Diff for: ‎p2p/muxer/mplex/transport.go

-28
This file was deleted.

Diff for: ‎p2p/muxer/mplex/transport_test.go

-52
This file was deleted.

Diff for: ‎p2p/net/swarm/swarm_metrics_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func TestMetricsNoAllocNoCover(t *testing.T) {
5353
{StreamMultiplexer: "yamux", Security: "tls", Transport: "tcp", UsedEarlyMuxerNegotiation: true},
5454
{StreamMultiplexer: "yamux", Security: "noise", Transport: "tcp", UsedEarlyMuxerNegotiation: false},
5555
{StreamMultiplexer: "", Security: "", Transport: "quic"},
56-
{StreamMultiplexer: "mplex", Security: "noise", Transport: "tcp"},
56+
{StreamMultiplexer: "another-yamux", Security: "noise", Transport: "tcp"},
5757
}
5858

5959
directions := []network.Direction{network.DirInbound, network.DirOutbound}

Diff for: ‎p2p/test/negotiation/muxer_test.go

+10-11
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/libp2p/go-libp2p/core/peer"
1212
"github.com/libp2p/go-libp2p/core/protocol"
1313
"github.com/libp2p/go-libp2p/core/sec/insecure"
14-
"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
1514
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
1615
"github.com/libp2p/go-libp2p/p2p/security/noise"
1716
tls "github.com/libp2p/go-libp2p/p2p/security/tls"
@@ -21,8 +20,8 @@ import (
2120
)
2221

2322
var (
24-
yamuxOpt = libp2p.Muxer("/yamux", yamux.DefaultTransport)
25-
mplexOpt = libp2p.Muxer("/mplex", mplex.DefaultTransport)
23+
yamuxOpt = libp2p.Muxer("/yamux", yamux.DefaultTransport)
24+
anotherYamuxOpt = libp2p.Muxer("/another-yamux", yamux.DefaultTransport)
2625
)
2726

2827
type testcase struct {
@@ -43,32 +42,32 @@ func TestMuxerNegotiation(t *testing.T) {
4342
testcases := []testcase{
4443
{
4544
Name: "server and client have the same preference",
46-
ServerPreference: []libp2p.Option{yamuxOpt, mplexOpt},
47-
ClientPreference: []libp2p.Option{yamuxOpt, mplexOpt},
45+
ServerPreference: []libp2p.Option{yamuxOpt, anotherYamuxOpt},
46+
ClientPreference: []libp2p.Option{yamuxOpt, anotherYamuxOpt},
4847
Expected: "/yamux",
4948
},
5049
{
5150
Name: "client only supports one muxer",
52-
ServerPreference: []libp2p.Option{yamuxOpt, mplexOpt},
51+
ServerPreference: []libp2p.Option{yamuxOpt, anotherYamuxOpt},
5352
ClientPreference: []libp2p.Option{yamuxOpt},
5453
Expected: "/yamux",
5554
},
5655
{
5756
Name: "server only supports one muxer",
5857
ServerPreference: []libp2p.Option{yamuxOpt},
59-
ClientPreference: []libp2p.Option{mplexOpt, yamuxOpt},
58+
ClientPreference: []libp2p.Option{anotherYamuxOpt, yamuxOpt},
6059
Expected: "/yamux",
6160
},
6261
{
6362
Name: "client preference preferred",
64-
ServerPreference: []libp2p.Option{yamuxOpt, mplexOpt},
65-
ClientPreference: []libp2p.Option{mplexOpt, yamuxOpt},
66-
Expected: "/mplex",
63+
ServerPreference: []libp2p.Option{yamuxOpt, anotherYamuxOpt},
64+
ClientPreference: []libp2p.Option{anotherYamuxOpt, yamuxOpt},
65+
Expected: "/another-yamux",
6766
},
6867
{
6968
Name: "no preference overlap",
7069
ServerPreference: []libp2p.Option{yamuxOpt},
71-
ClientPreference: []libp2p.Option{mplexOpt},
70+
ClientPreference: []libp2p.Option{anotherYamuxOpt},
7271
Error: "failed to negotiate stream multiplexer: protocols not supported",
7372
},
7473
}

Diff for: ‎test-plans/cmd/ping/main.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ import (
1818
"github.com/go-redis/redis/v8"
1919
"github.com/libp2p/go-libp2p"
2020
"github.com/libp2p/go-libp2p/core/peer"
21-
"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
2221
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
2322
"github.com/libp2p/go-libp2p/p2p/protocol/ping"
24-
noise "github.com/libp2p/go-libp2p/p2p/security/noise"
23+
"github.com/libp2p/go-libp2p/p2p/security/noise"
2524
libp2ptls "github.com/libp2p/go-libp2p/p2p/security/tls"
2625
libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
2726
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
@@ -139,8 +138,6 @@ func main() {
139138
switch muxer {
140139
case "yamux":
141140
options = append(options, libp2p.Muxer("/yamux/1.0.0", yamux.DefaultTransport))
142-
case "mplex":
143-
options = append(options, libp2p.Muxer("/mplex/6.7.0", mplex.DefaultTransport))
144141
default:
145142
log.Fatalf("Unsupported muxer: %s", muxer)
146143
}

Diff for: ‎test-plans/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ require (
4141
github.com/libp2p/go-cidranger v1.1.0 // indirect
4242
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
4343
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
44-
github.com/libp2p/go-mplex v0.7.0 // indirect
4544
github.com/libp2p/go-msgio v0.3.0 // indirect
4645
github.com/libp2p/go-nat v0.2.0 // indirect
4746
github.com/libp2p/go-netroute v0.2.1 // indirect

Diff for: ‎test-plans/go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnF
142142
github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
143143
github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
144144
github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
145-
github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
146-
github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
147145
github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
148146
github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
149147
github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=

Diff for: ‎test-plans/ping-version.json

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"noise"
1414
],
1515
"muxers": [
16-
"mplex",
1716
"yamux"
1817
]
1918
}

0 commit comments

Comments
 (0)