Skip to content

config: rename IsGossipServer => IsListenServer #6525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gmalouf merged 1 commit into from
Jan 14, 2026
Merged

config: rename IsGossipServer => IsListenServer #6525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}

Expand Down
16 changes: 8 additions & 8 deletions config/localTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "")
}

Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions daemon/algod/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
}
}
Expand Down
2 changes: 1 addition & 1 deletion network/p2pNetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion network/p2pNetwork_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion network/wsNetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion node/follower_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
8 changes: 4 additions & 4 deletions node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ recreateNetwork:
}

// The health service registers itself with the network
if cfg.IsGossipServer() {
if cfg.IsListenServer() {
rpcs.MakeHealthService(node.net)
}

Expand Down Expand Up @@ -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
Expand Down
Loading