From 6e26ee98051233c3807cd649aa48d488cb75016b Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Thu, 8 Apr 2021 21:22:00 +0200 Subject: [PATCH] bump tendermint core (#9081) --- go.mod | 2 +- go.sum | 6 ++++-- store/types/listening_test.go | 3 ++- testutil/testdata/tx.go | 3 ++- types/query/pagination.go | 3 ++- x/auth/keeper/migrations.go | 3 ++- x/auth/legacy/v043/store.go | 11 ++++++----- x/auth/tx/service.go | 2 +- x/auth/tx/service_test.go | 3 ++- x/bank/keeper/keeper_test.go | 3 ++- x/upgrade/keeper/keeper.go | 5 +++-- x/upgrade/keeper/keeper_test.go | 2 +- 12 files changed, 28 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 55ad2b4272d1..ca015c2d7793 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/tendermint/cosmos-rosetta-gateway v0.3.0-rc2.0.20210304154332-87d6ca4410df github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 github.com/tendermint/go-amino v0.16.0 - github.com/tendermint/tendermint v0.34.8 + github.com/tendermint/tendermint v0.34.9 github.com/tendermint/tm-db v0.6.4 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad google.golang.org/genproto v0.0.0-20210114201628-6edceaf6022f diff --git a/go.sum b/go.sum index 879ac8e52079..6c4aa634741e 100644 --- a/go.sum +++ b/go.sum @@ -284,6 +284,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa h1:Q75Upo5UN4JbPFURXZ8nLKYUvF85dyFRop/vQ0Rv+64= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= +github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -678,8 +680,8 @@ github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoM github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4= github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg= github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ= -github.com/tendermint/tendermint v0.34.8 h1:PMWgUx47FrNTsfhxCWzoiIlVAC1SE9+WBlnsF9oQW0I= -github.com/tendermint/tendermint v0.34.8/go.mod h1:JVuu3V1ZexOaZG8VJMRl8lnfrGw6hEB2TVnoUwKRbss= +github.com/tendermint/tendermint v0.34.9 h1:9P2MXDEPOcPW0NBcHQ/HDSfvczZm+q5nUUw7AZ6f1Vc= +github.com/tendermint/tendermint v0.34.9/go.mod h1:kl4Z1JwGx1I+u1SXIzMDy7Z3T8LiMeCAOnzNn6AIMT4= github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI= github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8= github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ= diff --git a/store/types/listening_test.go b/store/types/listening_test.go index 96c59ca752ce..acf17b5001b8 100644 --- a/store/types/listening_test.go +++ b/store/types/listening_test.go @@ -4,9 +4,10 @@ import ( "bytes" "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/stretchr/testify/require" ) func TestNewStoreKVPairWriteListener(t *testing.T) { diff --git a/testutil/testdata/tx.go b/testutil/testdata/tx.go index cb7ae9d370e2..4da80c9e4e8f 100644 --- a/testutil/testdata/tx.go +++ b/testutil/testdata/tx.go @@ -3,11 +3,12 @@ package testdata import ( "encoding/json" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256r1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" ) // KeyTestPubAddr generates a new secp256k1 keypair. diff --git a/types/query/pagination.go b/types/query/pagination.go index 9d9431faba11..dc7f678c568e 100644 --- a/types/query/pagination.go +++ b/types/query/pagination.go @@ -7,8 +7,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/cosmos/cosmos-sdk/store/types" db "github.com/tendermint/tm-db" + + "github.com/cosmos/cosmos-sdk/store/types" ) // DefaultLimit is the default `limit` for queries diff --git a/x/auth/keeper/migrations.go b/x/auth/keeper/migrations.go index 20f60f6abb32..d3ad7a2f8c5a 100644 --- a/x/auth/keeper/migrations.go +++ b/x/auth/keeper/migrations.go @@ -1,9 +1,10 @@ package keeper import ( + "github.com/gogo/protobuf/grpc" + v043 "github.com/cosmos/cosmos-sdk/x/auth/legacy/v043" "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/gogo/protobuf/grpc" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/auth/legacy/v043/store.go b/x/auth/legacy/v043/store.go index 7abb2917cab5..27db787f846b 100644 --- a/x/auth/legacy/v043/store.go +++ b/x/auth/legacy/v043/store.go @@ -4,6 +4,12 @@ import ( "errors" "fmt" + "github.com/gogo/protobuf/grpc" + "github.com/gogo/protobuf/proto" + abci "github.com/tendermint/tendermint/abci/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -12,11 +18,6 @@ import ( vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/gogo/protobuf/grpc" - "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) const ( diff --git a/x/auth/tx/service.go b/x/auth/tx/service.go index a4c0706a134b..a0deedae6aa2 100644 --- a/x/auth/tx/service.go +++ b/x/auth/tx/service.go @@ -6,7 +6,7 @@ import ( "strings" gogogrpc "github.com/gogo/protobuf/grpc" - "github.com/golang/protobuf/proto" //nolint:staticcheck + "github.com/golang/protobuf/proto" // nolint: staticcheck "github.com/grpc-ecosystem/grpc-gateway/runtime" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/auth/tx/service_test.go b/x/auth/tx/service_test.go index d7244fb86f1d..68c474facc36 100644 --- a/x/auth/tx/service_test.go +++ b/x/auth/tx/service_test.go @@ -8,6 +8,8 @@ import ( "strings" "testing" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" clienttx "github.com/cosmos/cosmos-sdk/client/tx" @@ -28,7 +30,6 @@ import ( authtest "github.com/cosmos/cosmos-sdk/x/auth/client/testutil" bankcli "github.com/cosmos/cosmos-sdk/x/bank/client/testutil" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/stretchr/testify/suite" ) type IntegrationTestSuite struct { diff --git a/x/bank/keeper/keeper_test.go b/x/bank/keeper/keeper_test.go index 2c2516e16510..cb5a203a8f9e 100644 --- a/x/bank/keeper/keeper_test.go +++ b/x/bank/keeper/keeper_test.go @@ -1,10 +1,11 @@ package keeper_test import ( - "github.com/cosmos/cosmos-sdk/types/query" "testing" "time" + "github.com/cosmos/cosmos-sdk/types/query" + "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go index 3342c26a8c6f..8f32277b803c 100644 --- a/x/upgrade/keeper/keeper.go +++ b/x/upgrade/keeper/keeper.go @@ -8,6 +8,9 @@ import ( "path" "path/filepath" + "github.com/tendermint/tendermint/libs/log" + tmos "github.com/tendermint/tendermint/libs/os" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" store "github.com/cosmos/cosmos-sdk/store/types" @@ -16,8 +19,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" xp "github.com/cosmos/cosmos-sdk/x/upgrade/exported" "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/tendermint/tendermint/libs/log" - tmos "github.com/tendermint/tendermint/libs/os" ) // UpgradeInfoFileName file to store upgrade information diff --git a/x/upgrade/keeper/keeper_test.go b/x/upgrade/keeper/keeper_test.go index 50545e18e4dd..724848271b1f 100644 --- a/x/upgrade/keeper/keeper_test.go +++ b/x/upgrade/keeper/keeper_test.go @@ -195,7 +195,7 @@ func (s *KeeperTestSuite) TestSetUpgradedClient() { } // Test that the protocol version successfully increments after an -// upgrade and is succesfully set on BaseApp's appVersion. +// upgrade and is successfully set on BaseApp's appVersion. func (s *KeeperTestSuite) TestIncrementProtocolVersion() { oldProtocolVersion := s.app.BaseApp.AppVersion() s.app.UpgradeKeeper.SetUpgradeHandler("dummy", func(_ sdk.Context, _ types.Plan, vm module.VersionMap) (module.VersionMap, error) { return vm, nil })