From ce15c49858295904afdf80cc9542015b5cd280c4 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sun, 2 Jan 2022 17:17:01 +0400 Subject: [PATCH] use the transport.Upgrader interface --- p2p/protocol/internal/circuitv1-deprecated/dial.go | 4 +++- p2p/protocol/internal/circuitv1-deprecated/relay.go | 9 ++++----- p2p/protocol/internal/circuitv1-deprecated/relay_test.go | 2 +- p2p/protocol/internal/circuitv1-deprecated/transport.go | 3 +-- .../internal/circuitv1-deprecated/transport_test.go | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/p2p/protocol/internal/circuitv1-deprecated/dial.go b/p2p/protocol/internal/circuitv1-deprecated/dial.go index 1a070fe0fa..c1f2c63dce 100644 --- a/p2p/protocol/internal/circuitv1-deprecated/dial.go +++ b/p2p/protocol/internal/circuitv1-deprecated/dial.go @@ -4,6 +4,8 @@ import ( "context" "fmt" + "github.com/libp2p/go-libp2p-core/network" + "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/transport" ma "github.com/multiformats/go-multiaddr" @@ -15,7 +17,7 @@ func (d *RelayTransport) Dial(ctx context.Context, a ma.Multiaddr, p peer.ID) (t return nil, err } c.tagHop() - return d.upgrader.UpgradeOutbound(ctx, d, c, p) + return d.upgrader.Upgrade(ctx, d, c, network.DirOutbound, p) } func (r *Relay) Dial(ctx context.Context, a ma.Multiaddr, p peer.ID) (*Conn, error) { diff --git a/p2p/protocol/internal/circuitv1-deprecated/relay.go b/p2p/protocol/internal/circuitv1-deprecated/relay.go index 8c7f46dc3d..8ba9627d7e 100644 --- a/p2p/protocol/internal/circuitv1-deprecated/relay.go +++ b/p2p/protocol/internal/circuitv1-deprecated/relay.go @@ -14,11 +14,10 @@ import ( "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/peerstore" - - pool "github.com/libp2p/go-buffer-pool" - tptu "github.com/libp2p/go-libp2p-transport-upgrader" + "github.com/libp2p/go-libp2p-core/transport" logging "github.com/ipfs/go-log" + pool "github.com/libp2p/go-buffer-pool" ma "github.com/multiformats/go-multiaddr" ) @@ -42,7 +41,7 @@ var ( // Relay is the relay transport and service. type Relay struct { host host.Host - upgrader *tptu.Upgrader + upgrader transport.Upgrader ctx context.Context ctxCancel context.CancelFunc self peer.ID @@ -94,7 +93,7 @@ func (e RelayError) Error() string { } // NewRelay constructs a new relay. -func NewRelay(h host.Host, upgrader *tptu.Upgrader, opts ...RelayOpt) (*Relay, error) { +func NewRelay(h host.Host, upgrader transport.Upgrader, opts ...RelayOpt) (*Relay, error) { r := &Relay{ upgrader: upgrader, host: h, diff --git a/p2p/protocol/internal/circuitv1-deprecated/relay_test.go b/p2p/protocol/internal/circuitv1-deprecated/relay_test.go index 8f397a933e..5753c37e84 100644 --- a/p2p/protocol/internal/circuitv1-deprecated/relay_test.go +++ b/p2p/protocol/internal/circuitv1-deprecated/relay_test.go @@ -44,7 +44,7 @@ func getNetHosts(t *testing.T, n int) []host.Host { } func newTestRelay(t *testing.T, host host.Host, opts ...RelayOpt) *Relay { - r, err := NewRelay(host, swarmt.GenUpgrader(host.Network().(*swarm.Swarm)), opts...) + r, err := NewRelay(host, swarmt.GenUpgrader(t, host.Network().(*swarm.Swarm)), opts...) if err != nil { t.Fatal(err) } diff --git a/p2p/protocol/internal/circuitv1-deprecated/transport.go b/p2p/protocol/internal/circuitv1-deprecated/transport.go index a064a9fc18..39515876bf 100644 --- a/p2p/protocol/internal/circuitv1-deprecated/transport.go +++ b/p2p/protocol/internal/circuitv1-deprecated/transport.go @@ -6,7 +6,6 @@ import ( "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/transport" - tptu "github.com/libp2p/go-libp2p-transport-upgrader" ma "github.com/multiformats/go-multiaddr" ) @@ -52,7 +51,7 @@ func (r *RelayTransport) Close() error { } // AddRelayTransport constructs a relay and adds it as a transport to the host network. -func AddRelayTransport(h host.Host, upgrader *tptu.Upgrader, opts ...RelayOpt) error { +func AddRelayTransport(h host.Host, upgrader transport.Upgrader, opts ...RelayOpt) error { n, ok := h.Network().(transport.TransportNetwork) if !ok { return fmt.Errorf("%v is not a transport network", h.Network()) diff --git a/p2p/protocol/internal/circuitv1-deprecated/transport_test.go b/p2p/protocol/internal/circuitv1-deprecated/transport_test.go index 55f0cfe3fd..cc6c8a59cc 100644 --- a/p2p/protocol/internal/circuitv1-deprecated/transport_test.go +++ b/p2p/protocol/internal/circuitv1-deprecated/transport_test.go @@ -26,17 +26,17 @@ var msg = []byte("relay works!") func testSetupRelay(t *testing.T) []host.Host { hosts := getNetHosts(t, 3) - err := AddRelayTransport(hosts[0], swarmt.GenUpgrader(hosts[0].Network().(*swarm.Swarm))) + err := AddRelayTransport(hosts[0], swarmt.GenUpgrader(t, hosts[0].Network().(*swarm.Swarm))) if err != nil { t.Fatal(err) } - err = AddRelayTransport(hosts[1], swarmt.GenUpgrader(hosts[1].Network().(*swarm.Swarm)), OptHop) + err = AddRelayTransport(hosts[1], swarmt.GenUpgrader(t, hosts[1].Network().(*swarm.Swarm)), OptHop) if err != nil { t.Fatal(err) } - err = AddRelayTransport(hosts[2], swarmt.GenUpgrader(hosts[2].Network().(*swarm.Swarm))) + err = AddRelayTransport(hosts[2], swarmt.GenUpgrader(t, hosts[2].Network().(*swarm.Swarm))) if err != nil { t.Fatal(err) }