From 4a233b8dcf734d5bd8ca4a6938320f2ed876aaae Mon Sep 17 00:00:00 2001 From: Anil Kumar Kammari Date: Fri, 4 Dec 2020 20:36:50 +0530 Subject: [PATCH] Rename GRPCRouter (#8079) * rename GRPCRouter * Update store/types/store.go Co-authored-by: Robert Zaremba * Fix gofmt Co-authored-by: Robert Zaremba --- baseapp/grpcrouter_test.go | 2 +- server/api/server.go | 10 ++++---- server/util_test.go | 3 ++- simapp/app.go | 6 ++--- store/types/store.go | 2 +- types/events.go | 3 ++- types/tx_msg.go | 3 ++- x/bank/client/rest/rest.go | 3 ++- x/distribution/keeper/msg_server.go | 1 + x/evidence/client/cli/cli_test.go | 2 +- x/gov/keeper/common_test.go | 3 ++- x/gov/keeper/msg_server.go | 1 + .../core/02-client/keeper/grpc_query_test.go | 10 ++++---- x/ibc/core/02-client/types/keys_test.go | 3 ++- x/ibc/core/02-client/types/params_test.go | 3 ++- .../03-connection/keeper/grpc_query_test.go | 8 +++---- x/ibc/core/03-connection/types/keys_test.go | 3 ++- .../core/04-channel/keeper/grpc_query_test.go | 24 +++++++++---------- x/ibc/core/04-channel/types/keys_test.go | 3 ++- x/ibc/core/23-commitment/types/utils.go | 3 ++- x/ibc/core/23-commitment/types/utils_test.go | 3 ++- x/ibc/core/24-host/parse_test.go | 5 ++-- x/ibc/core/keeper/msg_server.go | 1 + x/slashing/client/rest/rest.go | 3 ++- x/staking/client/rest/rest.go | 3 ++- x/staking/handler_test.go | 3 ++- x/staking/keeper/grpc_query_test.go | 3 ++- x/staking/legacy/v036/migrate_test.go | 3 ++- x/staking/types/historical_info_test.go | 3 ++- x/staking/types/params_test.go | 3 ++- x/upgrade/client/rest/rest.go | 3 ++- 31 files changed, 76 insertions(+), 53 deletions(-) diff --git a/baseapp/grpcrouter_test.go b/baseapp/grpcrouter_test.go index 6a83939b4a3..64b2a97b9b0 100644 --- a/baseapp/grpcrouter_test.go +++ b/baseapp/grpcrouter_test.go @@ -16,7 +16,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -func TestGRPCRouter(t *testing.T) { +func TestGRPCGatewayRouter(t *testing.T) { qr := baseapp.NewGRPCQueryRouter() interfaceRegistry := testdata.NewTestInterfaceRegistry() qr.SetInterfaceRegistry(interfaceRegistry) diff --git a/server/api/server.go b/server/api/server.go index b73b9555661..c2987f860d1 100644 --- a/server/api/server.go +++ b/server/api/server.go @@ -26,9 +26,9 @@ import ( // Server defines the server's API interface. type Server struct { - Router *mux.Router - GRPCRouter *runtime.ServeMux - ClientCtx client.Context + Router *mux.Router + GRPCGatewayRouter *runtime.ServeMux + ClientCtx client.Context logger log.Logger metrics *telemetry.Metrics @@ -63,7 +63,7 @@ func New(clientCtx client.Context, logger log.Logger) *Server { Router: mux.NewRouter(), ClientCtx: clientCtx, logger: logger, - GRPCRouter: runtime.NewServeMux( + GRPCGatewayRouter: runtime.NewServeMux( // Custom marshaler option is required for gogo proto runtime.WithMarshalerOption(runtime.MIMEWildcard, marshalerOption), @@ -124,7 +124,7 @@ func (s *Server) Close() error { } func (s *Server) registerGRPCGatewayRoutes() { - s.Router.PathPrefix("/").Handler(s.GRPCRouter) + s.Router.PathPrefix("/").Handler(s.GRPCGatewayRouter) } func (s *Server) registerMetrics() { diff --git a/server/util_test.go b/server/util_test.go index 582fb4c0896..a0ff6479b82 100644 --- a/server/util_test.go +++ b/server/util_test.go @@ -10,8 +10,9 @@ import ( "strings" "testing" - "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" + + "github.com/cosmos/cosmos-sdk/client/flags" ) var CancelledInPreRun = errors.New("Canelled in prerun") diff --git a/simapp/app.go b/simapp/app.go index f8f5b40b484..02aaa2297fe 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -560,13 +560,13 @@ func (app *SimApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APICon // Register legacy tx routes. authrest.RegisterTxRoutes(clientCtx, apiSvr.Router) // Register new tx routes from grpc-gateway. - authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCRouter) + authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) // Register new tendermint queries routes from grpc-gateway. - tmservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCRouter) + tmservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) // Register legacy and grpc-gateway routes for all modules. ModuleBasics.RegisterRESTRoutes(clientCtx, apiSvr.Router) - ModuleBasics.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCRouter) + ModuleBasics.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) // register swagger API from root so that other applications can override easily if apiConfig.Swagger { diff --git a/store/types/store.go b/store/types/store.go index f78fcad3f40..68b231dfc33 100644 --- a/store/types/store.go +++ b/store/types/store.go @@ -5,11 +5,11 @@ import ( "io" abci "github.com/tendermint/tendermint/abci/types" + tmstrings "github.com/tendermint/tendermint/libs/strings" dbm "github.com/tendermint/tm-db" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" "github.com/cosmos/cosmos-sdk/types/kv" - tmstrings "github.com/tendermint/tendermint/libs/strings" ) type Store interface { diff --git a/types/events.go b/types/events.go index 44d48d9cd5b..5a2bf3af4b0 100644 --- a/types/events.go +++ b/types/events.go @@ -7,10 +7,11 @@ import ( "sort" "strings" - "github.com/cosmos/cosmos-sdk/codec" "github.com/gogo/protobuf/jsonpb" proto "github.com/gogo/protobuf/proto" abci "github.com/tendermint/tendermint/abci/types" + + "github.com/cosmos/cosmos-sdk/codec" ) // ---------------------------------------------------------------------------- diff --git a/types/tx_msg.go b/types/tx_msg.go index ddc07fa16b4..b8a602d88c0 100644 --- a/types/tx_msg.go +++ b/types/tx_msg.go @@ -1,8 +1,9 @@ package types import ( - cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/gogo/protobuf/proto" + + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" ) type ( diff --git a/x/bank/client/rest/rest.go b/x/bank/client/rest/rest.go index 4325386d445..db4909c5325 100644 --- a/x/bank/client/rest/rest.go +++ b/x/bank/client/rest/rest.go @@ -1,9 +1,10 @@ package rest import ( - "github.com/cosmos/cosmos-sdk/client/rest" "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/rest" + "github.com/cosmos/cosmos-sdk/client" ) diff --git a/x/distribution/keeper/msg_server.go b/x/distribution/keeper/msg_server.go index a6bbe9ea013..4cad3c948c7 100644 --- a/x/distribution/keeper/msg_server.go +++ b/x/distribution/keeper/msg_server.go @@ -4,6 +4,7 @@ import ( "context" "github.com/armon/go-metrics" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/distribution/types" diff --git a/x/evidence/client/cli/cli_test.go b/x/evidence/client/cli/cli_test.go index 50ebfaa7aa1..84b3697b43a 100644 --- a/x/evidence/client/cli/cli_test.go +++ b/x/evidence/client/cli/cli_test.go @@ -48,7 +48,7 @@ func (s *IntegrationTestSuite) TestGetQueryCmd() { expectedOutput string expectErr bool }{ - "non-existant evidence": { + "non-existent evidence": { []string{"DF0C23E8634E480F84B9D5674A7CDC9816466DEC28A3358F73260F68D28D7660"}, "evidence DF0C23E8634E480F84B9D5674A7CDC9816466DEC28A3358F73260F68D28D7660 not found", true, diff --git a/x/gov/keeper/common_test.go b/x/gov/keeper/common_test.go index 60eb8be598a..7ba9c5827f8 100644 --- a/x/gov/keeper/common_test.go +++ b/x/gov/keeper/common_test.go @@ -3,13 +3,14 @@ package keeper_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/staking" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/stretchr/testify/require" ) var ( diff --git a/x/gov/keeper/msg_server.go b/x/gov/keeper/msg_server.go index aee3d3c3807..39ddf3ab453 100644 --- a/x/gov/keeper/msg_server.go +++ b/x/gov/keeper/msg_server.go @@ -6,6 +6,7 @@ import ( "strconv" "github.com/armon/go-metrics" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov/types" diff --git a/x/ibc/core/02-client/keeper/grpc_query_test.go b/x/ibc/core/02-client/keeper/grpc_query_test.go index d8125198e2d..e1e2c9d8b08 100644 --- a/x/ibc/core/02-client/keeper/grpc_query_test.go +++ b/x/ibc/core/02-client/keeper/grpc_query_test.go @@ -43,7 +43,7 @@ func (suite *KeeperTestSuite) TestQueryClientState() { { "success", func() { - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, types.ZeroHeight(), commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) suite.keeper.SetClientState(suite.ctx, testClientID, clientState) var err error @@ -183,10 +183,10 @@ func (suite *KeeperTestSuite) TestQueryConsensusState() { "invalid height", func() { req = &types.QueryConsensusStateRequest{ - ClientId: testClientID, + ClientId: testClientID, RevisionNumber: 0, RevisionHeight: 0, - LatestHeight: false, + LatestHeight: false, } }, false, @@ -204,7 +204,7 @@ func (suite *KeeperTestSuite) TestQueryConsensusState() { { "success latest height", func() { - clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) + clientState := ibctmtypes.NewClientState(testChainID, ibctmtypes.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, testClientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, false, false) cs := ibctmtypes.NewConsensusState( suite.consensusState.Timestamp, commitmenttypes.NewMerkleRoot([]byte("hash1")), nil, ) @@ -235,7 +235,7 @@ func (suite *KeeperTestSuite) TestQueryConsensusState() { suite.Require().NoError(err) req = &types.QueryConsensusStateRequest{ - ClientId: testClientID, + ClientId: testClientID, RevisionNumber: 0, RevisionHeight: height, } diff --git a/x/ibc/core/02-client/types/keys_test.go b/x/ibc/core/02-client/types/keys_test.go index dbe56657ad8..4938145236e 100644 --- a/x/ibc/core/02-client/types/keys_test.go +++ b/x/ibc/core/02-client/types/keys_test.go @@ -4,8 +4,9 @@ import ( "math" "testing" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" ) // tests ParseClientIdentifier and IsValidClientID diff --git a/x/ibc/core/02-client/types/params_test.go b/x/ibc/core/02-client/types/params_test.go index 9484e48b4ad..dac80a4b421 100644 --- a/x/ibc/core/02-client/types/params_test.go +++ b/x/ibc/core/02-client/types/params_test.go @@ -3,8 +3,9 @@ package types import ( "testing" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) func TestValidateParams(t *testing.T) { diff --git a/x/ibc/core/03-connection/keeper/grpc_query_test.go b/x/ibc/core/03-connection/keeper/grpc_query_test.go index 553033810dc..6a3497667ac 100644 --- a/x/ibc/core/03-connection/keeper/grpc_query_test.go +++ b/x/ibc/core/03-connection/keeper/grpc_query_test.go @@ -338,7 +338,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionConsensusState() { "invalid connection ID", func() { req = &types.QueryConnectionConsensusStateRequest{ - ConnectionId: "", + ConnectionId: "", RevisionNumber: 0, RevisionHeight: 1, } @@ -349,7 +349,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionConsensusState() { "connection not found", func() { req = &types.QueryConnectionConsensusStateRequest{ - ConnectionId: "test-connection-id", + ConnectionId: "test-connection-id", RevisionNumber: 0, RevisionHeight: 1, } @@ -362,7 +362,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionConsensusState() { _, _, connA, _, _, _ := suite.coordinator.Setup(suite.chainA, suite.chainB, channeltypes.UNORDERED) req = &types.QueryConnectionConsensusStateRequest{ - ConnectionId: connA.ID, + ConnectionId: connA.ID, RevisionNumber: 0, RevisionHeight: uint64(suite.chainA.GetContext().BlockHeight()), // use current height } @@ -379,7 +379,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionConsensusState() { expClientID = clientA req = &types.QueryConnectionConsensusStateRequest{ - ConnectionId: connA.ID, + ConnectionId: connA.ID, RevisionNumber: clientState.GetLatestHeight().GetRevisionNumber(), RevisionHeight: clientState.GetLatestHeight().GetRevisionHeight(), } diff --git a/x/ibc/core/03-connection/types/keys_test.go b/x/ibc/core/03-connection/types/keys_test.go index c899dc3c53a..6adb8090f89 100644 --- a/x/ibc/core/03-connection/types/keys_test.go +++ b/x/ibc/core/03-connection/types/keys_test.go @@ -4,8 +4,9 @@ import ( "math" "testing" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" ) // tests ParseConnectionSequence and IsValidConnectionID diff --git a/x/ibc/core/04-channel/keeper/grpc_query_test.go b/x/ibc/core/04-channel/keeper/grpc_query_test.go index cd894520e81..94f07bc069e 100644 --- a/x/ibc/core/04-channel/keeper/grpc_query_test.go +++ b/x/ibc/core/04-channel/keeper/grpc_query_test.go @@ -437,8 +437,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() { "invalid port ID", func() { req = &types.QueryChannelConsensusStateRequest{ - PortId: "", - ChannelId: "test-channel-id", + PortId: "", + ChannelId: "test-channel-id", RevisionNumber: 0, RevisionHeight: 1, } @@ -449,8 +449,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() { "invalid channel ID", func() { req = &types.QueryChannelConsensusStateRequest{ - PortId: "test-port-id", - ChannelId: "", + PortId: "test-port-id", + ChannelId: "", RevisionNumber: 0, RevisionHeight: 1, } @@ -461,8 +461,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() { "channel not found", func() { req = &types.QueryChannelConsensusStateRequest{ - PortId: "test-port-id", - ChannelId: "test-channel-id", + PortId: "test-port-id", + ChannelId: "test-channel-id", RevisionNumber: 0, RevisionHeight: 1, } @@ -482,8 +482,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() { suite.chainA.App.IBCKeeper.ChannelKeeper.SetChannel(suite.chainA.GetContext(), channelA.PortID, channelA.ID, channel) req = &types.QueryChannelConsensusStateRequest{ - PortId: channelA.PortID, - ChannelId: channelA.ID, + PortId: channelA.PortID, + ChannelId: channelA.ID, RevisionNumber: 0, RevisionHeight: 1, } @@ -495,8 +495,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() { _, _, _, _, channelA, _ := suite.coordinator.Setup(suite.chainA, suite.chainB, types.UNORDERED) req = &types.QueryChannelConsensusStateRequest{ - PortId: channelA.PortID, - ChannelId: channelA.ID, + PortId: channelA.PortID, + ChannelId: channelA.ID, RevisionNumber: 0, RevisionHeight: uint64(suite.chainA.GetContext().BlockHeight()), // use current height } @@ -516,8 +516,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() { expClientID = clientA req = &types.QueryChannelConsensusStateRequest{ - PortId: channelA.PortID, - ChannelId: channelA.ID, + PortId: channelA.PortID, + ChannelId: channelA.ID, RevisionNumber: clientState.GetLatestHeight().GetRevisionNumber(), RevisionHeight: clientState.GetLatestHeight().GetRevisionHeight(), } diff --git a/x/ibc/core/04-channel/types/keys_test.go b/x/ibc/core/04-channel/types/keys_test.go index 86e4e61aa2c..9bc6500b9af 100644 --- a/x/ibc/core/04-channel/types/keys_test.go +++ b/x/ibc/core/04-channel/types/keys_test.go @@ -3,8 +3,9 @@ package types_test import ( "testing" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) // tests ParseChannelSequence and IsValidChannelID diff --git a/x/ibc/core/23-commitment/types/utils.go b/x/ibc/core/23-commitment/types/utils.go index 7d2937f0fb5..e662f772655 100644 --- a/x/ibc/core/23-commitment/types/utils.go +++ b/x/ibc/core/23-commitment/types/utils.go @@ -2,8 +2,9 @@ package types import ( ics23 "github.com/confio/ics23/go" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) // ConvertProofs converts crypto.ProofOps into MerkleProof diff --git a/x/ibc/core/23-commitment/types/utils_test.go b/x/ibc/core/23-commitment/types/utils_test.go index a4c08d13fa8..f852fb6c2c4 100644 --- a/x/ibc/core/23-commitment/types/utils_test.go +++ b/x/ibc/core/23-commitment/types/utils_test.go @@ -3,10 +3,11 @@ package types_test import ( "fmt" - "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + + "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" ) func (suite *MerkleTestSuite) TestConvertProofs() { diff --git a/x/ibc/core/24-host/parse_test.go b/x/ibc/core/24-host/parse_test.go index cbee37ddbcb..9f74bf5f682 100644 --- a/x/ibc/core/24-host/parse_test.go +++ b/x/ibc/core/24-host/parse_test.go @@ -4,9 +4,10 @@ import ( "math" "testing" + "github.com/stretchr/testify/require" + connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/stretchr/testify/require" ) func TestParseIdentifier(t *testing.T) { @@ -23,7 +24,7 @@ func TestParseIdentifier(t *testing.T) { // one above uint64 max {"invalid uint64", "connection-18446744073709551616", "connection-", 0, false}, // uint64 == 20 characters - {"invalid large sequence", "connection-2345682193567182931243", "conenction-", 0, false}, + {"invalid large sequence", "connection-2345682193567182931243", "connection-", 0, false}, {"capital prefix", "Connection-0", "connection-", 0, false}, {"double prefix", "connection-connection-0", "connection-", 0, false}, {"doesn't have prefix", "connection-0", "prefix", 0, false}, diff --git a/x/ibc/core/keeper/msg_server.go b/x/ibc/core/keeper/msg_server.go index 78f822e4d5a..8815a7e45d4 100644 --- a/x/ibc/core/keeper/msg_server.go +++ b/x/ibc/core/keeper/msg_server.go @@ -4,6 +4,7 @@ import ( "context" "github.com/armon/go-metrics" + "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/slashing/client/rest/rest.go b/x/slashing/client/rest/rest.go index 21d73a5e886..a3a88545900 100644 --- a/x/slashing/client/rest/rest.go +++ b/x/slashing/client/rest/rest.go @@ -1,9 +1,10 @@ package rest import ( - "github.com/cosmos/cosmos-sdk/client/rest" "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/rest" + "github.com/cosmos/cosmos-sdk/client" ) diff --git a/x/staking/client/rest/rest.go b/x/staking/client/rest/rest.go index bb4e82917c9..35bb8da6813 100644 --- a/x/staking/client/rest/rest.go +++ b/x/staking/client/rest/rest.go @@ -1,9 +1,10 @@ package rest import ( - "github.com/cosmos/cosmos-sdk/client/rest" "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/rest" + "github.com/cosmos/cosmos-sdk/client" ) diff --git a/x/staking/handler_test.go b/x/staking/handler_test.go index 0f5a641057a..4b48f09427c 100644 --- a/x/staking/handler_test.go +++ b/x/staking/handler_test.go @@ -11,6 +11,8 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" + "github.com/golang/protobuf/proto" + cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" @@ -23,7 +25,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking/keeper" "github.com/cosmos/cosmos-sdk/x/staking/teststaking" "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/golang/protobuf/proto" ) func bootstrapHandlerGenesisTest(t *testing.T, power int64, numAddrs int, accAmount sdk.Int) (*simapp.SimApp, sdk.Context, []sdk.AccAddress, []sdk.ValAddress) { diff --git a/x/staking/keeper/grpc_query_test.go b/x/staking/keeper/grpc_query_test.go index cf3c9e3fe4c..acf6f9cb5bf 100644 --- a/x/staking/keeper/grpc_query_test.go +++ b/x/staking/keeper/grpc_query_test.go @@ -5,13 +5,14 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" "github.com/cosmos/cosmos-sdk/x/staking/keeper" "github.com/cosmos/cosmos-sdk/x/staking/teststaking" "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/stretchr/testify/require" ) func (suite *KeeperTestSuite) TestGRPCQueryValidators() { diff --git a/x/staking/legacy/v036/migrate_test.go b/x/staking/legacy/v036/migrate_test.go index 7278774bf77..37540427859 100644 --- a/x/staking/legacy/v036/migrate_test.go +++ b/x/staking/legacy/v036/migrate_test.go @@ -3,12 +3,13 @@ package v036_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" v034staking "github.com/cosmos/cosmos-sdk/x/staking/legacy/v034" v036staking "github.com/cosmos/cosmos-sdk/x/staking/legacy/v036" - "github.com/stretchr/testify/require" ) func TestMigrate(t *testing.T) { diff --git a/x/staking/types/historical_info_test.go b/x/staking/types/historical_info_test.go index ca3e48951e7..d8a25fa9292 100644 --- a/x/staking/types/historical_info_test.go +++ b/x/staking/types/historical_info_test.go @@ -5,9 +5,10 @@ import ( "sort" "testing" - "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + + "github.com/cosmos/cosmos-sdk/x/staking/types" ) var header = tmproto.Header{ diff --git a/x/staking/types/params_test.go b/x/staking/types/params_test.go index 05a7ea956f6..6218091e0ff 100644 --- a/x/staking/types/params_test.go +++ b/x/staking/types/params_test.go @@ -3,8 +3,9 @@ package types_test import ( "testing" - "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/x/staking/types" ) func TestParamsEqual(t *testing.T) { diff --git a/x/upgrade/client/rest/rest.go b/x/upgrade/client/rest/rest.go index 83577c0cbc2..3192083f8da 100644 --- a/x/upgrade/client/rest/rest.go +++ b/x/upgrade/client/rest/rest.go @@ -1,9 +1,10 @@ package rest import ( - "github.com/cosmos/cosmos-sdk/client/rest" "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/rest" + "github.com/cosmos/cosmos-sdk/client" )