From 6774a43eae96df27a676f41aaf56d9ae5b6cd32e Mon Sep 17 00:00:00 2001
From: Zoltan Papp <zoltan.pmail@gmail.com>
Date: Wed, 1 Jul 2026 16:53:42 +0200
Subject: [PATCH] [relay] Rename ConnRacer to FallbackOpener and align file
 names with types

Rename the ConnRacer type to FallbackOpener and its constructor to
NewFallbackOpener. Rename fallback.go to fallback_opener.go and
foreign_relays.go to foreign_relays_store.go so file names mirror their
primary struct.
---
 .../{fallback.go => fallback_opener.go}       | 20 +++++++++----------
 ...eign_relays.go => foreign_relays_store.go} |  0
 shared/relay/client/manager.go                |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename shared/relay/client/{fallback.go => fallback_opener.go} (80%)
 rename shared/relay/client/{foreign_relays.go => foreign_relays_store.go} (100%)

diff --git a/shared/relay/client/fallback.go b/shared/relay/client/fallback_opener.go
similarity index 80%
rename from shared/relay/client/fallback.go
rename to shared/relay/client/fallback_opener.go
index c3434a46d..3f5272007 100644
--- a/shared/relay/client/fallback.go
+++ b/shared/relay/client/fallback_opener.go
@@ -20,7 +20,7 @@ type raceAttempt struct {
 }
 
 type connRace struct {
-	racer             *ConnRacer
+	opener            *FallbackOpener
 	peerKey           string
 	remoteRelayServer RelayServer
 	preferForeign     bool
@@ -37,19 +37,19 @@ type connRace struct {
 	lastErr      error
 }
 
-type ConnRacer struct {
+type FallbackOpener struct {
 	home         *Client
 	foreignStore *ForeignRelaysStore
 }
 
-func NewConnRacer(home *Client, foreignStore *ForeignRelaysStore) *ConnRacer {
-	return &ConnRacer{
+func NewFallbackOpener(home *Client, foreignStore *ForeignRelaysStore) *FallbackOpener {
+	return &FallbackOpener{
 		home:         home,
 		foreignStore: foreignStore,
 	}
 }
 
-func (r *ConnRacer) Run(ctx context.Context, peerKey string, remoteRelayServer RelayServer, preferForeign bool) (net.Conn, error) {
+func (r *FallbackOpener) Run(ctx context.Context, peerKey string, remoteRelayServer RelayServer, preferForeign bool) (net.Conn, error) {
 	raceCtx, cancel := context.WithTimeout(ctx, raceTotalTimeout)
 	defer cancel()
 
@@ -57,7 +57,7 @@ func (r *ConnRacer) Run(ctx context.Context, peerKey string, remoteRelayServer R
 	otherCtx, cancelOther := context.WithCancel(raceCtx)
 
 	race := &connRace{
-		racer:             r,
+		opener:            r,
 		peerKey:           peerKey,
 		remoteRelayServer: remoteRelayServer,
 		preferForeign:     preferForeign,
@@ -95,7 +95,7 @@ func (c *connRace) startOther() {
 	c.otherStarted = true
 	c.fallbackTimer.Stop()
 	go func() {
-		c.results <- c.racer.open(c.otherCtx, c.peerKey, c.remoteRelayServer, !c.preferForeign)
+		c.results <- c.opener.open(c.otherCtx, c.peerKey, c.remoteRelayServer, !c.preferForeign)
 	}()
 }
 
@@ -130,10 +130,10 @@ func (c *connRace) onTimeout() (net.Conn, error) {
 func (c *connRace) stop() {
 	c.cancelPreferred()
 	c.cancelOther()
-	go c.racer.drainLoser(c.results, c.settled, c.otherStarted)
+	go c.opener.drainLoser(c.results, c.settled, c.otherStarted)
 }
 
-func (r *ConnRacer) open(ctx context.Context, peerKey string, remoteRelayServer RelayServer, foreign bool) raceAttempt {
+func (r *FallbackOpener) open(ctx context.Context, peerKey string, remoteRelayServer RelayServer, foreign bool) raceAttempt {
 	if foreign {
 		conn, err := r.foreignStore.OpenConn(ctx, peerKey, remoteRelayServer)
 		return raceAttempt{conn: conn, err: err}
@@ -142,7 +142,7 @@ func (r *ConnRacer) open(ctx context.Context, peerKey string, remoteRelayServer
 	return raceAttempt{conn: conn, err: err}
 }
 
-func (r *ConnRacer) drainLoser(results chan raceAttempt, settled int, otherStarted bool) {
+func (r *FallbackOpener) drainLoser(results chan raceAttempt, settled int, otherStarted bool) {
 	started := 1
 	if otherStarted {
 		started = 2
diff --git a/shared/relay/client/foreign_relays.go b/shared/relay/client/foreign_relays_store.go
similarity index 100%
rename from shared/relay/client/foreign_relays.go
rename to shared/relay/client/foreign_relays_store.go
diff --git a/shared/relay/client/manager.go b/shared/relay/client/manager.go
index a550f9675..507c5edc2 100644
--- a/shared/relay/client/manager.go
+++ b/shared/relay/client/manager.go
@@ -159,8 +159,8 @@ func (m *Manager) OpenConn(ctx context.Context, remoteRelayServer RelayServer, p
 		return m.relayClient.OpenConn(ctx, peerKey)
 	}
 
-	racer := NewConnRacer(m.relayClient, m.foreign)
-	return racer.Run(ctx, peerKey, remoteRelayServer, preferForeign)
+	opener := NewFallbackOpener(m.relayClient, m.foreign)
+	return opener.Run(ctx, peerKey, remoteRelayServer, preferForeign)
 }
 
 // Ready returns true if the home Relay client is connected to the relay server.