From 254877a9676cfb27ce8d9415a552d94aaf829ae7 Mon Sep 17 00:00:00 2001 From: cce <51567+cce@users.noreply.github.com> Date: Tue, 13 Jan 2026 13:51:52 -0500 Subject: [PATCH] change IsGossipServer => IsListenServer --- config/config_test.go | 62 +++++++++++++++++++------------------- config/localTemplate.go | 16 +++++----- daemon/algod/server.go | 6 ++-- network/p2pNetwork.go | 2 +- network/p2pNetwork_test.go | 2 +- network/wsNetwork.go | 2 +- node/follower_node.go | 2 +- node/node.go | 8 ++--- 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/config/config_test.go b/config/config_test.go index ad4597a4b7..19cf29952d 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -653,83 +653,83 @@ func TestLocal_TxFiltering(t *testing.T) { require.True(t, cfg.TxFilterCanonicalEnabled()) } -func TestLocal_IsGossipServer(t *testing.T) { +func TestLocal_IsListenServer(t *testing.T) { partitiontest.PartitionTest(t) t.Parallel() cfg := GetDefaultLocal() - require.False(t, cfg.IsGossipServer()) - require.False(t, cfg.IsWsGossipServer()) - require.False(t, cfg.IsP2PGossipServer()) + require.False(t, cfg.IsListenServer()) + require.False(t, cfg.IsWsListenServer()) + require.False(t, cfg.IsP2PListenServer()) require.False(t, cfg.IsHybridServer()) cfg.NetAddress = ":4160" - require.True(t, cfg.IsGossipServer()) - require.True(t, cfg.IsWsGossipServer()) - require.False(t, cfg.IsP2PGossipServer()) + require.True(t, cfg.IsListenServer()) + require.True(t, cfg.IsWsListenServer()) + require.False(t, cfg.IsP2PListenServer()) require.False(t, cfg.IsHybridServer()) cfg.EnableGossipService = false // EnableGossipService does not matter - require.True(t, cfg.IsGossipServer()) - require.True(t, cfg.IsWsGossipServer()) - require.False(t, cfg.IsP2PGossipServer()) + require.True(t, cfg.IsListenServer()) + require.True(t, cfg.IsWsListenServer()) + require.False(t, cfg.IsP2PListenServer()) require.False(t, cfg.IsHybridServer()) cfg.EnableP2P = true cfg.NetAddress = ":4160" - require.True(t, cfg.IsGossipServer()) - require.False(t, cfg.IsWsGossipServer()) - require.True(t, cfg.IsP2PGossipServer()) + require.True(t, cfg.IsListenServer()) + require.False(t, cfg.IsWsListenServer()) + require.True(t, cfg.IsP2PListenServer()) require.False(t, cfg.IsHybridServer()) cfg.EnableP2P = false cfg.EnableP2PHybridMode = true // with net address set it is ws net gossip server - require.True(t, cfg.IsGossipServer()) - require.True(t, cfg.IsWsGossipServer()) - require.False(t, cfg.IsP2PGossipServer()) + require.True(t, cfg.IsListenServer()) + require.True(t, cfg.IsWsListenServer()) + require.False(t, cfg.IsP2PListenServer()) require.False(t, cfg.IsHybridServer()) cfg.EnableP2PHybridMode = true cfg.NetAddress = "" - require.False(t, cfg.IsGossipServer()) - require.False(t, cfg.IsWsGossipServer()) - require.False(t, cfg.IsP2PGossipServer()) + require.False(t, cfg.IsListenServer()) + require.False(t, cfg.IsWsListenServer()) + require.False(t, cfg.IsP2PListenServer()) require.False(t, cfg.IsHybridServer()) cfg.EnableP2PHybridMode = true cfg.P2PHybridNetAddress = ":4190" - require.True(t, cfg.IsGossipServer()) - require.False(t, cfg.IsWsGossipServer()) - require.True(t, cfg.IsP2PGossipServer()) + require.True(t, cfg.IsListenServer()) + require.False(t, cfg.IsWsListenServer()) + require.True(t, cfg.IsP2PListenServer()) require.False(t, cfg.IsHybridServer()) cfg.EnableP2PHybridMode = true cfg.NetAddress = ":4160" cfg.P2PHybridNetAddress = ":4190" - require.True(t, cfg.IsGossipServer()) - require.True(t, cfg.IsWsGossipServer()) - require.True(t, cfg.IsP2PGossipServer()) + require.True(t, cfg.IsListenServer()) + require.True(t, cfg.IsWsListenServer()) + require.True(t, cfg.IsP2PListenServer()) require.True(t, cfg.IsHybridServer()) cfg.EnableP2PHybridMode = true cfg.EnableP2P = true cfg.NetAddress = ":4160" cfg.P2PHybridNetAddress = ":4190" - require.True(t, cfg.IsGossipServer()) - require.True(t, cfg.IsWsGossipServer()) - require.True(t, cfg.IsP2PGossipServer()) + require.True(t, cfg.IsListenServer()) + require.True(t, cfg.IsWsListenServer()) + require.True(t, cfg.IsP2PListenServer()) require.True(t, cfg.IsHybridServer()) cfg.EnableP2PHybridMode = true cfg.EnableP2P = true cfg.NetAddress = ":4160" cfg.P2PHybridNetAddress = "" - require.True(t, cfg.IsGossipServer()) - require.True(t, cfg.IsWsGossipServer()) - require.False(t, cfg.IsP2PGossipServer()) + require.True(t, cfg.IsListenServer()) + require.True(t, cfg.IsWsListenServer()) + require.False(t, cfg.IsP2PListenServer()) require.False(t, cfg.IsHybridServer()) } diff --git a/config/localTemplate.go b/config/localTemplate.go index e7d02342df..361935540c 100644 --- a/config/localTemplate.go +++ b/config/localTemplate.go @@ -765,20 +765,20 @@ func (cfg Local) TxFilterCanonicalEnabled() bool { return cfg.TxIncomingFilteringFlags&txFilterCanonical != 0 } -// IsGossipServer returns true if this node supposed to start websocket or p2p server -func (cfg Local) IsGossipServer() bool { - return cfg.IsWsGossipServer() || cfg.IsP2PGossipServer() +// IsListenServer returns true if this node supposed to start websocket or p2p server +func (cfg Local) IsListenServer() bool { + return cfg.IsWsListenServer() || cfg.IsP2PListenServer() } -// IsWsGossipServer returns true if a node is configured to run a listening ws net -func (cfg Local) IsWsGossipServer() bool { +// IsWsListenServer returns true if a node is configured to run a listening ws net +func (cfg Local) IsWsListenServer() bool { // 1. NetAddress is set and EnableP2P is not set // 2. NetAddress is set and EnableP2PHybridMode is set then EnableP2P is overridden by EnableP2PHybridMode return cfg.NetAddress != "" && (!cfg.EnableP2P || cfg.EnableP2PHybridMode) } -// IsP2PGossipServer returns true if a node is configured to run a listening p2p net -func (cfg Local) IsP2PGossipServer() bool { +// IsP2PListenServer returns true if a node is configured to run a listening p2p net +func (cfg Local) IsP2PListenServer() bool { return (cfg.EnableP2P && !cfg.EnableP2PHybridMode && cfg.NetAddress != "") || (cfg.EnableP2PHybridMode && cfg.P2PHybridNetAddress != "") } @@ -1014,7 +1014,7 @@ func (cfg *Local) AdjustConnectionLimits(requiredFDs, maxFDs uint64) bool { // split the rest of the delta between ws and p2p evenly splitRatio = 2 } - if cfg.IsWsGossipServer() || cfg.IsP2PGossipServer() { + if cfg.IsWsListenServer() || cfg.IsP2PListenServer() { if cfg.IncomingConnectionsLimit > int(restDelta) { cfg.IncomingConnectionsLimit -= int(restDelta) / splitRatio } else { diff --git a/daemon/algod/server.go b/daemon/algod/server.go index 5c15bee43c..89ec3eed42 100644 --- a/daemon/algod/server.go +++ b/daemon/algod/server.go @@ -151,13 +151,13 @@ func (s *Server) Initialize(cfg config.Local, phonebookAddresses []string, genes } } - if cfg.IsGossipServer() { + if cfg.IsListenServer() { var ot basics.OverflowTracker fdRequired = ot.Add(fdRequired, network.ReservedHealthServiceConnections) if ot.Overflowed { return errors.New("Initialize() overflowed when adding up ReservedHealthServiceConnections to the existing RLIMIT_NOFILE value; decrease RestConnectionsHardLimit") } - if cfg.IsGossipServer() { + if cfg.IsListenServer() { fdRequired = ot.Add(fdRequired, uint64(cfg.IncomingConnectionsLimit)) if ot.Overflowed { return errors.New("Initialize() overflowed when adding up IncomingConnectionsLimit to the existing RLIMIT_NOFILE value; decrease IncomingConnectionsLimit") @@ -189,7 +189,7 @@ func (s *Server) Initialize(cfg config.Local, phonebookAddresses []string, genes if cfg.IsHybridServer() && cfg.P2PHybridIncomingConnectionsLimit == 0 { return errors.New("Initialize() failed to adjust p2p hybrid connection limits") } - if cfg.IsGossipServer() && cfg.IncomingConnectionsLimit == 0 { + if cfg.IsListenServer() && cfg.IncomingConnectionsLimit == 0 { return errors.New("Initialize() failed to adjust connection limits") } } diff --git a/network/p2pNetwork.go b/network/p2pNetwork.go index cf09833270..f7cfaa6c90 100644 --- a/network/p2pNetwork.go +++ b/network/p2pNetwork.go @@ -241,7 +241,7 @@ func NewP2PNetwork(log logging.Logger, cfg config.Local, datadir string, phonebo return nil, err } - relayMessages := cfg.IsGossipServer() || cfg.ForceRelayMessages + relayMessages := cfg.IsListenServer() || cfg.ForceRelayMessages net := &P2PNetwork{ log: log, config: cfg, diff --git a/network/p2pNetwork_test.go b/network/p2pNetwork_test.go index 0d70be3cfd..9d8762912c 100644 --- a/network/p2pNetwork_test.go +++ b/network/p2pNetwork_test.go @@ -195,7 +195,7 @@ func TestP2PSubmitTXNoGossip(t *testing.T) { // run netC in NPN mode (no relay => no gossip sup => no TX receiving) cfg.ForceFetchTransactions = false - // Have to unset NetAddress to get IsGossipServer to return false + // Have to unset NetAddress to get IsListenServer to return false cfg.NetAddress = "" netC, err := NewP2PNetwork(log, cfg, "", phoneBookAddresses, genesisInfo, &nopeNodeInfo{}, nil, nil) require.NoError(t, err) diff --git a/network/wsNetwork.go b/network/wsNetwork.go index edcf505eaa..765bdd93dd 100644 --- a/network/wsNetwork.go +++ b/network/wsNetwork.go @@ -580,7 +580,7 @@ func (wn *WebsocketNetwork) setup() error { wn.server.IdleTimeout = httpServerIdleTimeout wn.server.MaxHeaderBytes = httpServerMaxHeaderBytes wn.ctx, wn.ctxCancel = context.WithCancel(context.Background()) - wn.relayMessages = wn.config.IsGossipServer() || wn.config.ForceRelayMessages + wn.relayMessages = wn.config.IsListenServer() || wn.config.ForceRelayMessages if wn.relayMessages || wn.config.ForceFetchTransactions { wn.wantTXGossip.Store(wantTXGossipYes) } diff --git a/node/follower_node.go b/node/follower_node.go index 58c3b61ac3..36f926d383 100644 --- a/node/follower_node.go +++ b/node/follower_node.go @@ -128,7 +128,7 @@ func MakeFollower(log logging.Logger, rootDir string, cfg config.Local, phoneboo node.ledger.RegisterBlockListeners([]ledgercore.BlockListener{node}) - if cfg.IsGossipServer() { + if cfg.IsListenServer() { rpcs.MakeHealthService(node.net) } diff --git a/node/node.go b/node/node.go index d99b0e7f96..23aae5cd06 100644 --- a/node/node.go +++ b/node/node.go @@ -293,7 +293,7 @@ recreateNetwork: } // The health service registers itself with the network - if cfg.IsGossipServer() { + if cfg.IsListenServer() { rpcs.MakeHealthService(node.net) } @@ -437,13 +437,13 @@ func (node *AlgorandFullNode) Start() error { // Capabilities returns the node's capabilities for advertising to other nodes. func (node *AlgorandFullNode) Capabilities() []p2p.Capability { var caps []p2p.Capability - if node.config.Archival && node.config.IsGossipServer() { + if node.config.Archival && node.config.IsListenServer() { caps = append(caps, p2p.Archival) } - if node.config.StoresCatchpoints() && node.config.IsGossipServer() { + if node.config.StoresCatchpoints() && node.config.IsListenServer() { caps = append(caps, p2p.Catchpoints) } - if node.config.EnableGossipService && node.config.IsGossipServer() { + if node.config.EnableGossipService && node.config.IsListenServer() { caps = append(caps, p2p.Gossip) } return caps