From dfc3a3f24a69e9b4276c3e30b2ea6c7d28d9ba5c Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 22 Apr 2022 14:43:07 +0100 Subject: [PATCH] switch from github.com/libp2p/go-tcp-transport to p2p/transport/tcp --- config/transport_test.go | 3 ++- defaults.go | 6 ++++-- go.mod | 14 ++++++++------ libp2p_test.go | 6 ++++-- p2p/net/mock/log2.txt | 0 p2p/net/swarm/dial_worker_test.go | 8 +++++--- p2p/net/swarm/testing/testing.go | 2 +- p2p/protocol/circuitv2/relay/relay_test.go | 2 +- 8 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 p2p/net/mock/log2.txt diff --git a/config/transport_test.go b/config/transport_test.go index 1a226074c7..9cb5c9a3e0 100644 --- a/config/transport_test.go +++ b/config/transport_test.go @@ -3,9 +3,10 @@ package config import ( "testing" + "github.com/libp2p/go-libp2p/p2p/transport/tcp" + "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/transport" - "github.com/libp2p/go-tcp-transport" "github.com/stretchr/testify/require" ) diff --git a/defaults.go b/defaults.go index 039cef4856..a3a4c13236 100644 --- a/defaults.go +++ b/defaults.go @@ -5,15 +5,17 @@ package libp2p import ( "crypto/rand" + "github.com/libp2p/go-libp2p/p2p/net/connmgr" + "github.com/libp2p/go-libp2p/p2p/transport/tcp" + "github.com/libp2p/go-libp2p-core/crypto" + noise "github.com/libp2p/go-libp2p-noise" "github.com/libp2p/go-libp2p-peerstore/pstoremem" quic "github.com/libp2p/go-libp2p-quic-transport" rcmgr "github.com/libp2p/go-libp2p-resource-manager" tls "github.com/libp2p/go-libp2p-tls" yamux "github.com/libp2p/go-libp2p-yamux" - "github.com/libp2p/go-libp2p/p2p/net/connmgr" - "github.com/libp2p/go-tcp-transport" ws "github.com/libp2p/go-ws-transport" "github.com/multiformats/go-multiaddr" ) diff --git a/go.mod b/go.mod index 4dcf718c66..b1f33b45fb 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( github.com/libp2p/go-libp2p-asn-util v0.1.0 github.com/libp2p/go-libp2p-circuit v0.6.0 github.com/libp2p/go-libp2p-core v0.15.1 + github.com/libp2p/go-libp2p-mplex v0.5.0 github.com/libp2p/go-libp2p-nat v0.1.0 github.com/libp2p/go-libp2p-noise v0.4.0 github.com/libp2p/go-libp2p-peerstore v0.6.0 @@ -28,16 +29,20 @@ require ( github.com/libp2p/go-libp2p-yamux v0.9.1 github.com/libp2p/go-msgio v0.2.0 github.com/libp2p/go-netroute v0.2.0 + github.com/libp2p/go-reuseport v0.1.0 + github.com/libp2p/go-reuseport-transport v0.1.0 github.com/libp2p/go-stream-muxer-multistream v0.4.0 - github.com/libp2p/go-tcp-transport v0.5.1 github.com/libp2p/go-ws-transport v0.6.0 github.com/libp2p/zeroconf/v2 v2.1.1 + github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd + github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b github.com/multiformats/go-multiaddr v0.5.0 github.com/multiformats/go-multiaddr-dns v0.3.1 github.com/multiformats/go-multiaddr-fmt v0.1.0 github.com/multiformats/go-multihash v0.1.0 github.com/multiformats/go-multistream v0.3.0 github.com/multiformats/go-varint v0.0.6 + github.com/prometheus/client_golang v1.12.1 github.com/raulk/go-watchdog v1.2.0 github.com/stretchr/testify v1.7.0 github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9 @@ -78,20 +83,18 @@ require ( github.com/libp2p/go-libp2p-blankhost v0.3.0 // indirect github.com/libp2p/go-libp2p-pnet v0.2.0 // indirect github.com/libp2p/go-libp2p-swarm v0.10.2 // indirect + github.com/libp2p/go-mplex v0.4.0 // indirect github.com/libp2p/go-nat v0.1.0 // indirect github.com/libp2p/go-openssl v0.0.7 // indirect - github.com/libp2p/go-reuseport v0.1.0 // indirect - github.com/libp2p/go-reuseport-transport v0.1.0 // indirect + github.com/libp2p/go-tcp-transport v0.5.1 // indirect github.com/libp2p/go-yamux/v3 v3.1.1 // indirect github.com/lucas-clemente/quic-go v0.27.0 // indirect github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect - github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // 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.48 // indirect - github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect github.com/minio/sha256-simd v1.0.0 // indirect @@ -106,7 +109,6 @@ require ( github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.12.1 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.33.0 // indirect github.com/prometheus/procfs v0.7.3 // indirect diff --git a/libp2p_test.go b/libp2p_test.go index a40360e6d0..78a6e5685c 100644 --- a/libp2p_test.go +++ b/libp2p_test.go @@ -8,15 +8,17 @@ import ( "sync" "testing" + "github.com/libp2p/go-libp2p/p2p/transport/tcp" + "github.com/libp2p/go-libp2p-core/connmgr" "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/transport" + noise "github.com/libp2p/go-libp2p-noise" - "github.com/libp2p/go-tcp-transport" - ma "github.com/multiformats/go-multiaddr" + ma "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/require" ) diff --git a/p2p/net/mock/log2.txt b/p2p/net/mock/log2.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/p2p/net/swarm/dial_worker_test.go b/p2p/net/swarm/dial_worker_test.go index d9aa115e2f..3d74d62687 100644 --- a/p2p/net/swarm/dial_worker_test.go +++ b/p2p/net/swarm/dial_worker_test.go @@ -8,20 +8,22 @@ import ( "testing" "time" - "github.com/stretchr/testify/require" + "github.com/libp2p/go-libp2p/p2p/transport/tcp" - csms "github.com/libp2p/go-conn-security-multistream" "github.com/libp2p/go-libp2p-core/peerstore" "github.com/libp2p/go-libp2p-core/sec/insecure" "github.com/libp2p/go-libp2p-core/transport" + + csms "github.com/libp2p/go-conn-security-multistream" "github.com/libp2p/go-libp2p-peerstore/pstoremem" quic "github.com/libp2p/go-libp2p-quic-transport" tnet "github.com/libp2p/go-libp2p-testing/net" tptu "github.com/libp2p/go-libp2p-transport-upgrader" yamux "github.com/libp2p/go-libp2p-yamux" msmux "github.com/libp2p/go-stream-muxer-multistream" - tcp "github.com/libp2p/go-tcp-transport" ma "github.com/multiformats/go-multiaddr" + + "github.com/stretchr/testify/require" ) func makeSwarm(t *testing.T) *Swarm { diff --git a/p2p/net/swarm/testing/testing.go b/p2p/net/swarm/testing/testing.go index 30d8f22055..b6289182c3 100644 --- a/p2p/net/swarm/testing/testing.go +++ b/p2p/net/swarm/testing/testing.go @@ -5,6 +5,7 @@ import ( "time" "github.com/libp2p/go-libp2p/p2p/net/swarm" + "github.com/libp2p/go-libp2p/p2p/transport/tcp" "github.com/libp2p/go-libp2p-core/connmgr" "github.com/libp2p/go-libp2p-core/control" @@ -15,7 +16,6 @@ import ( "github.com/libp2p/go-libp2p-core/peerstore" "github.com/libp2p/go-libp2p-core/sec/insecure" "github.com/libp2p/go-libp2p-core/transport" - "github.com/libp2p/go-tcp-transport" csms "github.com/libp2p/go-conn-security-multistream" "github.com/libp2p/go-libp2p-peerstore/pstoremem" diff --git a/p2p/protocol/circuitv2/relay/relay_test.go b/p2p/protocol/circuitv2/relay/relay_test.go index 5bd840406c..b14271e556 100644 --- a/p2p/protocol/circuitv2/relay/relay_test.go +++ b/p2p/protocol/circuitv2/relay/relay_test.go @@ -14,6 +14,7 @@ import ( swarmt "github.com/libp2p/go-libp2p/p2p/net/swarm/testing" "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/client" "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/relay" + "github.com/libp2p/go-libp2p/p2p/transport/tcp" "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/host" @@ -23,7 +24,6 @@ import ( "github.com/libp2p/go-libp2p-core/transport" "github.com/libp2p/go-libp2p-peerstore/pstoremem" - "github.com/libp2p/go-tcp-transport" ma "github.com/multiformats/go-multiaddr" )