chore: remove unused code from server (#14437)

This commit is contained in:
Marko
2022-12-27 23:46:12 +00:00
committed by GitHub
parent 1fab762175
commit 3684966676
4 changed files with 28 additions and 33 deletions
+6 -6
View File
@@ -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
}
+20
View File
@@ -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
}