Merge pull request #110 from libp2p/upgrader-interface

use the transport.Upgrader interface
libp2p · Jan 4, 2022 · 2e12799 · 2e12799
2 parents 9647169 + 081817c
commit 2e12799
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/p2p/transport/websocket/browser_integration_browser_test.go b/p2p/transport/websocket/browser_integration_browser_test.go
@@ -26,10 +26,11 @@ func TestInBrowser(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	tpt := New(&tptu.Upgrader{
-		Secure: newSecureMuxer(t, id),
-		Muxer:  new(mplex.Transport),
-	})
+	u, err := tptu.New(newSecureMuxer(t, id), new(mplex.Transport))
+	if err != nil {
+		t.Fatal(err)
+	}
+	tpt := New(u)
 	addr, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5555/ws")
 	if err != nil {
 		t.Fatal("could not parse multiaddress:" + err.Error())

diff --git a/p2p/transport/websocket/browser_integration_native_test.go b/p2p/transport/websocket/browser_integration_native_test.go
@@ -52,10 +52,11 @@ func TestInBrowser(t *testing.T) {
 		defer func() {
 			close(serverDoneSignal)
 		}()
-		tpt := New(&tptu.Upgrader{
-			Secure: newSecureMuxer(t, "serverPeer"),
-			Muxer:  new(mplex.Transport),
-		})
+		u, err := tptu.New(newSecureMuxer(t, "serverPeer"), new(mplex.Transport))
+		if err != nil {
+			t.Error("SERVER:", err)
+		}
+		tpt := New(u)
 		addr, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5555/ws")
 		if err != nil {
 			t.Error("SERVER:", err)

diff --git a/p2p/transport/websocket/websocket.go b/p2p/transport/websocket/websocket.go
@@ -4,9 +4,10 @@ package websocket
 import (
 	"context"
 
+	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/transport"
-	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
+
 	ma "github.com/multiformats/go-multiaddr"
 	mafmt "github.com/multiformats/go-multiaddr-fmt"
 	manet "github.com/multiformats/go-multiaddr/net"
@@ -28,10 +29,10 @@ var _ transport.Transport = (*WebsocketTransport)(nil)
 
 // WebsocketTransport is the actual go-libp2p transport
 type WebsocketTransport struct {
-	Upgrader *tptu.Upgrader
+	Upgrader transport.Upgrader
 }
 
-func New(u *tptu.Upgrader) *WebsocketTransport {
+func New(u transport.Upgrader) *WebsocketTransport {
 	return &WebsocketTransport{u}
 }
 
@@ -52,5 +53,5 @@ func (t *WebsocketTransport) Dial(ctx context.Context, raddr ma.Multiaddr, p pee
 	if err != nil {
 		return nil, err
 	}
-	return t.Upgrader.UpgradeOutbound(ctx, t, macon, p)
+	return t.Upgrader.Upgrade(ctx, t, macon, network.DirOutbound, p)
 }
diff --git a/p2p/transport/websocket/websocket_test.go b/p2p/transport/websocket/websocket_test.go
@@ -43,14 +43,16 @@ func TestCanDial(t *testing.T) {
 
 func TestWebsocketTransport(t *testing.T) {
 	t.Skip("This test is failing, see https://github.com/libp2p/go-ws-transport/issues/99")
-	ta := New(&tptu.Upgrader{
-		Secure: newSecureMuxer(t, "peerA"),
-		Muxer:  new(mplex.Transport),
-	})
-	tb := New(&tptu.Upgrader{
-		Secure: newSecureMuxer(t, "peerB"),
-		Muxer:  new(mplex.Transport),
-	})
+	ua, err := tptu.New(newSecureMuxer(t, "peerA"), new(mplex.Transport))
+	if err != nil {
+		t.Fatal(err)
+	}
+	ta := New(ua)
+	ub, err := tptu.New(newSecureMuxer(t, "peerB"), new(mplex.Transport))
+	if err != nil {
+		t.Fatal(err)
+	}
+	tb := New(ub)
 
 	zero := "/ip4/127.0.0.1/tcp/0/ws"
 	ttransport.SubtestTransport(t, ta, tb, zero, "peerA")