Revert "[relay] Update GO version and QUIC version (#4736)" (#5055)

This reverts commit 8722b79799.
2026-10-12 16:39:09 +02:00 · 2026-01-07 19:02:20 +01:00
parent 8722b79799
commit 24df442198
78 changed files with 341 additions and 312 deletions
@@ -19,7 +19,15 @@ import (
 )

 var (
-	hmacTokenStore = &hmac.TokenStore{}
+	hmacTokenStore   = &hmac.TokenStore{}
+	serverListenAddr = "127.0.0.1:1234"
+	serverURL        = "rel://127.0.0.1:1234"
+	serverCfg        = server.Config{
+		Meter:          otel.Meter(""),
+		ExposedAddress: serverURL,
+		TLSSupport:     false,
+		AuthValidator:  &allow.Auth{},
+	}
 )

 func TestMain(m *testing.M) {
@@ -28,20 +36,8 @@ func TestMain(m *testing.M) {
 	os.Exit(code)
 }

-// newClientTestServerConfig creates a new server config for client testing with the given address
-func newClientTestServerConfig(address string) server.Config {
-	return server.Config{
-		Meter:          otel.Meter(""),
-		ExposedAddress: "rel://" + address,
-		TLSSupport:     false,
-		AuthValidator:  &allow.Auth{},
-	}
-}
-
 func TestClient(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:50001"
-	serverCfg := newClientTestServerConfig(serverListenAddr)

 	srv, err := server.NewServer(serverCfg)
 	if err != nil {
@@ -68,7 +64,7 @@ func TestClient(t *testing.T) {
 		t.Fatalf("failed to start server: %s", err)
 	}
 	t.Log("alice connecting to server")
-	clientAlice := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "alice", iface.DefaultMTU)
+	clientAlice := NewClient(serverURL, hmacTokenStore, "alice", iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)
@@ -76,7 +72,7 @@ func TestClient(t *testing.T) {
 	defer clientAlice.Close()

 	t.Log("placeholder connecting to server")
-	clientPlaceHolder := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "clientPlaceHolder", iface.DefaultMTU)
+	clientPlaceHolder := NewClient(serverURL, hmacTokenStore, "clientPlaceHolder", iface.DefaultMTU)
 	err = clientPlaceHolder.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)
@@ -84,7 +80,7 @@ func TestClient(t *testing.T) {
 	defer clientPlaceHolder.Close()

 	t.Log("Bob connecting to server")
-	clientBob := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "bob", iface.DefaultMTU)
+	clientBob := NewClient(serverURL, hmacTokenStore, "bob", iface.DefaultMTU)
 	err = clientBob.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)
@@ -124,8 +120,6 @@ func TestClient(t *testing.T) {

 func TestRegistration(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:50101"
-	serverCfg := newClientTestServerConfig(serverListenAddr)
 	srvCfg := server.ListenerConfig{Address: serverListenAddr}
 	srv, err := server.NewServer(serverCfg)
 	if err != nil {
@@ -144,7 +138,7 @@ func TestRegistration(t *testing.T) {
 		t.Fatalf("failed to start server: %s", err)
 	}

-	clientAlice := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "alice", iface.DefaultMTU)
+	clientAlice := NewClient(serverURL, hmacTokenStore, "alice", iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err != nil {
 		_ = srv.Shutdown(ctx)
@@ -163,7 +157,7 @@ func TestRegistration(t *testing.T) {
 func TestRegistrationTimeout(t *testing.T) {
 	ctx := context.Background()
 	fakeUDPListener, err := net.ListenUDP("udp", &net.UDPAddr{
-		Port: 50201,
+		Port: 1234,
 		IP:   net.ParseIP("0.0.0.0"),
 	})
 	if err != nil {
@@ -174,7 +168,7 @@ func TestRegistrationTimeout(t *testing.T) {
 	}(fakeUDPListener)

 	fakeTCPListener, err := net.ListenTCP("tcp", &net.TCPAddr{
-		Port: 50201,
+		Port: 1234,
 		IP:   net.ParseIP("0.0.0.0"),
 	})
 	if err != nil {
@@ -184,7 +178,7 @@ func TestRegistrationTimeout(t *testing.T) {
 		_ = fakeTCPListener.Close()
 	}(fakeTCPListener)

-	clientAlice := NewClient("127.0.0.1:50201", hmacTokenStore, "alice", iface.DefaultMTU)
+	clientAlice := NewClient("127.0.0.1:1234", hmacTokenStore, "alice", iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err == nil {
 		t.Errorf("failed to connect to server: %s", err)
@@ -198,8 +192,6 @@ func TestRegistrationTimeout(t *testing.T) {

 func TestEcho(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:50301"
-	serverCfg := newClientTestServerConfig(serverListenAddr)
 	idAlice := "alice"
 	idBob := "bob"
 	srvCfg := server.ListenerConfig{Address: serverListenAddr}
@@ -227,7 +219,7 @@ func TestEcho(t *testing.T) {
 		t.Fatalf("failed to start server: %s", err)
 	}

-	clientAlice := NewClient(serverCfg.ExposedAddress, hmacTokenStore, idAlice, iface.DefaultMTU)
+	clientAlice := NewClient(serverURL, hmacTokenStore, idAlice, iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)
@@ -239,7 +231,7 @@ func TestEcho(t *testing.T) {
 		}
 	}()

-	clientBob := NewClient(serverCfg.ExposedAddress, hmacTokenStore, idBob, iface.DefaultMTU)
+	clientBob := NewClient(serverURL, hmacTokenStore, idBob, iface.DefaultMTU)
 	err = clientBob.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)
@@ -290,8 +282,6 @@ func TestEcho(t *testing.T) {

 func TestBindToUnavailabePeer(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:50401"
-	serverCfg := newClientTestServerConfig(serverListenAddr)

 	srvCfg := server.ListenerConfig{Address: serverListenAddr}
 	srv, err := server.NewServer(serverCfg)
@@ -319,7 +309,7 @@ func TestBindToUnavailabePeer(t *testing.T) {
 		t.Fatalf("failed to start server: %s", err)
 	}

-	clientAlice := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "alice", iface.DefaultMTU)
+	clientAlice := NewClient(serverURL, hmacTokenStore, "alice", iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err != nil {
 		t.Errorf("failed to connect to server: %s", err)
@@ -338,8 +328,6 @@ func TestBindToUnavailabePeer(t *testing.T) {

 func TestBindReconnect(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:50501"
-	serverCfg := newClientTestServerConfig(serverListenAddr)

 	srvCfg := server.ListenerConfig{Address: serverListenAddr}
 	srv, err := server.NewServer(serverCfg)
@@ -367,13 +355,13 @@ func TestBindReconnect(t *testing.T) {
 		t.Fatalf("failed to start server: %s", err)
 	}

-	clientAlice := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "alice", iface.DefaultMTU)
+	clientAlice := NewClient(serverURL, hmacTokenStore, "alice", iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)
 	}

-	clientBob := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "bob", iface.DefaultMTU)
+	clientBob := NewClient(serverURL, hmacTokenStore, "bob", iface.DefaultMTU)
 	err = clientBob.Connect(ctx)
 	if err != nil {
 		t.Errorf("failed to connect to server: %s", err)
@@ -395,7 +383,7 @@ func TestBindReconnect(t *testing.T) {
 		t.Errorf("failed to close client: %s", err)
 	}

-	clientAlice = NewClient(serverCfg.ExposedAddress, hmacTokenStore, "alice", iface.DefaultMTU)
+	clientAlice = NewClient(serverURL, hmacTokenStore, "alice", iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err != nil {
 		t.Errorf("failed to connect to server: %s", err)
@@ -441,8 +429,6 @@ func TestBindReconnect(t *testing.T) {

 func TestCloseConn(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:50601"
-	serverCfg := newClientTestServerConfig(serverListenAddr)

 	srvCfg := server.ListenerConfig{Address: serverListenAddr}
 	srv, err := server.NewServer(serverCfg)
@@ -470,13 +456,13 @@ func TestCloseConn(t *testing.T) {
 		t.Fatalf("failed to start server: %s", err)
 	}

-	bob := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "bob", iface.DefaultMTU)
+	bob := NewClient(serverURL, hmacTokenStore, "bob", iface.DefaultMTU)
 	err = bob.Connect(ctx)
 	if err != nil {
 		t.Errorf("failed to connect to server: %s", err)
 	}

-	clientAlice := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "alice", iface.DefaultMTU)
+	clientAlice := NewClient(serverURL, hmacTokenStore, "alice", iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err != nil {
 		t.Errorf("failed to connect to server: %s", err)
@@ -506,8 +492,6 @@ func TestCloseConn(t *testing.T) {

 func TestCloseRelayConn(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:50701"
-	serverCfg := newClientTestServerConfig(serverListenAddr)

 	srvCfg := server.ListenerConfig{Address: serverListenAddr}
 	srv, err := server.NewServer(serverCfg)
@@ -534,13 +518,13 @@ func TestCloseRelayConn(t *testing.T) {
 		t.Fatalf("failed to start server: %s", err)
 	}

-	bob := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "bob", iface.DefaultMTU)
+	bob := NewClient(serverURL, hmacTokenStore, "bob", iface.DefaultMTU)
 	err = bob.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)
 	}

-	clientAlice := NewClient(serverCfg.ExposedAddress, hmacTokenStore, "alice", iface.DefaultMTU)
+	clientAlice := NewClient(serverURL, hmacTokenStore, "alice", iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)
@@ -566,8 +550,6 @@ func TestCloseRelayConn(t *testing.T) {

 func TestCloseByServer(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:50801"
-	serverCfg := newClientTestServerConfig(serverListenAddr)

 	srvCfg := server.ListenerConfig{Address: serverListenAddr}
 	srv1, err := server.NewServer(serverCfg)
@@ -590,7 +572,7 @@ func TestCloseByServer(t *testing.T) {

 	idAlice := "alice"
 	log.Debugf("connect by alice")
-	relayClient := NewClient(serverCfg.ExposedAddress, hmacTokenStore, idAlice, iface.DefaultMTU)
+	relayClient := NewClient(serverURL, hmacTokenStore, idAlice, iface.DefaultMTU)
 	if err = relayClient.Connect(ctx); err != nil {
 		log.Fatalf("failed to connect to server: %s", err)
 	}
@@ -625,8 +607,6 @@ func TestCloseByServer(t *testing.T) {

 func TestCloseByClient(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:50901"
-	serverCfg := newClientTestServerConfig(serverListenAddr)

 	srvCfg := server.ListenerConfig{Address: serverListenAddr}
 	srv, err := server.NewServer(serverCfg)
@@ -648,7 +628,7 @@ func TestCloseByClient(t *testing.T) {

 	idAlice := "alice"
 	log.Debugf("connect by alice")
-	relayClient := NewClient(serverCfg.ExposedAddress, hmacTokenStore, idAlice, iface.DefaultMTU)
+	relayClient := NewClient(serverURL, hmacTokenStore, idAlice, iface.DefaultMTU)
 	err = relayClient.Connect(ctx)
 	if err != nil {
 		log.Fatalf("failed to connect to server: %s", err)
@@ -672,8 +652,6 @@ func TestCloseByClient(t *testing.T) {

 func TestCloseNotDrainedChannel(t *testing.T) {
 	ctx := context.Background()
-	serverListenAddr := "127.0.0.1:51001"
-	serverCfg := newClientTestServerConfig(serverListenAddr)
 	idAlice := "alice"
 	idBob := "bob"
 	srvCfg := server.ListenerConfig{Address: serverListenAddr}
@@ -701,7 +679,7 @@ func TestCloseNotDrainedChannel(t *testing.T) {
 		t.Fatalf("failed to start server: %s", err)
 	}

-	clientAlice := NewClient(serverCfg.ExposedAddress, hmacTokenStore, idAlice, iface.DefaultMTU)
+	clientAlice := NewClient(serverURL, hmacTokenStore, idAlice, iface.DefaultMTU)
 	err = clientAlice.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)
@@ -713,7 +691,7 @@ func TestCloseNotDrainedChannel(t *testing.T) {
 		}
 	}()

-	clientBob := NewClient(serverCfg.ExposedAddress, hmacTokenStore, idBob, iface.DefaultMTU)
+	clientBob := NewClient(serverURL, hmacTokenStore, idBob, iface.DefaultMTU)
 	err = clientBob.Connect(ctx)
 	if err != nil {
 		t.Fatalf("failed to connect to server: %s", err)