From 368496667669f40b1539badced88a658e5b79ce1 Mon Sep 17 00:00:00 2001
From: Marko <marbar3778@yahoo.com>
Date: Wed, 28 Dec 2022 00:46:12 +0100
Subject: [PATCH] chore: remove unused code from server (#14437)

---
 server/test_helpers.go            | 26 --------------------------
 testutil/network/network.go       | 12 ++++++------
 testutil/network/util.go          | 20 ++++++++++++++++++++
 x/genutil/client/cli/init_test.go |  3 ++-
 4 files changed, 28 insertions(+), 33 deletions(-)
 delete mode 100644 server/test_helpers.go

diff --git a/server/test_helpers.go b/server/test_helpers.go
deleted file mode 100644
index 68d87aa08d..0000000000
--- a/server/test_helpers.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package server
-
-import (
-	"fmt"
-	"net"
-
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-)
-
-// Get a free address for a test tendermint server
-// protocol is either tcp, http, etc
-func FreeTCPAddr() (addr, port string, err error) {
-	l, err := net.Listen("tcp", "localhost:0")
-	if err != nil {
-		return "", "", err
-	}
-
-	if err := l.Close(); err != nil {
-		return "", "", sdkerrors.Wrap(err, "couldn't close the listener")
-	}
-
-	portI := l.Addr().(*net.TCPAddr).Port
-	port = fmt.Sprintf("%d", portI)
-	addr = fmt.Sprintf("tcp://0.0.0.0:%s", port)
-	return
-}
diff --git a/testutil/network/network.go b/testutil/network/network.go
index c24de69ace..d73b833c6f 100644
--- a/testutil/network/network.go
+++ b/testutil/network/network.go
@@ -341,7 +341,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
 				apiListenAddr = cfg.APIAddress
 			} else {
 				var err error
-				apiListenAddr, _, err = server.FreeTCPAddr()
+				apiListenAddr, _, err = FreeTCPAddr()
 				if err != nil {
 					return nil, err
 				}
@@ -357,7 +357,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
 			if cfg.RPCAddress != "" {
 				tmCfg.RPC.ListenAddress = cfg.RPCAddress
 			} else {
-				rpcAddr, _, err := server.FreeTCPAddr()
+				rpcAddr, _, err := FreeTCPAddr()
 				if err != nil {
 					return nil, err
 				}
@@ -367,7 +367,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
 			if cfg.GRPCAddress != "" {
 				appCfg.GRPC.Address = cfg.GRPCAddress
 			} else {
-				_, grpcPort, err := server.FreeTCPAddr()
+				_, grpcPort, err := FreeTCPAddr()
 				if err != nil {
 					return nil, err
 				}
@@ -375,7 +375,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
 			}
 			appCfg.GRPC.Enable = true
 
-			_, grpcWebPort, err := server.FreeTCPAddr()
+			_, grpcWebPort, err := FreeTCPAddr()
 			if err != nil {
 				return nil, err
 			}
@@ -409,13 +409,13 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
 		tmCfg.Moniker = nodeDirName
 		monikers[i] = nodeDirName
 
-		proxyAddr, _, err := server.FreeTCPAddr()
+		proxyAddr, _, err := FreeTCPAddr()
 		if err != nil {
 			return nil, err
 		}
 		tmCfg.ProxyApp = proxyAddr
 
-		p2pAddr, _, err := server.FreeTCPAddr()
+		p2pAddr, _, err := FreeTCPAddr()
 		if err != nil {
 			return nil, err
 		}
diff --git a/testutil/network/util.go b/testutil/network/util.go
index f1bfa52688..0fb12fe8e2 100644
--- a/testutil/network/util.go
+++ b/testutil/network/util.go
@@ -3,10 +3,12 @@ package network
 import (
 	"encoding/json"
 	"fmt"
+	"net"
 	"os"
 	"path/filepath"
 	"time"
 
+	sdkerrors "cosmossdk.io/errors"
 	"github.com/tendermint/tendermint/node"
 	"github.com/tendermint/tendermint/p2p"
 	pvm "github.com/tendermint/tendermint/privval"
@@ -202,3 +204,21 @@ func writeFile(name string, dir string, contents []byte) error {
 
 	return nil
 }
+
+// Get a free address for a test tendermint server
+// protocol is either tcp, http, etc
+func FreeTCPAddr() (addr, port string, err error) {
+	l, err := net.Listen("tcp", "localhost:0")
+	if err != nil {
+		return "", "", err
+	}
+
+	if err := l.Close(); err != nil {
+		return "", "", sdkerrors.Wrap(err, "couldn't close the listener")
+	}
+
+	portI := l.Addr().(*net.TCPAddr).Port
+	port = fmt.Sprintf("%d", portI)
+	addr = fmt.Sprintf("tcp://0.0.0.0:%s", port)
+	return
+}
diff --git a/x/genutil/client/cli/init_test.go b/x/genutil/client/cli/init_test.go
index e836f5a9e9..427e9baf37 100644
--- a/x/genutil/client/cli/init_test.go
+++ b/x/genutil/client/cli/init_test.go
@@ -22,6 +22,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/cosmos/cosmos-sdk/server/mock"
 	"github.com/cosmos/cosmos-sdk/testutil"
+	"github.com/cosmos/cosmos-sdk/testutil/network"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
@@ -208,7 +209,7 @@ func TestStartStandAlone(t *testing.T) {
 	app, err := mock.NewApp(home, logger)
 	require.NoError(t, err)
 
-	svrAddr, _, err := server.FreeTCPAddr()
+	svrAddr, _, err := network.FreeTCPAddr()
 	require.NoError(t, err)
 
 	svr, err := abci_server.NewServer(svrAddr, "socket", app)