diff --git a/Makefile b/Makefile index 96f04d16a..68d7a359a 100644 --- a/Makefile +++ b/Makefile @@ -191,10 +191,10 @@ lint: go mod verify .PHONY: lint -format: tools - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs gofmt -w -s - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs misspell -w - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs goimports -w -local github.com/cosmos/cosmos-sdk +format: + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" -not -name '*.pb.go' | xargs gofmt -w -s + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" -not -name '*.pb.go' | xargs misspell -w + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" -not -name '*.pb.go' | xargs goimports -w -local github.com/cosmos/cosmos-sdk .PHONY: format ############################################################################### diff --git a/client/cmd_test.go b/client/cmd_test.go index 675cc296a..554d39953 100644 --- a/client/cmd_test.go +++ b/client/cmd_test.go @@ -37,10 +37,10 @@ func TestValidateCmd(t *testing.T) { args []string wantErr bool }{ - {"misspelled command", []string{"comission"}, true}, // nolint: misspell + {"misspelled command", []string{"commission"}, true}, // nolint: misspell {"no command provided", []string{}, false}, - {"help flag", []string{"comission", "--help"}, false}, // nolint: misspell - {"shorthand help flag", []string{"comission", "-h"}, false}, // nolint: misspell + {"help flag", []string{"commission", "--help"}, false}, // nolint: misspell + {"shorthand help flag", []string{"commission", "-h"}, false}, // nolint: misspell } for _, tt := range tests { diff --git a/codec/amino_codec_test.go b/codec/amino_codec_test.go index 31eeb413e..3836b22d3 100644 --- a/codec/amino_codec_test.go +++ b/codec/amino_codec_test.go @@ -3,10 +3,11 @@ package codec_test import ( "testing" - "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/codec/testdata" "github.com/stretchr/testify/require" amino "github.com/tendermint/go-amino" + + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/codec/testdata" ) func createTestCodec() *amino.Codec { diff --git a/codec/hybrid_codec_test.go b/codec/hybrid_codec_test.go index 353f0c389..911ae8c9d 100644 --- a/codec/hybrid_codec_test.go +++ b/codec/hybrid_codec_test.go @@ -3,9 +3,10 @@ package codec_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/testdata" - "github.com/stretchr/testify/require" ) func TestHybridCodec(t *testing.T) { diff --git a/codec/proto_codec_test.go b/codec/proto_codec_test.go index c49544e06..aae71b4df 100644 --- a/codec/proto_codec_test.go +++ b/codec/proto_codec_test.go @@ -3,9 +3,10 @@ package codec_test import ( "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/testdata" - "github.com/stretchr/testify/require" ) func TestProtoCodec(t *testing.T) { diff --git a/types/address_bench_test.go b/types/address_bench_test.go index 8e438a81d..1bb0d15f6 100644 --- a/types/address_bench_test.go +++ b/types/address_bench_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" - "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/types" + "github.com/tendermint/tendermint/crypto/ed25519" ) diff --git a/types/decimal_test.go b/types/decimal_test.go index c56d303ee..33ca99d49 100644 --- a/types/decimal_test.go +++ b/types/decimal_test.go @@ -6,10 +6,11 @@ import ( "math/big" "testing" - "github.com/cosmos/cosmos-sdk/codec" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" yaml "gopkg.in/yaml.v2" + + "github.com/cosmos/cosmos-sdk/codec" ) // create a decimal from a decimal string (ex. "1234.5678") diff --git a/x/bank/client/rest/rest.go b/x/bank/client/rest/rest.go index b2b1ff84c..578e41c06 100644 --- a/x/bank/client/rest/rest.go +++ b/x/bank/client/rest/rest.go @@ -1,8 +1,9 @@ package rest import ( - "github.com/cosmos/cosmos-sdk/client/context" "github.com/gorilla/mux" + + "github.com/cosmos/cosmos-sdk/client/context" ) // RegisterRoutes - Central function to define routes that get registered by the main application diff --git a/x/bank/types/key_test.go b/x/bank/types/key_test.go index b1e5a7614..f3b5717fb 100644 --- a/x/bank/types/key_test.go +++ b/x/bank/types/key_test.go @@ -3,9 +3,10 @@ package types_test import ( "testing" + "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/stretchr/testify/require" ) func cloneAppend(bz []byte, tail []byte) (res []byte) { diff --git a/x/params/keeper/common_test.go b/x/params/keeper/common_test.go index 92d9f1ee5..c6c151809 100644 --- a/x/params/keeper/common_test.go +++ b/x/params/keeper/common_test.go @@ -1,14 +1,15 @@ package keeper_test import ( + abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/libs/log" + dbm "github.com/tendermint/tm-db" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" ) func testComponents() (codec.Marshaler, sdk.Context, sdk.StoreKey, sdk.StoreKey, paramskeeper.Keeper) { diff --git a/x/params/keeper/keeper_test.go b/x/params/keeper/keeper_test.go index 0c34558e9..de83f1f34 100644 --- a/x/params/keeper/keeper_test.go +++ b/x/params/keeper/keeper_test.go @@ -4,10 +4,11 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/stretchr/testify/require" ) func validateNoOp(_ interface{}) error { return nil } diff --git a/x/params/types/table_test.go b/x/params/types/table_test.go index db2c9d321..0baff40f8 100644 --- a/x/params/types/table_test.go +++ b/x/params/types/table_test.go @@ -4,8 +4,9 @@ import ( "testing" "time" - "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/x/params/types" ) func TestKeyTable(t *testing.T) { diff --git a/x/staking/types/commission.go b/x/staking/types/commission.go index 9a58210f6..54891b5dc 100644 --- a/x/staking/types/commission.go +++ b/x/staking/types/commission.go @@ -3,8 +3,9 @@ package types import ( "time" - sdk "github.com/cosmos/cosmos-sdk/types" yaml "gopkg.in/yaml.v2" + + sdk "github.com/cosmos/cosmos-sdk/types" ) // NewCommissionRates returns an initialized validator commission rates. diff --git a/x/staking/types/delegation.go b/x/staking/types/delegation.go index f25aaac7b..51fca1d38 100644 --- a/x/staking/types/delegation.go +++ b/x/staking/types/delegation.go @@ -6,10 +6,11 @@ import ( "strings" "time" + yaml "gopkg.in/yaml.v2" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/exported" - yaml "gopkg.in/yaml.v2" ) // Implements Delegation interface diff --git a/x/staking/types/params.go b/x/staking/types/params.go index b738f1b06..8d2b14ec6 100644 --- a/x/staking/types/params.go +++ b/x/staking/types/params.go @@ -6,10 +6,11 @@ import ( "strings" "time" + yaml "gopkg.in/yaml.v2" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - yaml "gopkg.in/yaml.v2" ) // Staking params default values diff --git a/x/upgrade/client/cli/query.go b/x/upgrade/client/cli/query.go index c9022a482..390ed9e5d 100644 --- a/x/upgrade/client/cli/query.go +++ b/x/upgrade/client/cli/query.go @@ -3,6 +3,7 @@ package cli import ( "encoding/binary" "fmt" + "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/spf13/cobra" diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go index 03802b335..ba789aeb7 100644 --- a/x/upgrade/keeper/keeper.go +++ b/x/upgrade/keeper/keeper.go @@ -3,6 +3,7 @@ package keeper import ( "encoding/binary" "fmt" + "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/tendermint/tendermint/libs/log" diff --git a/x/upgrade/keeper/querier.go b/x/upgrade/keeper/querier.go index 2a3ff8bf6..2aebceeac 100644 --- a/x/upgrade/keeper/querier.go +++ b/x/upgrade/keeper/querier.go @@ -2,6 +2,7 @@ package keeper import ( "encoding/binary" + "github.com/cosmos/cosmos-sdk/x/upgrade/types" abci "github.com/tendermint/tendermint/abci/types"