Skip to content

Commit 123f1f6

Browse files
aschmahmannaschmahmann
authored
Merge pull request #9038 from ipfs/update-libp2p-v020
update go-libp2p to v0.20.3
2 parents b6ded33 + d5a7552 commit 123f1f6

File tree

8 files changed

+53
-71
lines changed

8 files changed

+53
-71
lines changed

‎core/coreapi/swarm.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"github.com/ipfs/go-ipfs/tracing"
99
coreiface "github.com/ipfs/interface-go-ipfs-core"
1010
inet "github.com/libp2p/go-libp2p-core/network"
11-
peer "github.com/libp2p/go-libp2p-core/peer"
11+
"github.com/libp2p/go-libp2p-core/peer"
1212
pstore "github.com/libp2p/go-libp2p-core/peerstore"
13-
protocol "github.com/libp2p/go-libp2p-core/protocol"
14-
swarm "github.com/libp2p/go-libp2p-swarm"
13+
"github.com/libp2p/go-libp2p-core/protocol"
14+
"github.com/libp2p/go-libp2p/p2p/net/swarm"
1515
ma "github.com/multiformats/go-multiaddr"
1616
"go.opentelemetry.io/otel/attribute"
1717
"go.opentelemetry.io/otel/trace"

‎core/corehttp/metrics_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/ipfs/go-ipfs/core"
99

1010
inet "github.com/libp2p/go-libp2p-core/network"
11-
swarmt "github.com/libp2p/go-libp2p-swarm/testing"
1211
bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
12+
swarmt "github.com/libp2p/go-libp2p/p2p/net/swarm/testing"
1313
)
1414

1515
// This test is based on go-libp2p/p2p/net/swarm.TestConnectednessCorrect

‎core/node/libp2p/sec.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package libp2p
22

33
import (
4-
config "github.com/ipfs/go-ipfs/config"
4+
"github.com/ipfs/go-ipfs/config"
5+
56
"github.com/libp2p/go-libp2p"
6-
noise "github.com/libp2p/go-libp2p-noise"
7-
tls "github.com/libp2p/go-libp2p-tls"
7+
"github.com/libp2p/go-libp2p/p2p/security/noise"
8+
tls "github.com/libp2p/go-libp2p/p2p/security/tls"
89
)
910

