Fix linting

kylecarbs · kylecarbs · commit 9771524ae700 · 2021-07-08T14:03:49.000Z
diff --git a/wsnet/dial_test.go b/wsnet/dial_test.go
@@ -46,7 +46,7 @@ func ExampleDial_basic() {
 	// You now have access to the proxied remote port in `conn`.
 }
 
-// nolint:gocognit,nestif
+// nolint:gocognit
 func TestDial(t *testing.T) {
 	t.Run("Ping", func(t *testing.T) {
 		connectAddr, listenAddr := createDumbBroker(t)
@@ -204,12 +204,11 @@ func TestDial(t *testing.T) {
 			t.Error(err)
 			return
 		}
-		pass := "test"
-		turnAddr, closeTurn := createTURNServer(t, ice.SchemeTypeTURN, pass)
+		turnAddr, closeTurn := createTURNServer(t, ice.SchemeTypeTURN)
 		dialer, err := DialWebsocket(context.Background(), connectAddr, []webrtc.ICEServer{{
 			URLs:           []string{fmt.Sprintf("turn:%s", turnAddr)},
 			Username:       "example",
-			Credential:     pass,
+			Credential:     testPass,
 			CredentialType: webrtc.ICECredentialTypePassword,
 		}})
 		if err != nil {
diff --git a/wsnet/rtc_test.go b/wsnet/rtc_test.go
@@ -16,11 +16,11 @@ func TestDialICE(t *testing.T) {
 	t.Run("TURN with TLS", func(t *testing.T) {
 		t.Parallel()
 
-		addr, _ := createTURNServer(t, ice.SchemeTypeTURNS, "test")
+		addr, _ := createTURNServer(t, ice.SchemeTypeTURNS)
 		err := DialICE(webrtc.ICEServer{
 			URLs:           []string{fmt.Sprintf("turns:%s", addr)},
 			Username:       "example",
-			Credential:     "test",
+			Credential:     testPass,
 			CredentialType: webrtc.ICECredentialTypePassword,
 		}, &DialICEOptions{
 			Timeout:            time.Millisecond,
@@ -34,11 +34,11 @@ func TestDialICE(t *testing.T) {
 	t.Run("Protocol mismatch", func(t *testing.T) {
 		t.Parallel()
 
-		addr, _ := createTURNServer(t, ice.SchemeTypeTURNS, "test")
+		addr, _ := createTURNServer(t, ice.SchemeTypeTURNS)
 		err := DialICE(webrtc.ICEServer{
 			URLs:           []string{fmt.Sprintf("turn:%s", addr)},
 			Username:       "example",
-			Credential:     "test",
+			Credential:     testPass,
 			CredentialType: webrtc.ICECredentialTypePassword,
 		}, &DialICEOptions{
 			Timeout:            time.Millisecond,
@@ -52,7 +52,7 @@ func TestDialICE(t *testing.T) {
 	t.Run("Invalid auth", func(t *testing.T) {
 		t.Parallel()
 
-		addr, _ := createTURNServer(t, ice.SchemeTypeTURNS, "test")
+		addr, _ := createTURNServer(t, ice.SchemeTypeTURNS)
 		err := DialICE(webrtc.ICEServer{
 			URLs:           []string{fmt.Sprintf("turns:%s", addr)},
 			Username:       "example",
diff --git a/wsnet/wsnet_test.go b/wsnet/wsnet_test.go
@@ -25,6 +25,11 @@ import (
 	"nhooyr.io/websocket"
 )
 
+const (
+	// Password used connecting to the test TURN server.
+	testPass = "test"
+)
+
 // createDumbBroker proxies sockets between /listen and /connect
 // to emulate an authenticated WebSocket pair.
 func createDumbBroker(t testing.TB) (connectAddr string, listenAddr string) {
@@ -86,7 +91,7 @@ func createDumbBroker(t testing.TB) (connectAddr string, listenAddr string) {
 }
 
 // createTURNServer allocates a TURN server and returns the address.
-func createTURNServer(t *testing.T, server ice.SchemeType, pass string) (string, func()) {
+func createTURNServer(t *testing.T, server ice.SchemeType) (string, func()) {
 	var (
 		listeners   []turn.ListenerConfig
 		pcListeners []turn.PacketConnConfig
@@ -136,7 +141,7 @@ func createTURNServer(t *testing.T, server ice.SchemeType, pass string) (string,
 		ListenerConfigs:   listeners,
 		Realm:             "coder",
 		AuthHandler: func(username, realm string, srcAddr net.Addr) (key []byte, ok bool) {
-			return turn.GenerateAuthKey(username, realm, pass), true
+			return turn.GenerateAuthKey(username, realm, testPass), true
 		},
 		LoggerFactory: lf,
 	})
