From e3a166d99e9fa890d3135b41ce895533ed4d1abb Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Thu, 23 Jan 2025 15:37:13 +0100
Subject: [PATCH] p2p/nat: update tests

---
 p2p/nat/nat_test.go  | 3 ++-
 p2p/nat/stun.go      | 4 +++-
 p2p/nat/stun_test.go | 7 ++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/p2p/nat/nat_test.go b/p2p/nat/nat_test.go
index 6279566ad9..2c5352b47e 100644
--- a/p2p/nat/nat_test.go
+++ b/p2p/nat/nat_test.go
@@ -18,6 +18,7 @@ package nat
 
 import (
 	"net"
+	"strings"
 	"testing"
 	"time"
 
@@ -70,7 +71,7 @@ func TestParseStun(t *testing.T) {
 		natStr string
 		want   *stun
 	}{
-		{"stun:default", &stun{serverList: stunDefaultServerList}},
+		{"stun:default", &stun{serverList: strings.Split(stunDefaultServers, "\n")}},
 		{"stun:1.2.3.4:1234", &stun{serverList: []string{"1.2.3.4:1234"}}},
 	}
 
diff --git a/p2p/nat/stun.go b/p2p/nat/stun.go
index 94594d96db..4e5eec8be7 100644
--- a/p2p/nat/stun.go
+++ b/p2p/nat/stun.go
@@ -34,6 +34,8 @@ var stunDefaultServers string
 
 const requestLimit = 3
 
+var errSTUNFailed = errors.New("STUN requests failed")
+
 type stun struct {
 	serverList []string
 }
@@ -80,7 +82,7 @@ func (s *stun) ExternalIP() (net.IP, error) {
 		}
 		return ip, nil
 	}
-	return nil, errors.New("STUN requests failed")
+	return nil, errSTUNFailed
 }
 
 func (s *stun) randomServers(n int) []string {
diff --git a/p2p/nat/stun_test.go b/p2p/nat/stun_test.go
index b681ba56b1..fe16ecdeb3 100644
--- a/p2p/nat/stun_test.go
+++ b/p2p/nat/stun_test.go
@@ -15,9 +15,10 @@ func TestNatStun(t *testing.T) {
 
 func TestUnreachedNatServer(t *testing.T) {
 	stun := &stun{
-		serverList: []string{"1.2.3.4:1234", "1.2.3.4:1234", "1.2.3.4:1234"},
+		serverList: []string{"198.51.100.2:1234", "198.51.100.5"},
 	}
-	stun.serverList = append(stun.serverList, stunDefaultServerList...)
 	_, err := stun.ExternalIP()
-	assert.NoError(t, err)
+	if err != errSTUNFailed {
+		t.Fatal("wrong error:", err)
+	}
 }