1011
const secioEnabledWarning = `The SECIO security transport was enabled in the config but is no longer supported.

‎core/node/libp2p/smux.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"os"
66
"strings"
77

8-
config "github.com/ipfs/go-ipfs/config"
8+
"github.com/ipfs/go-ipfs/config"
9+
910
"github.com/libp2p/go-libp2p"
1011
"github.com/libp2p/go-libp2p-core/network"
11-
mplex "github.com/libp2p/go-libp2p-mplex"
12-
yamux "github.com/libp2p/go-libp2p-yamux"
12+
"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
13+
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
1314
)
1415

1516
func yamuxTransport() network.Multiplexer {

‎core/node/libp2p/topicdiscovery.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import (
66

77
"github.com/libp2p/go-libp2p-core/discovery"
88
"github.com/libp2p/go-libp2p-core/host"
9-
disc "github.com/libp2p/go-libp2p-discovery"
9+
"github.com/libp2p/go-libp2p/p2p/discovery/backoff"
10+
disc "github.com/libp2p/go-libp2p/p2p/discovery/routing"
1011

1112
"github.com/ipfs/go-ipfs/core/node/helpers"
1213
"go.uber.org/fx"
@@ -17,9 +18,9 @@ func TopicDiscovery() interface{} {
1718
baseDisc := disc.NewRoutingDiscovery(cr)
1819
minBackoff, maxBackoff := time.Second*60, time.Hour
1920
rng := rand.New(rand.NewSource(rand.Int63()))
20-
d, err := disc.NewBackoffDiscovery(
21+
d, err := backoff.NewBackoffDiscovery(
2122
baseDisc,
22-
disc.NewExponentialBackoff(minBackoff, maxBackoff, disc.FullJitter, time.Second, 5.0, 0, rng),
23+
backoff.NewExponentialBackoff(minBackoff, maxBackoff, backoff.FullJitter, time.Second, 5.0, 0, rng),
2324
)
2425

2526
if err != nil {

‎core/node/libp2p/transport.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package libp2p
33
import (
44
"fmt"
55

6-
config "github.com/ipfs/go-ipfs/config"
7-
libp2p "github.com/libp2p/go-libp2p"
8-
metrics "github.com/libp2p/go-libp2p-core/metrics"
9-
libp2pquic "github.com/libp2p/go-libp2p-quic-transport"
10-
tcp "github.com/libp2p/go-tcp-transport"
11-
websocket "github.com/libp2p/go-ws-transport"
6+
"github.com/ipfs/go-ipfs/config"
7+
"github.com/libp2p/go-libp2p"
8+
"github.com/libp2p/go-libp2p-core/metrics"
9+
libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
10+
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
11+
"github.com/libp2p/go-libp2p/p2p/transport/websocket"
1212

1313
"go.uber.org/fx"
1414
)

‎go.mod‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,29 +68,20 @@ require (
6868
github.com/jbenet/go-temp-err-catcher v0.1.0
6969
github.com/jbenet/goprocess v0.1.4
7070
github.com/libp2p/go-doh-resolver v0.4.0
71-
github.com/libp2p/go-libp2p v0.19.4
72-
github.com/libp2p/go-libp2p-core v0.15.1
73-
github.com/libp2p/go-libp2p-discovery v0.6.0
71+
github.com/libp2p/go-libp2p v0.20.3
72+
github.com/libp2p/go-libp2p-core v0.16.1
7473
github.com/libp2p/go-libp2p-http v0.2.1
7574
github.com/libp2p/go-libp2p-kad-dht v0.16.0
7675
github.com/libp2p/go-libp2p-kbucket v0.4.7
7776
github.com/libp2p/go-libp2p-loggables v0.1.0
78-
github.com/libp2p/go-libp2p-mplex v0.7.0
79-
github.com/libp2p/go-libp2p-noise v0.4.0
8077
github.com/libp2p/go-libp2p-peerstore v0.6.0
8178
github.com/libp2p/go-libp2p-pubsub v0.6.1
8279
github.com/libp2p/go-libp2p-pubsub-router v0.5.0
83-
github.com/libp2p/go-libp2p-quic-transport v0.17.0
8480
github.com/libp2p/go-libp2p-record v0.1.3
8581
github.com/libp2p/go-libp2p-resource-manager v0.3.0
8682
github.com/libp2p/go-libp2p-routing-helpers v0.2.3
87-
github.com/libp2p/go-libp2p-swarm v0.10.2
8883
github.com/libp2p/go-libp2p-testing v0.9.2
89-
github.com/libp2p/go-libp2p-tls v0.4.1
90-
github.com/libp2p/go-libp2p-yamux v0.9.1
9184
github.com/libp2p/go-socket-activation v0.1.0
92-
github.com/libp2p/go-tcp-transport v0.5.1
93-
github.com/libp2p/go-ws-transport v0.6.0
9485
github.com/miekg/dns v1.1.48
9586
github.com/mitchellh/go-homedir v1.1.0
9687
github.com/multiformats/go-multiaddr v0.5.0
@@ -138,6 +129,8 @@ require (
138129
github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5 // indirect
139130
github.com/beorn7/perks v1.0.1 // indirect
140131
github.com/btcsuite/btcd v0.22.1 // indirect
132+
github.com/btcsuite/btcd/btcec/v2 v2.1.3 // indirect
133+
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
141134
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
142135
github.com/cespare/xxhash/v2 v2.1.2 // indirect
143136
github.com/cheekybits/genny v1.0.0 // indirect
@@ -146,6 +139,7 @@ require (
146139
github.com/cskr/pubsub v1.0.2 // indirect
147140
github.com/davecgh/go-spew v1.1.1 // indirect
148141
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
142+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
149143
github.com/dgraph-io/badger v1.6.2 // indirect
150144
github.com/dgraph-io/ristretto v0.0.2 // indirect
151145
github.com/docker/go-units v0.4.0 // indirect
@@ -183,24 +177,19 @@ require (
183177
github.com/koron/go-ssdp v0.0.2 // indirect
184178
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
185179
github.com/libp2p/go-cidranger v1.1.0 // indirect
186-
github.com/libp2p/go-conn-security-multistream v0.3.0 // indirect
187180
github.com/libp2p/go-eventbus v0.2.1 // indirect
188181
github.com/libp2p/go-flow-metrics v0.0.3 // indirect
189182
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
190-
github.com/libp2p/go-libp2p-blankhost v0.3.0 // indirect
183+
github.com/libp2p/go-libp2p-discovery v0.7.0 // indirect
191184
github.com/libp2p/go-libp2p-gostream v0.3.0 // indirect
192-
github.com/libp2p/go-libp2p-nat v0.1.0 // indirect
193-
github.com/libp2p/go-libp2p-pnet v0.2.0 // indirect
194-
github.com/libp2p/go-libp2p-transport-upgrader v0.7.1 // indirect
185+
github.com/libp2p/go-libp2p-swarm v0.11.0 // indirect
195186
github.com/libp2p/go-libp2p-xor v0.1.0 // indirect
196187
github.com/libp2p/go-mplex v0.7.0 // indirect
197188
github.com/libp2p/go-msgio v0.2.0 // indirect
198189
github.com/libp2p/go-nat v0.1.0 // indirect
199190
github.com/libp2p/go-netroute v0.2.0 // indirect
200191
github.com/libp2p/go-openssl v0.0.7 // indirect
201-
github.com/libp2p/go-reuseport v0.1.0 // indirect
202-
github.com/libp2p/go-reuseport-transport v0.1.0 // indirect
203-
github.com/libp2p/go-stream-muxer-multistream v0.4.0 // indirect
192+
github.com/libp2p/go-reuseport v0.2.0 // indirect
204193
github.com/libp2p/go-yamux/v3 v3.1.2 // indirect
205194
github.com/libp2p/zeroconf/v2 v2.1.1 // indirect
206195
github.com/lucas-clemente/quic-go v0.27.1 // indirect
@@ -220,7 +209,7 @@ require (
220209
github.com/multiformats/go-base32 v0.0.4 // indirect
221210
github.com/multiformats/go-base36 v0.1.0 // indirect
222211
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
223-
github.com/multiformats/go-multistream v0.3.0 // indirect
212+
github.com/multiformats/go-multistream v0.3.3 // indirect
224213
github.com/multiformats/go-varint v0.0.6 // indirect
225214
github.com/nxadm/tail v1.4.8 // indirect
226215
github.com/onsi/ginkgo v1.16.5 // indirect

0 commit comments

Comments
 (0)