Skip to content
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

Jump to bottom

fix(testutil): allocate all ports for testnet validator at once #1946

Merged
merged 1 commit into from
Apr 22, 2024
Merged

fix(testutil): allocate all ports for testnet validator at once #1946

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
33 changes: 16 additions & 17 deletions testutil/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func init() {
}

const (
portsPerValidator = 4
portsPerValidator = 2
)

// package-wide network lock to only allow one test network at a time
Expand Down Expand Up @@ -233,24 +233,29 @@ func New(t *testing.T, cfg Config) *Network {
appCfg.GRPC.Enable = false
appCfg.GRPCWeb.Enable = false

allocPortsCount := portsPerValidator
if i == 0 {
ports, err := GetFreePorts(portsPerValidator)
require.NoError(t, err)
require.Equal(t, portsPerValidator, len(ports))
allocPortsCount += 4
}

apiListenAddr := fmt.Sprintf("tcp://0.0.0.0:%d", ports[0])
ports, err := GetFreePorts(allocPortsCount)
require.NoError(t, err)
require.Equal(t, allocPortsCount, len(ports))

if i == 0 {
apiListenAddr := fmt.Sprintf("tcp://0.0.0.0:%d", ports[2])
appCfg.API.Address = apiListenAddr

apiURL, err := url.Parse(apiListenAddr)
require.NoError(t, err)
apiAddr = fmt.Sprintf("http://%s:%s", apiURL.Hostname(), apiURL.Port())

tmCfg.RPC.ListenAddress = fmt.Sprintf("tcp://0.0.0.0:%d", ports[1])
tmCfg.RPC.ListenAddress = fmt.Sprintf("tcp://0.0.0.0:%d", ports[3])

appCfg.GRPC.Address = fmt.Sprintf("0.0.0.0:%d", ports[2])
appCfg.GRPC.Address = fmt.Sprintf("0.0.0.0:%d", ports[4])
appCfg.GRPC.Enable = true

appCfg.GRPCWeb.Address = fmt.Sprintf("0.0.0.0:%d", ports[3])
appCfg.GRPCWeb.Address = fmt.Sprintf("0.0.0.0:%d", ports[5])
appCfg.GRPCWeb.Enable = true
}

Expand All @@ -274,14 +279,8 @@ func New(t *testing.T, cfg Config) *Network {
tmCfg.Moniker = nodeDirName
monikers[i] = nodeDirName

proxyAddr, _, err := server.FreeTCPAddr()
require.NoError(t, err)
tmCfg.ProxyApp = proxyAddr

p2pAddr, _, err := server.FreeTCPAddr()
require.NoError(t, err)

tmCfg.P2P.ListenAddress = p2pAddr
tmCfg.ProxyApp = fmt.Sprintf("tcp://0.0.0.0:%d", ports[0])
tmCfg.P2P.ListenAddress = fmt.Sprintf("tcp://0.0.0.0:%d", ports[1])
tmCfg.P2P.AddrBookStrict = false
tmCfg.P2P.AllowDuplicateIP = true

Expand Down Expand Up @@ -336,7 +335,7 @@ func New(t *testing.T, cfg Config) *Network {
)
require.NoError(t, err)

p2pURL, err := url.Parse(p2pAddr)
p2pURL, err := url.Parse(tmCfg.P2P.ListenAddress)
require.NoError(t, err)

memo := fmt.Sprintf("%s@%s:%s", nodeIDs[i], p2pURL.Hostname(), p2pURL.Port())
Expand Down
Loading