fix: default configs should have free ports

celestiaorg · Aug 2, 2023 · e0b26a9 · e0b26a9
1 parent 9408e19
commit e0b26a9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/test/util/testnode/config.go b/test/util/testnode/config.go
@@ -1,6 +1,7 @@
 package testnode
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/celestiaorg/celestia-app/cmd/celestia-appd/cmd"
@@ -190,5 +191,10 @@ func DefaultTendermintConfig() *tmconfig.Config {
 	// chosen only as an arbitrary large number).
 	tmCfg.RPC.MaxBodyBytes = 200_000_000
 
+	// set all the ports to random open ones
+	tmCfg.RPC.ListenAddress = fmt.Sprintf("tcp://127.0.0.1:%d", GetFreePort())
+	tmCfg.P2P.ListenAddress = fmt.Sprintf("tcp://127.0.0.1:%d", GetFreePort())
+	tmCfg.RPC.GRPCListenAddress = fmt.Sprintf("tcp://127.0.0.1:%d", GetFreePort())
+
 	return tmCfg
 }
diff --git a/test/util/testnode/full_node.go b/test/util/testnode/full_node.go
@@ -3,7 +3,6 @@ package testnode
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"net"
 	"os"
 	"path/filepath"
@@ -155,11 +154,6 @@ func DefaultGenesisState(fundedAccounts ...string) (map[string]json.RawMessage,
 func NewNetwork(t testing.TB, cfg *Config) (cctx Context, rpcAddr, grpcAddr string) {
 	t.Helper()
 
-	tmCfg := cfg.TmConfig
-	tmCfg.RPC.ListenAddress = fmt.Sprintf("tcp://127.0.0.1:%d", GetFreePort())
-	tmCfg.P2P.ListenAddress = fmt.Sprintf("tcp://127.0.0.1:%d", GetFreePort())
-	tmCfg.RPC.GRPCListenAddress = fmt.Sprintf("tcp://127.0.0.1:%d", GetFreePort())
-
 	genState, kr, err := DefaultGenesisState(cfg.Accounts...)
 	require.NoError(t, err)
 
@@ -169,22 +163,18 @@ func NewNetwork(t testing.TB, cfg *Config) (cctx Context, rpcAddr, grpcAddr stri
 
 	chainID := cfg.ChainID
 
-	baseDir, kr, err := InitFiles(t, cfg.ConsensusParams, tmCfg, genState, kr, chainID)
+	baseDir, kr, err := InitFiles(t, cfg.ConsensusParams, cfg.TmConfig, genState, kr, chainID)
 	require.NoError(t, err)
 
 	tmNode, app, err := NewCometNode(t, baseDir, cfg)
 	require.NoError(t, err)
 
-	cctx = NewContext(context.TODO(), kr, tmCfg, chainID)
+	cctx = NewContext(context.TODO(), kr, cfg.TmConfig, chainID)
 
 	cctx, stopNode, err := StartNode(tmNode, cctx)
 	require.NoError(t, err)
 
-	appCfg := cfg.AppConfig
-	appCfg.GRPC.Address = fmt.Sprintf("127.0.0.1:%d", GetFreePort())
-	appCfg.API.Address = fmt.Sprintf("tcp://127.0.0.1:%d", GetFreePort())
-
-	cctx, cleanupGRPC, err := StartGRPCServer(app, appCfg, cctx)
+	cctx, cleanupGRPC, err := StartGRPCServer(app, cfg.AppConfig, cctx)
 	require.NoError(t, err)
 
 	t.Cleanup(func() {
@@ -193,7 +183,7 @@ func NewNetwork(t testing.TB, cfg *Config) (cctx Context, rpcAddr, grpcAddr stri
 		require.NoError(t, cleanupGRPC())
 	})
 
-	return cctx, tmCfg.RPC.ListenAddress, appCfg.GRPC.Address
+	return cctx, cfg.TmConfig.RPC.ListenAddress, cfg.AppConfig.GRPC.Address
 }
 
 func GetFreePort() int {

diff --git a/test/util/testnode/rpc_client.go b/test/util/testnode/rpc_client.go
@@ -2,6 +2,7 @@ package testnode
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path"
 	"strings"
@@ -79,7 +80,10 @@ func StartGRPCServer(app srvtypes.Application, appCfg *srvconfig.Config, cctx Co
 
 // DefaultAppConfig wraps the default config described in the server
 func DefaultAppConfig() *srvconfig.Config {
-	return srvconfig.DefaultConfig()
+	appCfg := srvconfig.DefaultConfig()
+	appCfg.GRPC.Address = fmt.Sprintf("127.0.0.1:%d", GetFreePort())
+	appCfg.API.Address = fmt.Sprintf("tcp://127.0.0.1:%d", GetFreePort())
+	return appCfg
 }
 
 // removeDir removes the directory `rootDir`.