Merge branch 'develop' into greg/testnet-command-2
This commit is contained in:
+1
-1
@@ -20,7 +20,7 @@ func ExportCmd(ctx *Context, cdc *wire.Codec, appExporter AppExporter) *cobra.Co
|
||||
home := viper.GetString("home")
|
||||
appState, validators, err := appExporter(home, ctx.Logger)
|
||||
if err != nil {
|
||||
return errors.Errorf("Error exporting state: %v\n", err)
|
||||
return errors.Errorf("error exporting state: %v\n", err)
|
||||
}
|
||||
doc, err := tmtypes.GenesisDocFromFile(ctx.Config.GenesisFile())
|
||||
if err != nil {
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@ import (
|
||||
|
||||
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
|
||||
"github.com/tendermint/tendermint/node"
|
||||
"github.com/tendermint/tendermint/proxy"
|
||||
pvm "github.com/tendermint/tendermint/privval"
|
||||
"github.com/tendermint/tendermint/proxy"
|
||||
cmn "github.com/tendermint/tmlibs/common"
|
||||
)
|
||||
|
||||
@@ -55,7 +55,7 @@ func startStandAlone(ctx *Context, appCreator AppCreator) error {
|
||||
|
||||
svr, err := server.NewServer(addr, "socket", app)
|
||||
if err != nil {
|
||||
return errors.Errorf("Error creating listener: %v\n", err)
|
||||
return errors.Errorf("error creating listener: %v\n", err)
|
||||
}
|
||||
svr.SetLogger(ctx.Logger.With("module", "abci-server"))
|
||||
svr.Start()
|
||||
|
||||
@@ -40,7 +40,7 @@ func TestStartStandAlone(t *testing.T) {
|
||||
svrAddr, _, err := FreeTCPAddr()
|
||||
require.Nil(t, err)
|
||||
svr, err := server.NewServer(svrAddr, "socket", app)
|
||||
require.Nil(t, err, "Error creating listener")
|
||||
require.Nil(t, err, "error creating listener")
|
||||
svr.SetLogger(logger.With("module", "abci-server"))
|
||||
svr.Start()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user