From f8bad078b7b3e8e6186eddce72716dc7cf021848 Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Thu, 28 May 2020 10:46:28 -0400 Subject: [PATCH] Bump Tendermint version (#6300) --- client/lcd/root.go | 14 +++++++------- go.mod | 2 +- go.sum | 5 +++++ tests/util.go | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/client/lcd/root.go b/client/lcd/root.go index 70c8e4f31e..71227f9f9b 100644 --- a/client/lcd/root.go +++ b/client/lcd/root.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/tendermint/tendermint/libs/log" - rpcserver "github.com/tendermint/tendermint/rpc/lib/server" + tmrpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/client/flags" @@ -48,13 +48,13 @@ func NewRestServer(cdc *codec.Codec) *RestServer { // StartWithConfig starts the REST server that listens on the provided listenAddr. // It will use the provided RPC configuration. -func (rs *RestServer) StartWithConfig(listenAddr string, cors bool, cfg *rpcserver.Config) error { +func (rs *RestServer) StartWithConfig(listenAddr string, cors bool, cfg *tmrpcserver.Config) error { server.TrapSignal(func() { err := rs.listener.Close() rs.log.Error("error closing listener", "err", err) }) - listener, err := rpcserver.Listen(listenAddr, cfg) + listener, err := tmrpcserver.Listen(listenAddr, cfg) if err != nil { return err } @@ -68,17 +68,17 @@ func (rs *RestServer) StartWithConfig(listenAddr string, cors bool, cfg *rpcserv var h http.Handler = rs.Mux if cors { - return rpcserver.StartHTTPServer(rs.listener, handlers.CORS()(h), rs.log, cfg) + return tmrpcserver.Serve(rs.listener, handlers.CORS()(h), rs.log, cfg) } - return rpcserver.StartHTTPServer(rs.listener, rs.Mux, rs.log, cfg) + return tmrpcserver.Serve(rs.listener, rs.Mux, rs.log, cfg) } // Start starts the REST server that listens on the provided listenAddr. The REST // service will use Tendermint's default RPC configuration, where the R/W timeout // and max open connections are overridden. func (rs *RestServer) Start(listenAddr string, maxOpen int, readTimeout, writeTimeout uint, cors bool) error { - cfg := rpcserver.DefaultConfig() + cfg := tmrpcserver.DefaultConfig() cfg.MaxOpenConnections = maxOpen cfg.ReadTimeout = time.Duration(readTimeout) * time.Second cfg.WriteTimeout = time.Duration(writeTimeout) * time.Second @@ -99,7 +99,7 @@ func ServeCommand(cdc *codec.Codec, registerRoutesFn func(*RestServer)) *cobra.C registerRoutesFn(rs) rs.registerSwaggerUI() - cfg := rpcserver.DefaultConfig() + cfg := tmrpcserver.DefaultConfig() cfg.MaxOpenConnections = viper.GetInt(flags.FlagMaxOpenConnections) cfg.ReadTimeout = time.Duration(viper.GetInt64(flags.FlagRPCReadTimeout)) * time.Second cfg.WriteTimeout = time.Duration(viper.GetInt64(flags.FlagRPCWriteTimeout)) * time.Second diff --git a/go.mod b/go.mod index 6137c00995..2f8e9ac694 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 github.com/tendermint/go-amino v0.15.1 github.com/tendermint/iavl v0.13.3 - github.com/tendermint/tendermint v0.33.4 + github.com/tendermint/tendermint v0.33.5 github.com/tendermint/tm-db v0.5.1 gopkg.in/yaml.v2 v2.3.0 ) diff --git a/go.sum b/go.sum index 45846c68f8..7fde7c46e0 100644 --- a/go.sum +++ b/go.sum @@ -299,6 +299,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= +github.com/minio/highwayhash v1.0.0 h1:iMSDhgUILCr0TNm8LWlSjF8N0ZIj2qbO8WHp6Q/J2BA= +github.com/minio/highwayhash v1.0.0/go.mod h1:xQboMTeM9nY9v/LlAOxFctujiv5+Aq2hR5dxBpaMbdc= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -478,6 +480,8 @@ github.com/tendermint/tendermint v0.33.2 h1:NzvRMTuXJxqSsFed2J7uHmMU5N1CVzSpfi3n github.com/tendermint/tendermint v0.33.2/go.mod h1:25DqB7YvV1tN3tHsjWoc2vFtlwICfrub9XO6UBO+4xk= github.com/tendermint/tendermint v0.33.4 h1:NM3G9618yC5PaaxGrcAySc5ylc1PAANeIx42u2Re/jo= github.com/tendermint/tendermint v0.33.4/go.mod h1:6NW9DVkvsvqmCY6wbRsOo66qGDhMXglRL70aXajvBEA= +github.com/tendermint/tendermint v0.33.5 h1:jYgRd9ImkzA9iOyhpmgreYsqSB6tpDa6/rXYPb8HKE8= +github.com/tendermint/tendermint v0.33.5/go.mod h1:0yUs9eIuuDq07nQql9BmI30FtYGcEC60Tu5JzB5IezM= github.com/tendermint/tm-db v0.4.1/go.mod h1:JsJ6qzYkCGiGwm5GHl/H5GLI9XLb6qZX7PRe425dHAY= github.com/tendermint/tm-db v0.5.1 h1:H9HDq8UEA7Eeg13kdYckkgwwkQLBnJGgX4PgLJRhieY= github.com/tendermint/tm-db v0.5.1/go.mod h1:g92zWjHpCYlEvQXvy9M168Su8V1IBEeawpXVVBaK4f4= @@ -580,6 +584,7 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/tests/util.go b/tests/util.go index 8fa138aef8..7f82a9f631 100644 --- a/tests/util.go +++ b/tests/util.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" rpchttp "github.com/tendermint/tendermint/rpc/client/http" ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpcclient "github.com/tendermint/tendermint/rpc/lib/client" + tmjsonrpc "github.com/tendermint/tendermint/rpc/jsonrpc/client" "github.com/cosmos/cosmos-sdk/codec" ) @@ -184,7 +184,7 @@ func WaitForStart(url string) { // Wait for the RPC server to respond to /status func WaitForRPC(laddr string) { fmt.Println("LADDR", laddr) - client, err := rpcclient.NewJSONRPCClient(laddr) + client, err := tmjsonrpc.New(laddr) if err != nil { panic(fmt.Sprintf("failed to create Tendermint RPC client: %s", err)) }