From cdd2cf7e469bdca4e76063b056ea684ca37b550b Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Sat, 24 Jul 2021 19:10:23 +0200
Subject: [PATCH] chore: update go-libp2p-transport-upgrader and go-libp2p-core

---
 .../browser_integration_browser_test.go       | 16 ++++++++++---
 .../browser_integration_native_test.go        |  3 +--
 p2p/transport/websocket/muxer_test.go         | 23 +++++++++++++++++++
 p2p/transport/websocket/websocket_test.go     |  5 ++--
 4 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 p2p/transport/websocket/muxer_test.go

diff --git a/p2p/transport/websocket/browser_integration_browser_test.go b/p2p/transport/websocket/browser_integration_browser_test.go
index 6a55c30275..4c1b187ba1 100644
--- a/p2p/transport/websocket/browser_integration_browser_test.go
+++ b/p2p/transport/websocket/browser_integration_browser_test.go
@@ -8,22 +8,32 @@ import (
 	"testing"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/sec/insecure"
+	"github.com/libp2p/go-libp2p-core/crypto"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/test"
 	mplex "github.com/libp2p/go-libp2p-mplex"
 	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
 	ma "github.com/multiformats/go-multiaddr"
 )
 
 func TestInBrowser(t *testing.T) {
+	priv, _, err := test.RandTestKeyPair(crypto.Ed25519, 256)
+	if err != nil {
+		t.Fatal(err)
+	}
+	id, err := peer.IDFromPrivateKey(priv)
+	if err != nil {
+		t.Fatal(err)
+	}
 	tpt := New(&tptu.Upgrader{
-		Secure: insecure.New("browserPeer"),
+		Secure: newSecureMuxer(t, id),
 		Muxer:  new(mplex.Transport),
 	})
 	addr, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5555/ws")
 	if err != nil {
 		t.Fatal("could not parse multiaddress:" + err.Error())
 	}
-	conn, err := tpt.Dial(context.Background(), addr, "serverPeer")
+	conn, err := tpt.Dial(context.Background(), addr, id)
 	if err != nil {
 		t.Fatal("could not dial server:" + err.Error())
 	}
diff --git a/p2p/transport/websocket/browser_integration_native_test.go b/p2p/transport/websocket/browser_integration_native_test.go
index 90e438a232..72690845c1 100644
--- a/p2p/transport/websocket/browser_integration_native_test.go
+++ b/p2p/transport/websocket/browser_integration_native_test.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/libp2p/go-libp2p-core/sec/insecure"
 	mplex "github.com/libp2p/go-libp2p-mplex"
 	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
 	ma "github.com/multiformats/go-multiaddr"
@@ -53,7 +52,7 @@ func TestInBrowser(t *testing.T) {
 			close(serverDoneSignal)
 		}()
 		tpt := New(&tptu.Upgrader{
-			Secure: insecure.New("serverPeer"),
+			Secure: newSecureMuxer(t, "serverPeer"),
 			Muxer:  new(mplex.Transport),
 		})
 		addr, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5555/ws")
diff --git a/p2p/transport/websocket/muxer_test.go b/p2p/transport/websocket/muxer_test.go
new file mode 100644
index 0000000000..8042c183db
--- /dev/null
+++ b/p2p/transport/websocket/muxer_test.go
@@ -0,0 +1,23 @@
+package websocket
+
+import (
+	"testing"
+
+	csms "github.com/libp2p/go-conn-security-multistream"
+	"github.com/libp2p/go-libp2p-core/crypto"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/sec"
+	"github.com/libp2p/go-libp2p-core/sec/insecure"
+	"github.com/libp2p/go-libp2p-core/test"
+)
+
+func newSecureMuxer(t *testing.T, id peer.ID) sec.SecureMuxer {
+	t.Helper()
+	priv, _, err := test.RandTestKeyPair(crypto.Ed25519, 256)
+	if err != nil {
+		t.Fatal(err)
+	}
+	var secMuxer csms.SSMuxer
+	secMuxer.AddTransport(insecure.ID, insecure.NewWithIdentity(id, priv))
+	return &secMuxer
+}
diff --git a/p2p/transport/websocket/websocket_test.go b/p2p/transport/websocket/websocket_test.go
index 1082722e86..aa827e81fd 100644
--- a/p2p/transport/websocket/websocket_test.go
+++ b/p2p/transport/websocket/websocket_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"testing/iotest"
 
-	"github.com/libp2p/go-libp2p-core/sec/insecure"
 	mplex "github.com/libp2p/go-libp2p-mplex"
 	ttransport "github.com/libp2p/go-libp2p-testing/suites/transport"
 	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
@@ -44,11 +43,11 @@ 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: insecure.New("peerA"),
+		Secure: newSecureMuxer(t, "peerA"),
 		Muxer:  new(mplex.Transport),
 	})
 	tb := New(&tptu.Upgrader{
-		Secure: insecure.New("peerB"),
+		Secure: newSecureMuxer(t, "peerB"),
 		Muxer:  new(mplex.Transport),
 	})