Merge PR #4001: Upgrade Tendermint to v0.31.1

This commit is contained in:
Alexander Bezobchuk
2019-03-29 13:13:45 -04:00
committed by GitHub
parent 9556393aaf
commit 92f653b35c
7 changed files with 44 additions and 24 deletions
+11 -7
View File
@@ -58,17 +58,21 @@ func (rs *RestServer) Start(listenAddr string, maxOpen int) (err error) {
rs.log.Error("error closing listener", "err", err)
})
rs.listener, err = rpcserver.Listen(
listenAddr,
rpcserver.Config{MaxOpenConnections: maxOpen},
)
cfg := rpcserver.DefaultConfig()
cfg.MaxOpenConnections = maxOpen
rs.listener, err = rpcserver.Listen(listenAddr, cfg)
if err != nil {
return
}
rs.log.Info(fmt.Sprintf("Starting Gaia Lite REST service (chain-id: %q)...",
viper.GetString(client.FlagChainID)))
rs.log.Info(
fmt.Sprintf(
"Starting Gaia Lite REST service (chain-id: %q)...",
viper.GetString(client.FlagChainID),
),
)
return rpcserver.StartHTTPServer(rs.listener, rs.Mux, rs.log)
return rpcserver.StartHTTPServer(rs.listener, rs.Mux, rs.log, cfg)
}
// ServeCommand will start a Gaia Lite REST service as a blocking process. It
+2 -2
View File
@@ -393,11 +393,11 @@ func startTM(
func startLCD(logger log.Logger, listenAddr string, cdc *codec.Codec, t *testing.T) (net.Listener, error) {
rs := NewRestServer(cdc)
registerRoutes(rs)
listener, err := tmrpc.Listen(listenAddr, tmrpc.Config{})
listener, err := tmrpc.Listen(listenAddr, tmrpc.DefaultConfig())
if err != nil {
return nil, err
}
go tmrpc.StartHTTPServer(listener, rs.Mux, logger) //nolint:errcheck
go tmrpc.StartHTTPServer(listener, rs.Mux, logger, tmrpc.DefaultConfig()) //nolint:errcheck
return listener, nil
}