update go-libp2p to v0.22.0, release v0.18.0 #788
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marten-seemann
force-pushed
the
update-deps
branch
from
f0428c1
to
26ecb02
Compare
|
when to merged? i need this package support libp2p v0.22.0 |
MarcoPolo
approved these changes
Aug 26, 2022
marten-seemann
force-pushed
the
update-deps
branch
from
26ecb02
to
af918ea
Compare
qdm12
approved these changes
Aug 29, 2022
dht_filters.go
Outdated
| @@ -217,7 +217,7 @@ func isEUI(ip net.IP) bool { | |||
|
|
|||
| func sameV6Net(a, b net.IP) bool { | |||
| //lint:ignore SA1021 We're comparing only parts of the IP address here. | |||
| return len(a) == net.IPv6len && len(b) == net.IPv6len && bytes.Equal(a[0:8], b[0:8]) //nolint | |||
| return len(a) == net.IPv6len && len(b) == net.IPv6len && bytes.Equal(a[0:8], b[0:8]) // nolint | |||
There was a problem hiding this comment.
nit I think //nolint is meant to be without space so it's processed correctly by golangci-lint. A bit like //go: comments
Suggested change
| return len(a) == net.IPv6len && len(b) == net.IPv6len && bytes.Equal(a[0:8], b[0:8]) // nolint | |
| return len(a) == net.IPv6len && len(b) == net.IPv6len && bytes.Equal(a[0:8], b[0:8]) //nolint |
There was a problem hiding this comment.
Use //nolint instead of // nolint because machine-readable comments should have no space by Go convention.
TIL, thanks!
ext_test.go
Outdated
| @@ -45,7 +45,7 @@ func TestHungRequest(t *testing.T) { | |||
| for _, proto := range d.serverProtocols { | |||
| // Hang on every request. | |||
| hosts[1].SetStreamHandler(proto, func(s network.Stream) { | |||
| defer s.Reset() //nolint | |||
| defer s.Reset() // nolint | |||
There was a problem hiding this comment.
Suggested change
| defer s.Reset() // nolint | |
| defer s.Reset() //nolint |
|
Test |
This was referenced Aug 30, 2022
|
Hello! Is there an ETA on merging this PR? It's blocking me as well. Thanks! |
|
Rebasing now, and will merge when tests pass. Thanks all for the patience :) |
|
Suggested version: Changes in diff --git a/go.mod b/go.mod
index ab42e02..315505f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/libp2p/go-libp2p-kad-dht
-go 1.17
+go 1.18
require (
github.com/gogo/protobuf v1.3.2
@@ -12,15 +12,12 @@ require (
github.com/ipfs/go-datastore v0.5.1
github.com/ipfs/go-detect-race v0.0.1
github.com/ipfs/go-ipfs-util v0.0.2
- github.com/ipfs/go-ipns v0.1.2
+ github.com/ipfs/go-ipns v0.2.0
github.com/ipfs/go-log v1.0.5
github.com/jbenet/goprocess v0.1.4
- github.com/libp2p/go-eventbus v0.2.1
- github.com/libp2p/go-libp2p v0.21.0
- github.com/libp2p/go-libp2p-core v0.19.1
+ github.com/libp2p/go-libp2p v0.22.0
github.com/libp2p/go-libp2p-kbucket v0.4.7
- github.com/libp2p/go-libp2p-peerstore v0.7.1
- github.com/libp2p/go-libp2p-record v0.1.3
+ github.com/libp2p/go-libp2p-record v0.2.0
github.com/libp2p/go-libp2p-routing-helpers v0.2.3
github.com/libp2p/go-libp2p-testing v0.11.0
github.com/libp2p/go-libp2p-xor v0.1.0
@@ -29,27 +26,26 @@ require (
github.com/multiformats/go-base32 v0.0.4
github.com/multiformats/go-multiaddr v0.6.0
github.com/multiformats/go-multibase v0.1.1
- github.com/multiformats/go-multihash v0.2.0
+ github.com/multiformats/go-multihash v0.2.1
github.com/multiformats/go-multistream v0.3.3
github.com/stretchr/testify v1.8.0
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1
go.opencensus.io v0.23.0
go.opentelemetry.io/otel v1.7.0
go.opentelemetry.io/otel/trace v1.7.0
- go.uber.org/zap v1.21.0
+ go.uber.org/zap v1.22.0
)
require (
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
- github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
- github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/flynn/noise v1.0.0 // indirect
@@ -68,24 +64,26 @@ require (
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
github.com/klauspost/compress v1.15.1 // indirect
- github.com/klauspost/cpuid/v2 v2.0.14 // indirect
+ github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/koron/go-ssdp v0.0.3 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-cidranger v1.1.0 // indirect
- github.com/libp2p/go-flow-metrics v0.0.3 // indirect
+ github.com/libp2p/go-flow-metrics v0.1.0 // indirect
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
- github.com/libp2p/go-libp2p-resource-manager v0.5.1 // indirect
+ github.com/libp2p/go-libp2p-core v0.20.0 // indirect
+ github.com/libp2p/go-libp2p-peerstore v0.8.0 // indirect
github.com/libp2p/go-nat v0.1.0 // indirect
- github.com/libp2p/go-openssl v0.0.7 // indirect
+ github.com/libp2p/go-openssl v0.1.0 // indirect
github.com/libp2p/go-reuseport v0.2.0 // indirect
github.com/libp2p/go-yamux/v3 v3.1.2 // indirect
- github.com/lucas-clemente/quic-go v0.28.0 // indirect
+ github.com/lucas-clemente/quic-go v0.28.1 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
- github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect
+ github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
- github.com/mattn/go-isatty v0.0.14 // indirect
+ github.com/mattn/go-isatty v0.0.16 // indirect
+ github.com/mattn/go-pointer v0.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/miekg/dns v1.1.50 // indirect
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
@@ -107,20 +105,20 @@ require (
github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
- github.com/prometheus/common v0.35.0 // indirect
- github.com/prometheus/procfs v0.7.3 // indirect
+ github.com/prometheus/common v0.37.0 // indirect
+ github.com/prometheus/procfs v0.8.0 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
- go.uber.org/atomic v1.9.0 // indirect
+ go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
- golang.org/x/net v0.0.0-20220630215102-69896b714898 // indirect
- golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
- golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
- golang.org/x/tools v0.1.11 // indirect
- google.golang.org/protobuf v1.28.0 // indirect
+ golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
+ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
+ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
+ golang.org/x/tools v0.1.12 // indirect
+ google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
|
|
@MarcoPolo awesome thanks for being reactive to this 💯 👍 @orange-jacky @lthibault if you can't wait and don't mind 1 or 2 tests to fail (maybe you should, up to you), you can use it from this branch using: go get github.com/libp2p/go-libp2p-kad-dht@update-depsYour go.mod will use the last commit from this branch. EDIT: never mind you can use v0.18.0 🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In draft until ipfs/go-ipns#39 was merged and released.