diff --git a/go.sum b/go.sum index 092fefbd1c..f5672910bd 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,6 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/handlers v1.5.0 h1:4wjo3sf9azi99c8hTmyaxp9y5S+pFszsy3pP0rAw/lw= -github.com/gorilla/handlers v1.5.0/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -578,8 +576,6 @@ github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RMWx1aInLzndwxKalgi5rTqgfXxOxbEI= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= -github.com/tendermint/go-amino v0.15.1 h1:D2uk35eT4iTsvJd9jWIetzthE5C0/k2QmMFkCN+4JgQ= -github.com/tendermint/go-amino v0.15.1/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tendermint/tendermint v0.34.0-rc3 h1:d7Fsd5rdbxq4GmJ0kRfx7l7LesQM7e70f0ytWLTQ/Go= diff --git a/snapshots/types/convert.go b/snapshots/types/convert.go index 238e962374..d0db6e3dc1 100644 --- a/snapshots/types/convert.go +++ b/snapshots/types/convert.go @@ -1,9 +1,10 @@ package types import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" proto "github.com/gogo/protobuf/proto" abci "github.com/tendermint/tendermint/abci/types" + + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) // Converts an ABCI snapshot to a snapshot. Mainly to decode the SDK metadata. diff --git a/store/types/store.go b/store/types/store.go index 2da36a5bd3..57598a00ae 100644 --- a/store/types/store.go +++ b/store/types/store.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" abci "github.com/tendermint/tendermint/abci/types" dbm "github.com/tendermint/tm-db" + snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" "github.com/cosmos/cosmos-sdk/types/kv" ) diff --git a/x/distribution/client/rest/grpc_query_test.go b/x/distribution/client/rest/grpc_query_test.go index 785c17c7b5..336b032f90 100644 --- a/x/distribution/client/rest/grpc_query_test.go +++ b/x/distribution/client/rest/grpc_query_test.go @@ -5,6 +5,9 @@ import ( "fmt" "testing" + "github.com/gogo/protobuf/proto" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/testutil" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" @@ -12,8 +15,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/cosmos/cosmos-sdk/types/rest" "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/gogo/protobuf/proto" - "github.com/stretchr/testify/suite" ) type IntegrationTestSuite struct { diff --git a/x/gov/client/utils/query_test.go b/x/gov/client/utils/query_test.go index 6ddf128732..21294e2842 100644 --- a/x/gov/client/utils/query_test.go +++ b/x/gov/client/utils/query_test.go @@ -1,9 +1,10 @@ package utils_test import ( + "testing" + "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/x/gov/client/utils" - "testing" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/rpc/client/mock" diff --git a/x/ibc/02-client/types/height_test.go b/x/ibc/02-client/types/height_test.go index eafa1a2601..cab9212647 100644 --- a/x/ibc/02-client/types/height_test.go +++ b/x/ibc/02-client/types/height_test.go @@ -3,8 +3,9 @@ package types_test import ( "testing" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" ) func TestZeroHeight(t *testing.T) { diff --git a/x/ibc/07-tendermint/types/test_utils.go b/x/ibc/07-tendermint/types/test_utils.go index 38a2fa924b..3bab7794e0 100644 --- a/x/ibc/07-tendermint/types/test_utils.go +++ b/x/ibc/07-tendermint/types/test_utils.go @@ -4,11 +4,12 @@ import ( "bytes" "time" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" "github.com/tendermint/tendermint/crypto/tmhash" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/proto/tendermint/version" tmtypes "github.com/tendermint/tendermint/types" + + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" ) // MakeBlockID is a copied unimported test function from tmtypes to use here diff --git a/x/ibc/client/query.go b/x/ibc/client/query.go index ccf58afcbb..f0fdfc89b1 100644 --- a/x/ibc/client/query.go +++ b/x/ibc/client/query.go @@ -3,12 +3,13 @@ package client import ( "fmt" + abci "github.com/tendermint/tendermint/abci/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - abci "github.com/tendermint/tendermint/abci/types" ) // QueryTendermintProof performs an ABCI query with the given key and returns the value diff --git a/x/params/client/rest/grpc_query_test.go b/x/params/client/rest/grpc_query_test.go index 8997eec890..af00834183 100644 --- a/x/params/client/rest/grpc_query_test.go +++ b/x/params/client/rest/grpc_query_test.go @@ -4,11 +4,12 @@ import ( "fmt" "testing" + "github.com/gogo/protobuf/proto" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/testutil" "github.com/cosmos/cosmos-sdk/testutil/network" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - "github.com/gogo/protobuf/proto" - "github.com/stretchr/testify/suite" ) type IntegrationTestSuite struct { diff --git a/x/slashing/client/rest/grpc_query_test.go b/x/slashing/client/rest/grpc_query_test.go index 8e89f80934..32d97206bd 100644 --- a/x/slashing/client/rest/grpc_query_test.go +++ b/x/slashing/client/rest/grpc_query_test.go @@ -6,14 +6,15 @@ import ( "testing" "time" + "github.com/gogo/protobuf/proto" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/testutil" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" grpctypes "github.com/cosmos/cosmos-sdk/types/grpc" "github.com/cosmos/cosmos-sdk/types/query" "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/gogo/protobuf/proto" - "github.com/stretchr/testify/suite" ) type IntegrationTestSuite struct { @@ -67,7 +68,7 @@ func (s *IntegrationTestSuite) TestGRPCQueries() { &types.QuerySigningInfosResponse{}, &types.QuerySigningInfosResponse{ Info: []types.ValidatorSigningInfo{ - types.ValidatorSigningInfo{ + { Address: sdk.ConsAddress(val.PubKey.Address()), JailedUntil: time.Unix(0, 0), }, diff --git a/x/staking/types/validator_test.go b/x/staking/types/validator_test.go index beb6c22ffd..62b0bb5826 100644 --- a/x/staking/types/validator_test.go +++ b/x/staking/types/validator_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto/ed25519" + "github.com/tendermint/tendermint/crypto/encoding" tmtypes "github.com/tendermint/tendermint/types" "github.com/cosmos/cosmos-sdk/codec/legacy" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tendermint/tendermint/crypto/encoding" ) func TestValidatorTestEquivalent(t *testing.T) {