search

filecoin-project / go-legs

Does the legwork for go-data-transfer
Apache License 2.0
20 stars 14 forks source link

Revert change from go-libp2p-core to go-libp2p/core #151

Closed gammazero closed 2 years ago

gammazero commented 2 years ago

Reverts the parts of filecoin-project/go-legs#150 that changed from using go-libp2p-core to go-libp2p/core. Keeps the other dependency updates so that building with go1.19 works.

codecov-commenter commented 2 years ago

Codecov Report

Merging #151 (0d1b67a) into main (66e5453) will not change coverage. The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #151   +/-   ##
=======================================
  Coverage   64.72%   64.72%           
=======================================
  Files          22       22           
  Lines        2418     2418           
=======================================
  Hits         1565     1565           
  Misses        669      669           
  Partials      184      184
Impacted Files Coverage Δ
dtsync/option.go 86.36% <ø> (ø)
dtsync/publisher.go 45.31% <ø> (ø)
dtsync/sync.go 76.19% <ø> (ø)
dtsync/syncer.go 80.85% <ø> (ø)
dtsync/util.go 52.68% <ø> (ø)
dtsync/voucher.go 61.11% <ø> (ø)
gpubsub/pubsub.go 54.54% <ø> (ø)
gpubsub/trace.go 47.82% <ø> (ø)
httpsync/message.go 67.56% <ø> (ø)
httpsync/publisher.go 67.56% <ø> (ø)
... and 5 more
github-actions[bot] commented 2 years ago

Suggested version: v0.4.11 Comparing to: v0.4.10 (diff)

Changes in go.mod file(s):

diff --git a/go.mod b/go.mod
index 31eeca4..1375589 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/filecoin-project/go-legs

-go 1.18
+go 1.17

 require (
    github.com/filecoin-project/go-data-transfer v1.15.2
@@ -10,9 +10,11 @@ require (
    github.com/ipfs/go-graphsync v0.13.2
    github.com/ipfs/go-log/v2 v2.5.1
    github.com/ipld/go-ipld-prime v0.17.0
-   github.com/libp2p/go-libp2p v0.22.0
-   github.com/libp2p/go-libp2p-gostream v0.4.0
-   github.com/libp2p/go-libp2p-pubsub v0.7.1
+   github.com/libp2p/go-libp2p v0.21.0
+   github.com/libp2p/go-libp2p-core v0.19.1
+   github.com/libp2p/go-libp2p-gostream v0.3.1
+   github.com/libp2p/go-libp2p-peerstore v0.7.1
+   github.com/libp2p/go-libp2p-pubsub v0.7.0
    github.com/multiformats/go-multiaddr v0.6.0
    github.com/multiformats/go-multicodec v0.5.0
    github.com/multiformats/go-multistream v0.3.3
@@ -27,6 +29,7 @@ require (
    github.com/benbjohnson/clock v1.3.0 // indirect
    github.com/beorn7/perks v1.0.1 // indirect
    github.com/bep/debounce v1.2.0 // 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
@@ -34,7 +37,7 @@ require (
    github.com/cpuguy83/go-md2man/v2 v2.0.0 // 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.1.0 // indirect
+   github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
    github.com/docker/go-units v0.4.0 // indirect
    github.com/elastic/gosigar v0.14.2 // indirect
    github.com/filecoin-project/go-cbor-util v0.0.0-20191219014500-08c40a1e63a2 // indirect
@@ -71,29 +74,29 @@ require (
    github.com/jbenet/goprocess v0.1.4 // indirect
    github.com/jpillora/backoff v1.0.0 // indirect
    github.com/klauspost/compress v1.15.1 // indirect
-   github.com/klauspost/cpuid/v2 v2.1.0 // indirect
+   github.com/klauspost/cpuid/v2 v2.0.14 // 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.1.0 // indirect
+   github.com/libp2p/go-eventbus v0.2.1 // indirect
+   github.com/libp2p/go-flow-metrics v0.0.3 // indirect
    github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
-   github.com/libp2p/go-libp2p-core v0.20.0 // indirect
    github.com/libp2p/go-libp2p-discovery v0.7.0 // indirect
+   github.com/libp2p/go-libp2p-resource-manager v0.5.1 // indirect
    github.com/libp2p/go-libp2p-swarm v0.11.0 // indirect
    github.com/libp2p/go-msgio v0.2.0 // indirect
    github.com/libp2p/go-nat v0.1.0 // indirect
    github.com/libp2p/go-netroute v0.2.0 // indirect
-   github.com/libp2p/go-openssl v0.1.0 // indirect
+   github.com/libp2p/go-openssl v0.0.7 // 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.1 // indirect
+   github.com/lucas-clemente/quic-go v0.28.0 // 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 // indirect
+   github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect
    github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
-   github.com/mattn/go-isatty v0.0.16 // indirect
-   github.com/mattn/go-pointer v0.0.1 // indirect
+   github.com/mattn/go-isatty v0.0.14 // 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
@@ -105,7 +108,7 @@ require (
    github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
    github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
    github.com/multiformats/go-multibase v0.1.1 // indirect
-   github.com/multiformats/go-multihash v0.2.1 // indirect
+   github.com/multiformats/go-multihash v0.2.0 // indirect
    github.com/multiformats/go-varint v0.0.6 // indirect
    github.com/nxadm/tail v1.4.8 // indirect
    github.com/onsi/ginkgo v1.16.5 // indirect
@@ -117,8 +120,8 @@ require (
    github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
    github.com/prometheus/client_golang v1.12.1 // indirect
    github.com/prometheus/client_model v0.2.0 // indirect
-   github.com/prometheus/common v0.37.0 // indirect
-   github.com/prometheus/procfs v0.8.0 // indirect
+   github.com/prometheus/common v0.35.0 // indirect
+   github.com/prometheus/procfs v0.7.3 // indirect
    github.com/raulk/go-watchdog v1.3.0 // indirect
    github.com/russross/blackfriday/v2 v2.0.1 // indirect
    github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
@@ -128,16 +131,15 @@ require (
    github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee // indirect
    go.opentelemetry.io/otel v1.3.0 // indirect
    go.opentelemetry.io/otel/trace v1.3.0 // indirect
-   go.uber.org/atomic v1.10.0 // indirect
+   go.uber.org/atomic v1.9.0 // indirect
    go.uber.org/multierr v1.8.0 // indirect
-   go.uber.org/zap v1.22.0 // indirect
-   golang.org/x/exp v0.0.0-20220426173459-3bcf042a4bf5 // indirect
+   go.uber.org/zap v1.21.0 // indirect
    golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // 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
+   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
    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

gorelease says:

# diagnostics
required module github.com/microcosm-cc/bluemonday@v1.0.1 retracted by module author: Retract older versions as only latest is to be depended upon

# summary
Suggested version: v0.5.0

gocompat says:

(empty)
gammazero commented 2 years ago

This PR should be ok to commit, since it contains what was already approved for #150, but without the libp2p/core changes that were not approved.