LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

chore: remove unused code from server (#14437)

Browse Source
This commit is contained in:
Marko 2022-12-28 00:46:12 +01:00 committed by GitHub
parent 1fab762175
commit 3684966676
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/test_helpers.go
View File

@ -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
}

12
testutil/network/network.go
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
testutil/network/util.go
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
}

3
x/genutil/client/cli/init_test.go
View File

@ -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)