Skip to content

Commit 3847bca

Browse files
committed
fix: add back mplex muxer
1 parent 77c1e26 commit 3847bca

File tree

5 files changed

+11
-0
lines changed

5 files changed

+11
-0
lines changed

examples/chat2/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ require (
6868
github.com/libp2p/go-libp2p-peerstore v0.6.0 // indirect
6969
github.com/libp2p/go-libp2p-pubsub v0.6.1 // indirect
7070
github.com/libp2p/go-libp2p-resource-manager v0.3.0 // indirect
71+
github.com/libp2p/go-mplex v0.7.0 // indirect
7172
github.com/libp2p/go-msgio v0.2.0 // indirect
7273
github.com/libp2p/go-nat v0.1.0 // indirect
7374
github.com/libp2p/go-netroute v0.2.0 // indirect

examples/chat2/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -1095,6 +1095,8 @@ github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod h1:AyR8k5EzyM2QN9Bbdg6X1SkVVuqLw
10951095
github.com/libp2p/go-libp2p-yamux v0.8.2 h1:6GKWntresp0TFxMP/oSoH96nV8XKJRdynXsdp43dn0Y=
10961096
github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
10971097
github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
1098+
github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
1099+
github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
10981100
github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
10991101
github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
11001102
github.com/libp2p/go-msgio v0.2.0 h1:W6shmB+FeynDrUVl2dgFQvzfBZcXiyqY4VmpQLu9FqU=

go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ require (
9292
github.com/libp2p/go-libp2p-tls v0.3.1 // indirect
9393
github.com/libp2p/go-libp2p-transport-upgrader v0.7.1 // indirect
9494
github.com/libp2p/go-libp2p-yamux v0.8.2 // indirect
95+
github.com/libp2p/go-mplex v0.7.0 // indirect
9596
github.com/libp2p/go-nat v0.1.0 // indirect
9697
github.com/libp2p/go-netroute v0.2.0 // indirect
9798
github.com/libp2p/go-openssl v0.0.7 // indirect

go.sum

+1
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,7 @@ github.com/libp2p/go-libp2p-yamux v0.8.2/go.mod h1:rUozF8Jah2dL9LLGyBaBeTQeARdwh
11431143
github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
11441144
github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
11451145
github.com/libp2p/go-mplex v0.4.0/go.mod h1:y26Lx+wNVtMYMaPu300Cbot5LkEZ4tJaNYeHeT9dh6E=
1146+
github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
11461147
github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
11471148
github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
11481149
github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=

waku/v2/node/wakuoptions.go

+6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import (
1414
pubsub "github.com/libp2p/go-libp2p-pubsub"
1515
"github.com/libp2p/go-libp2p/config"
1616
basichost "github.com/libp2p/go-libp2p/p2p/host/basic"
17+
"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
18+
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
1719
"github.com/libp2p/go-libp2p/p2p/net/connmgr"
1820
quic "github.com/libp2p/go-libp2p/p2p/transport/quic"
1921
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
@@ -416,6 +418,10 @@ var DefaultLibP2POptions = []libp2p.Option{
416418
libp2p.Transport(tcp.NewTCPTransport),
417419
libp2p.Transport(quic.NewTransport),
418420
), libp2p.UserAgent(clientId),
421+
libp2p.ChainOptions(
422+
libp2p.Muxer("/yamux/1.0.0", yamux.DefaultTransport),
423+
libp2p.Muxer("/mplex/6.7.0", mplex.DefaultTransport),
424+
),
419425
libp2p.EnableNATService(),
420426
libp2p.ConnectionManager(newConnManager(200, 300, connmgr.WithGracePeriod(0))),
421427
}

0 commit comments

Comments
 (0)