From b9490f2d93a59b550667057960f4f1f825e95d6d Mon Sep 17 00:00:00 2001 From: Marko Date: Thu, 17 Oct 2019 15:47:35 +0200 Subject: [PATCH] Merge PR #5203: Add more linters --- .golangci.yml | 4 ++++ baseapp/baseapp_test.go | 5 +++-- client/config.go | 3 ++- client/context/verifier_test.go | 1 + client/keys/codec_test.go | 2 ++ client/keys/delete_test.go | 1 + client/keys/list_test.go | 1 + client/keys/parse_test.go | 1 + client/keys/show_test.go | 2 ++ client/utils_test.go | 1 + crypto/keys/keybase_base.go | 2 +- simapp/genesis_account_test.go | 1 + simapp/sim_bench_test.go | 1 + simapp/state.go | 3 ++- simapp/utils_test.go | 1 + store/list/list_test.go | 1 + store/types/gas_test.go | 1 + store/types/store_test.go | 1 + types/coin_test.go | 10 ++++++++++ types/context_test.go | 1 + types/dec_coin_test.go | 1 + types/decimal_test.go | 2 ++ types/errors/abci_test.go | 3 +++ types/errors/errors_test.go | 2 ++ types/errors/stacktrace_test.go | 1 + types/errors_test.go | 1 + types/rest/rest_test.go | 3 +++ types/uint_test.go | 2 ++ types/utils_test.go | 2 ++ x/auth/ante/ante_test.go | 1 + x/auth/ante/sigverify_test.go | 1 + x/auth/client/utils/tx_test.go | 1 + x/auth/exported/exported.go | 2 +- x/auth/legacy/v0_38/migrate_test.go | 1 + x/auth/simulation/decoder_test.go | 1 + x/auth/types/account_test.go | 1 + x/auth/types/txbuilder_test.go | 1 + x/auth/vesting/types/vesting_account_test.go | 1 + x/crisis/handler_test.go | 1 + x/distribution/client/common/common_test.go | 1 + x/distribution/simulation/decoder_test.go | 1 + x/genaccounts/legacy/v0_36/migrate_test.go | 1 + x/genutil/gentx.go | 2 +- x/gov/keeper/vote.go | 2 +- x/gov/simulation/decoder_test.go | 1 + x/gov/types/errors.go | 4 ++-- x/gov/types/msgs.go | 2 +- x/mint/simulation/decoder_test.go | 1 + x/params/keeper.go | 2 +- x/params/keeper_test.go | 7 +++++++ x/simulation/operation.go | 1 + x/slashing/simulation/decoder_test.go | 1 + x/staking/client/cli/tx_test.go | 2 ++ x/staking/genesis_test.go | 1 + x/staking/keeper/delegation.go | 2 +- x/staking/simulation/decoder_test.go | 1 + x/supply/internal/keeper/account.go | 2 +- x/supply/internal/types/account_test.go | 1 + x/supply/internal/types/permissions_test.go | 1 + x/supply/simulation/decoder_test.go | 1 + 60 files changed, 94 insertions(+), 14 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 384cfec33..9d790040d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -17,15 +17,19 @@ linters: - gosimple - govet - ineffassign + - interfacer - maligned - misspell - nakedret - prealloc + - scopelint - staticcheck - structcheck + - stylecheck - typecheck - unconvert - unused + - misspell disable: - errcheck diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index c13ab2b28..52df9bbef 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -236,6 +236,7 @@ func TestSetLoader(t *testing.T) { v := []byte("value") for name, tc := range cases { + tc := tc t.Run(name, func(t *testing.T) { // prepare a db with some data db := dbm.NewMemDB() @@ -594,7 +595,7 @@ func testTxDecoder(cdc *codec.Codec) sdk.TxDecoder { } } -func anteHandlerTxTest(t *testing.T, capKey *sdk.KVStoreKey, storeKey []byte) sdk.AnteHandler { +func anteHandlerTxTest(t *testing.T, capKey sdk.StoreKey, storeKey []byte) sdk.AnteHandler { return func(ctx sdk.Context, tx sdk.Tx, simulate bool) (newCtx sdk.Context, err error) { store := ctx.KVStore(capKey) txTest := tx.(txTest) @@ -611,7 +612,7 @@ func anteHandlerTxTest(t *testing.T, capKey *sdk.KVStoreKey, storeKey []byte) sd } } -func handlerMsgCounter(t *testing.T, capKey *sdk.KVStoreKey, deliverKey []byte) sdk.Handler { +func handlerMsgCounter(t *testing.T, capKey sdk.StoreKey, deliverKey []byte) sdk.Handler { return func(ctx sdk.Context, msg sdk.Msg) sdk.Result { store := ctx.KVStore(capKey) var msgCount int64 diff --git a/client/config.go b/client/config.go index e21ee95de..61258d96f 100644 --- a/client/config.go +++ b/client/config.go @@ -2,6 +2,7 @@ package client import ( "fmt" + "io" "io/ioutil" "os" "path" @@ -149,7 +150,7 @@ func loadConfigFile(cfgFile string) (*toml.Tree, error) { return tree, nil } -func saveConfigFile(cfgFile string, tree *toml.Tree) error { +func saveConfigFile(cfgFile string, tree io.WriterTo) error { fp, err := os.OpenFile(cfgFile, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644) if err != nil { return err diff --git a/client/context/verifier_test.go b/client/context/verifier_test.go index d0785c812..6eacccae5 100644 --- a/client/context/verifier_test.go +++ b/client/context/verifier_test.go @@ -23,6 +23,7 @@ func TestCreateVerifier(t *testing.T) { } for _, tc := range testCases { + tc := tc t.Run(tc.name, func(t *testing.T) { verifier, err := context.CreateVerifier(tc.ctx, context.DefaultVerifierCacheSize) require.Equal(t, tc.expectErr, err != nil, err) diff --git a/client/keys/codec_test.go b/client/keys/codec_test.go index 739d5e9d0..6bc6bd49e 100644 --- a/client/keys/codec_test.go +++ b/client/keys/codec_test.go @@ -56,6 +56,7 @@ func TestMarshalJSON(t *testing.T) { {"empty object", args{data.Keys[3]}, data.JSON[3], false}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { got, err := MarshalJSON(tt.args.o) if (err != nil) != tt.wantErr { @@ -91,6 +92,7 @@ func TestUnmarshalJSON(t *testing.T) { {"empty object", args{data.JSON[3], &data.Answers[3]}, false}, } for idx, tt := range tests { + idx, tt := idx, tt t.Run(tt.name, func(t *testing.T) { if err := UnmarshalJSON(tt.args.bz, tt.args.ptr); (err != nil) != tt.wantErr { t.Errorf("unmarshalJSON() error = %v, wantErr %v", err, tt.wantErr) diff --git a/client/keys/delete_test.go b/client/keys/delete_test.go index 22d173021..184f1dfb9 100644 --- a/client/keys/delete_test.go +++ b/client/keys/delete_test.go @@ -91,6 +91,7 @@ func Test_confirmDeletion(t *testing.T) { {"BAD", args{answerInvalid}, true}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { if err := confirmDeletion(tt.args.buf); (err != nil) != tt.wantErr { t.Errorf("confirmDeletion() error = %v, wantErr %v", err, tt.wantErr) diff --git a/client/keys/list_test.go b/client/keys/list_test.go index 763de36c5..214e846ce 100644 --- a/client/keys/list_test.go +++ b/client/keys/list_test.go @@ -44,6 +44,7 @@ func Test_runListCmd(t *testing.T) { {"keybase: w/key", kbHome2, args{cmdBasic, []string{}}, false}, } for _, tt := range testData { + tt := tt t.Run(tt.name, func(t *testing.T) { viper.Set(flags.FlagHome, tt.kbDir) if err := runListCmd(tt.args.cmd, tt.args.args); (err != nil) != tt.wantErr { diff --git a/client/keys/parse_test.go b/client/keys/parse_test.go index 33e6c6ab0..759deb386 100644 --- a/client/keys/parse_test.go +++ b/client/keys/parse_test.go @@ -21,6 +21,7 @@ func TestParseKey(t *testing.T) { {"hex", []string{hexstr}, false}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { require.Equal(t, tt.wantErr, parseKey(nil, tt.args) != nil) }) diff --git a/client/keys/show_test.go b/client/keys/show_test.go index 53add173b..dfbee66f7 100644 --- a/client/keys/show_test.go +++ b/client/keys/show_test.go @@ -113,6 +113,7 @@ func Test_validateMultisigThreshold(t *testing.T) { {"1-2", args{2, 1}, true}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { if err := validateMultisigThreshold(tt.args.k, tt.args.nKeys); (err != nil) != tt.wantErr { t.Errorf("validateMultisigThreshold() error = %v, wantErr %v", err, tt.wantErr) @@ -138,6 +139,7 @@ func Test_getBechKeyOut(t *testing.T) { {"cons", args{sdk.PrefixConsensus}, keys.Bech32ConsKeyOutput, false}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { got, err := getBechKeyOut(tt.args.bechPrefix) if (err != nil) != tt.wantErr { diff --git a/client/utils_test.go b/client/utils_test.go index ebc00573f..0f1506c56 100644 --- a/client/utils_test.go +++ b/client/utils_test.go @@ -52,6 +52,7 @@ func TestPaginate(t *testing.T) { } for i, tc := range testCases { + i, tc := i, tc t.Run(tc.name, func(t *testing.T) { start, end := client.Paginate(tc.numObjs, tc.page, tc.limit, tc.defLimit) require.Equal(t, tc.expectedStart, start, "invalid result; test case #%d", i) diff --git a/crypto/keys/keybase_base.go b/crypto/keys/keybase_base.go index 6d88a0054..55dd9bbff 100644 --- a/crypto/keys/keybase_base.go +++ b/crypto/keys/keybase_base.go @@ -167,7 +167,7 @@ func (kb baseKeybase) CreateMnemonic( // Derive computes a BIP39 seed from the mnemonic and bip39Passphrase. It creates // a private key from the seed using the BIP44 params. func (kb baseKeybase) Derive( - keyWriter keyWriter, name, mnemonic, bip39Passphrase, encryptPasswd string, params hd.BIP44Params, + keyWriter keyWriter, name, mnemonic, bip39Passphrase, encryptPasswd string, params hd.BIP44Params, // nolint:interfacer ) (Info, error) { seed, err := bip39.NewSeedWithErrorChecking(mnemonic, bip39Passphrase) diff --git a/simapp/genesis_account_test.go b/simapp/genesis_account_test.go index bbede5127..db5c7fce2 100644 --- a/simapp/genesis_account_test.go +++ b/simapp/genesis_account_test.go @@ -91,6 +91,7 @@ func TestSimGenesisAccountValidate(t *testing.T) { } for _, tc := range testCases { + tc := tc t.Run(tc.name, func(t *testing.T) { require.Equal(t, tc.wantErr, tc.sga.Validate() != nil) }) diff --git a/simapp/sim_bench_test.go b/simapp/sim_bench_test.go index 486edcd84..430388f05 100644 --- a/simapp/sim_bench_test.go +++ b/simapp/sim_bench_test.go @@ -113,6 +113,7 @@ func BenchmarkInvariants(b *testing.B) { // NOTE: We use the crisis keeper as it has all the invariants registered with // their respective metadata which makes it useful for testing/benchmarking. for _, cr := range app.CrisisKeeper.Routes() { + cr := cr b.Run(fmt.Sprintf("%s/%s", cr.ModuleName, cr.Route), func(b *testing.B) { if res, stop := cr.Invar(ctx); stop { fmt.Printf("broken invariant at block %d of %d\n%s", ctx.BlockHeight()-1, config.NumBlocks, res) diff --git a/simapp/state.go b/simapp/state.go index 1801dd36f..a9e815d22 100644 --- a/simapp/state.go +++ b/simapp/state.go @@ -3,6 +3,7 @@ package simapp import ( "encoding/json" "fmt" + "io" "io/ioutil" "math/rand" "time" @@ -121,7 +122,7 @@ func AppStateRandomizedFn( // AppStateFromGenesisFileFn util function to generate the genesis AppState // from a genesis.json file. -func AppStateFromGenesisFileFn(r *rand.Rand, cdc *codec.Codec, genesisFile string) (tmtypes.GenesisDoc, []simulation.Account) { +func AppStateFromGenesisFileFn(r io.Reader, cdc *codec.Codec, genesisFile string) (tmtypes.GenesisDoc, []simulation.Account) { bytes, err := ioutil.ReadFile(genesisFile) if err != nil { panic(err) diff --git a/simapp/utils_test.go b/simapp/utils_test.go index d1bc9db3d..9d5443b6e 100644 --- a/simapp/utils_test.go +++ b/simapp/utils_test.go @@ -44,6 +44,7 @@ func TestGetSimulationLog(t *testing.T) { } for _, tt := range tests { + tt := tt t.Run(tt.store, func(t *testing.T) { require.Equal(t, tt.expectedLog, GetSimulationLog(tt.store, decoders, cdc, tt.kvPairs, tt.kvPairs), tt.store) }) diff --git a/store/list/list_test.go b/store/list/list_test.go index 12c275ede..88eccd6c1 100644 --- a/store/list/list_test.go +++ b/store/list/list_test.go @@ -90,6 +90,7 @@ func TestListRandom(t *testing.T) { } for k, v := range mocklist { + k := k var i uint32 require.NotPanics(t, func() { list.Get(uint64(k), &i) }) require.Equal(t, v, i) diff --git a/store/types/gas_test.go b/store/types/gas_test.go index 71ec66ce7..00d3d834d 100644 --- a/store/types/gas_test.go +++ b/store/types/gas_test.go @@ -25,6 +25,7 @@ func TestGasMeter(t *testing.T) { used := uint64(0) for unum, usage := range tc.usage { + usage := usage used += usage require.NotPanics(t, func() { meter.ConsumeGas(usage, "") }, "Not exceeded limit but panicked. tc #%d, usage #%d", tcnum, unum) require.Equal(t, used, meter.GasConsumed(), "Gas consumption not match. tc #%d, usage #%d", tcnum, unum) diff --git a/store/types/store_test.go b/store/types/store_test.go index 453bfa315..7ef1d6e88 100644 --- a/store/types/store_test.go +++ b/store/types/store_test.go @@ -44,6 +44,7 @@ func TestStoreUpgrades(t *testing.T) { } for name, tc := range cases { + tc := tc t.Run(name, func(t *testing.T) { for _, d := range tc.expectDelete { assert.Equal(t, tc.upgrades.IsDeleted(d.key), d.delete) diff --git a/types/coin_test.go b/types/coin_test.go index 8a142cd69..f18ff0365 100644 --- a/types/coin_test.go +++ b/types/coin_test.go @@ -40,6 +40,7 @@ func TestIsEqualCoin(t *testing.T) { } for tcIndex, tc := range cases { + tc := tc if tc.panics { require.Panics(t, func() { tc.inputOne.IsEqual(tc.inputTwo) }) } else { @@ -82,6 +83,7 @@ func TestAddCoin(t *testing.T) { } for tcIndex, tc := range cases { + tc := tc if tc.shouldPanic { require.Panics(t, func() { tc.inputOne.Add(tc.inputTwo) }) } else { @@ -106,6 +108,7 @@ func TestSubCoin(t *testing.T) { } for tcIndex, tc := range cases { + tc := tc if tc.shouldPanic { require.Panics(t, func() { tc.inputOne.Sub(tc.inputTwo) }) } else { @@ -136,6 +139,7 @@ func TestIsGTECoin(t *testing.T) { } for tcIndex, tc := range cases { + tc := tc if tc.panics { require.Panics(t, func() { tc.inputOne.IsGTE(tc.inputTwo) }) } else { @@ -161,6 +165,7 @@ func TestIsLTCoin(t *testing.T) { } for tcIndex, tc := range cases { + tc := tc if tc.panics { require.Panics(t, func() { tc.inputOne.IsLT(tc.inputTwo) }) } else { @@ -218,6 +223,7 @@ func TestEqualCoins(t *testing.T) { } for tcnum, tc := range cases { + tc := tc if tc.panics { require.Panics(t, func() { tc.inputOne.IsEqual(tc.inputTwo) }) } else { @@ -270,6 +276,7 @@ func TestSubCoins(t *testing.T) { } for i, tc := range testCases { + tc := tc if tc.shouldPanic { require.Panics(t, func() { tc.inputOne.Sub(tc.inputTwo) }) } else { @@ -586,6 +593,7 @@ func TestNewCoins(t *testing.T) { {"panic on dups", []Coin{tenatom, tenatom}, Coins{}, true}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { if tt.wantPanic { require.Panics(t, func() { NewCoins(tt.coins...) }) @@ -636,6 +644,7 @@ func TestFindDup(t *testing.T) { {"dup after first position", args{Coins{abc, def, def}}, 2}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { if got := findDup(tt.args.coins); got != tt.want { t.Errorf("findDup() = %v, want %v", got, tt.want) @@ -659,6 +668,7 @@ func TestMarshalJSONCoins(t *testing.T) { } for _, tc := range testCases { + tc := tc t.Run(tc.name, func(t *testing.T) { bz, err := cdc.MarshalJSON(tc.input) require.NoError(t, err) diff --git a/types/context_test.go b/types/context_test.go index 6da85b6d3..d8e893364 100644 --- a/types/context_test.go +++ b/types/context_test.go @@ -194,6 +194,7 @@ func TestContextHeaderClone(t *testing.T) { } for name, tc := range cases { + tc := tc t.Run(name, func(t *testing.T) { ctx := types.NewContext(nil, tc.h, false, nil) require.Equal(t, tc.h.Height, ctx.BlockHeight()) diff --git a/types/dec_coin_test.go b/types/dec_coin_test.go index 7e904fe5d..3c8df6572 100644 --- a/types/dec_coin_test.go +++ b/types/dec_coin_test.go @@ -307,6 +307,7 @@ func TestDecCoinsQuoDecTruncate(t *testing.T) { } for i, tc := range testCases { + tc := tc if tc.panics { require.Panics(t, func() { tc.coins.QuoDecTruncate(tc.input) }) } else { diff --git a/types/decimal_test.go b/types/decimal_test.go index 55aa31db9..99f9a1066 100644 --- a/types/decimal_test.go +++ b/types/decimal_test.go @@ -189,6 +189,7 @@ func TestArithmetic(t *testing.T) { } for tcIndex, tc := range tests { + tc := tc resAdd := tc.d1.Add(tc.d2) resSub := tc.d1.Sub(tc.d2) resMul := tc.d1.Mul(tc.d2) @@ -291,6 +292,7 @@ func TestDecMarshalJSON(t *testing.T) { {"12340Int", NewDec(12340), "\"12340.000000000000000000\"", false}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { got, err := tt.d.MarshalJSON() if (err != nil) != tt.wantErr { diff --git a/types/errors/abci_test.go b/types/errors/abci_test.go index 55b783113..20b4f74b6 100644 --- a/types/errors/abci_test.go +++ b/types/errors/abci_test.go @@ -89,6 +89,7 @@ func TestABCInfo(t *testing.T) { } for testName, tc := range cases { + tc := tc t.Run(testName, func(t *testing.T) { space, code, log := ABCIInfo(tc.err, tc.debug) if space != tc.wantSpace { @@ -140,6 +141,7 @@ func TestABCIInfoStacktrace(t *testing.T) { const thisTestSrc = "github.com/cosmos/cosmos-sdk/types/errors.TestABCIInfoStacktrace" for testName, tc := range cases { + tc := tc t.Run(testName, func(t *testing.T) { _, _, log := ABCIInfo(tc.err, tc.debug) if tc.wantStacktrace { @@ -250,6 +252,7 @@ func TestABCIInfoSerializeErr(t *testing.T) { // }, } for msg, spec := range specs { + spec := spec t.Run(msg, func(t *testing.T) { _, _, log := ABCIInfo(spec.src, spec.debug) if exp, got := spec.exp, log; exp != got { diff --git a/types/errors/errors_test.go b/types/errors/errors_test.go index d2c46a3e6..a669ee150 100644 --- a/types/errors/errors_test.go +++ b/types/errors/errors_test.go @@ -30,6 +30,7 @@ func TestCause(t *testing.T) { } for testName, tc := range cases { + tc := tc t.Run(testName, func(t *testing.T) { if got := errors.Cause(tc.err); got != tc.root { t.Fatal("unexpected result") @@ -136,6 +137,7 @@ func TestErrorIs(t *testing.T) { // }, } for testName, tc := range cases { + tc := tc t.Run(testName, func(t *testing.T) { if got := tc.a.Is(tc.b); got != tc.wantIs { t.Fatalf("unexpected result - got:%v want: %v", got, tc.wantIs) diff --git a/types/errors/stacktrace_test.go b/types/errors/stacktrace_test.go index 392ab4740..bef4bccb7 100644 --- a/types/errors/stacktrace_test.go +++ b/types/errors/stacktrace_test.go @@ -40,6 +40,7 @@ func TestStackTrace(t *testing.T) { const thisTestSrc = "types/errors/stacktrace_test.go" for testName, tc := range cases { + tc := tc t.Run(testName, func(t *testing.T) { if !reflect.DeepEqual(tc.err.Error(), tc.wantError) { t.Fatalf("errors not equal, got '%s', want '%s'", tc.err.Error(), tc.wantError) diff --git a/types/errors_test.go b/types/errors_test.go index 0a6df2d3c..912de348a 100644 --- a/types/errors_test.go +++ b/types/errors_test.go @@ -129,6 +129,7 @@ func TestResultFromError(t *testing.T) { } for name, tc := range cases { + tc := tc t.Run(name, func(t *testing.T) { res := ResultFromError(tc.err) require.Equal(t, tc.expect, res) diff --git a/types/rest/rest_test.go b/types/rest/rest_test.go index c5e9d7ae3..4c283a90e 100644 --- a/types/rest/rest_test.go +++ b/types/rest/rest_test.go @@ -54,6 +54,7 @@ func TestBaseReqValidateBasic(t *testing.T) { {"fees and gasprices provided", req4, httptest.NewRecorder(), false}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { require.Equal(t, tt.want, tt.req.ValidateBasic(tt.w)) }) @@ -90,6 +91,7 @@ func TestParseHTTPArgs(t *testing.T) { {"tags", req4, httptest.NewRecorder(), []string{"foo='faa'"}, DefaultPage, DefaultLimit, false}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { tags, page, limit, err := ParseHTTPArgs(tt.req) if tt.err { @@ -127,6 +129,7 @@ func TestParseQueryHeight(t *testing.T) { {"negative height", req3, httptest.NewRecorder(), context.CLIContext{}, emptyHeight, false}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { cliCtx, ok := ParseQueryHeightOrReturnBadRequest(tt.w, tt.cliCtx, tt.req) if tt.expectedOk { diff --git a/types/uint_test.go b/types/uint_test.go index a3115512b..167f65284 100644 --- a/types/uint_test.go +++ b/types/uint_test.go @@ -208,6 +208,7 @@ func TestSafeSub(t *testing.T) { } for i, tc := range testCases { + tc := tc if tc.panic { require.Panics(t, func() { tc.x.Sub(tc.y) }) continue @@ -236,6 +237,7 @@ func TestParseUint(t *testing.T) { {"zero", args{"0"}, ZeroUint(), false}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { got, err := ParseUint(tt.args.s) if tt.wantErr { diff --git a/types/utils_test.go b/types/utils_test.go index f3930d152..352beccd4 100644 --- a/types/utils_test.go +++ b/types/utils_test.go @@ -31,6 +31,7 @@ func TestSortJSON(t *testing.T) { } for tcIndex, tc := range cases { + tc := tc got, err := SortJSON([]byte(tc.unsortedJSON)) if tc.wantErr { require.NotNil(t, err, "tc #%d", tcIndex) @@ -55,6 +56,7 @@ func TestTimeFormatAndParse(t *testing.T) { {"2011-01-10T23:10:05.758230235Z", "2011-01-10T23:10:05.758230235", true}, } for _, tc := range cases { + tc := tc timeFromRFC, err := time.Parse(time.RFC3339Nano, tc.RFC3339NanoStr) require.Nil(t, err) timeFromSDKFormat, err := time.Parse(SortableTimeFormat, tc.SDKSortableTimeStr) diff --git a/x/auth/ante/ante_test.go b/x/auth/ante/ante_test.go index 60fe2149c..1cbc7419c 100644 --- a/x/auth/ante/ante_test.go +++ b/x/auth/ante/ante_test.go @@ -643,6 +643,7 @@ func TestCountSubkeys(t *testing.T) { {"multi level multikey", args{multiLevelMultiKey}, 11}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(T *testing.T) { require.Equal(t, tt.want, types.CountSubKeys(tt.args.pub)) }) diff --git a/x/auth/ante/sigverify_test.go b/x/auth/ante/sigverify_test.go index 82b9f8f62..85ed6911e 100644 --- a/x/auth/ante/sigverify_test.go +++ b/x/auth/ante/sigverify_test.go @@ -85,6 +85,7 @@ func TestConsumeSignatureVerificationGas(t *testing.T) { {"unknown key", args{sdk.NewInfiniteGasMeter(), nil, nil, params}, 0, true}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { err := ante.DefaultSigVerificationGasConsumer(tt.args.meter, tt.args.sig, tt.args.pubkey, tt.args.params) diff --git a/x/auth/client/utils/tx_test.go b/x/auth/client/utils/tx_test.go index 3ae79f7bd..cde10cc56 100644 --- a/x/auth/client/utils/tx_test.go +++ b/x/auth/client/utils/tx_test.go @@ -58,6 +58,7 @@ func TestCalculateGas(t *testing.T) { {"adjusted gas", args{10, false, 1.2}, 10, 12, false}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { queryFunc := makeQueryFunc(tt.args.queryFuncGasUsed, tt.args.queryFuncWantErr) gotEstimate, gotAdjusted, err := CalculateGas(queryFunc, cdc, []byte(""), tt.args.adjustment) diff --git a/x/auth/exported/exported.go b/x/auth/exported/exported.go index cfa6b9bdc..fe4fb16d8 100644 --- a/x/auth/exported/exported.go +++ b/x/auth/exported/exported.go @@ -43,7 +43,7 @@ type GenesisAccounts []GenesisAccount // Contains returns true if the given address exists in a slice of GenesisAccount // objects. -func (ga GenesisAccounts) Contains(addr sdk.AccAddress) bool { +func (ga GenesisAccounts) Contains(addr sdk.Address) bool { for _, acc := range ga { if acc.GetAddress().Equals(addr) { return true diff --git a/x/auth/legacy/v0_38/migrate_test.go b/x/auth/legacy/v0_38/migrate_test.go index e66ac976e..107545403 100644 --- a/x/auth/legacy/v0_38/migrate_test.go +++ b/x/auth/legacy/v0_38/migrate_test.go @@ -162,6 +162,7 @@ func TestMigrateInvalid(t *testing.T) { } for _, tc := range testCases { + tc := tc t.Run(tc.name, func(t *testing.T) { require.Panics(t, func() { Migrate( diff --git a/x/auth/simulation/decoder_test.go b/x/auth/simulation/decoder_test.go index 104106963..0023b6695 100644 --- a/x/auth/simulation/decoder_test.go +++ b/x/auth/simulation/decoder_test.go @@ -47,6 +47,7 @@ func TestDecodeStore(t *testing.T) { } for i, tt := range tests { + i, tt := i, tt t.Run(tt.name, func(t *testing.T) { switch i { case len(tests) - 1: diff --git a/x/auth/types/account_test.go b/x/auth/types/account_test.go index 754ccb9ee..14236172a 100644 --- a/x/auth/types/account_test.go +++ b/x/auth/types/account_test.go @@ -121,6 +121,7 @@ func TestGenesisAccountValidate(t *testing.T) { }, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { err := tt.acc.Validate() require.Equal(t, tt.expErr, err) diff --git a/x/auth/types/txbuilder_test.go b/x/auth/types/txbuilder_test.go index 063401c8a..c0a0e337a 100644 --- a/x/auth/types/txbuilder_test.go +++ b/x/auth/types/txbuilder_test.go @@ -131,6 +131,7 @@ func TestTxBuilderBuild(t *testing.T) { } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { bldr := NewTxBuilder( tt.fields.TxEncoder, tt.fields.AccountNumber, tt.fields.Sequence, diff --git a/x/auth/vesting/types/vesting_account_test.go b/x/auth/vesting/types/vesting_account_test.go index 3e5f5248d..24c07f697 100644 --- a/x/auth/vesting/types/vesting_account_test.go +++ b/x/auth/vesting/types/vesting_account_test.go @@ -725,6 +725,7 @@ func TestGenesisAccountValidate(t *testing.T) { }, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { err := tt.acc.Validate() require.Equal(t, tt.expErr, err) diff --git a/x/crisis/handler_test.go b/x/crisis/handler_test.go index dae98f027..064d6234b 100644 --- a/x/crisis/handler_test.go +++ b/x/crisis/handler_test.go @@ -63,6 +63,7 @@ func TestHandleMsgVerifyInvariant(t *testing.T) { } for _, tc := range cases { + tc := tc t.Run(tc.name, func(t *testing.T) { h := crisis.NewHandler(app.CrisisKeeper) diff --git a/x/distribution/client/common/common_test.go b/x/distribution/client/common/common_test.go index 1e2186111..e4a554a31 100644 --- a/x/distribution/client/common/common_test.go +++ b/x/distribution/client/common/common_test.go @@ -28,6 +28,7 @@ func TestQueryDelegationRewardsAddrValidation(t *testing.T) { {"empty validator address", args{"cosmos1zxcsu7l5qxs53lvp0fqgd09a9r2g6kqrk2cdpa", ""}, nil, true}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { _, err := QueryDelegationRewards(ctx, "", tt.args.delAddr, tt.args.valAddr) require.True(t, err != nil, tt.wantErr) diff --git a/x/distribution/simulation/decoder_test.go b/x/distribution/simulation/decoder_test.go index 25d846e25..f2c4d5f94 100644 --- a/x/distribution/simulation/decoder_test.go +++ b/x/distribution/simulation/decoder_test.go @@ -72,6 +72,7 @@ func TestDecodeDistributionStore(t *testing.T) { {"other", ""}, } for i, tt := range tests { + i, tt := i, tt t.Run(tt.name, func(t *testing.T) { switch i { case len(tests) - 1: diff --git a/x/genaccounts/legacy/v0_36/migrate_test.go b/x/genaccounts/legacy/v0_36/migrate_test.go index 10143678f..250dd8547 100644 --- a/x/genaccounts/legacy/v0_36/migrate_test.go +++ b/x/genaccounts/legacy/v0_36/migrate_test.go @@ -76,6 +76,7 @@ func TestMigrateEmptyRecord(t *testing.T) { {"Burned and deposited accounts", args{v034accounts.GenesisState{accountDeposited, accountBurned}, []v034gov.DepositWithMetadata{deposit}}}, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { require.NotPanics(t, func() { Migrate( diff --git a/x/genutil/gentx.go b/x/genutil/gentx.go index dce958f06..1ac4e64ed 100644 --- a/x/genutil/gentx.go +++ b/x/genutil/gentx.go @@ -39,7 +39,7 @@ func SetGenTxsInAppGenesisState(cdc *codec.Codec, appGenesisState map[string]jso // coins in the genesis accounts func ValidateAccountInGenesis(appGenesisState map[string]json.RawMessage, genAccIterator types.GenesisAccountsIterator, - key sdk.AccAddress, coins sdk.Coins, cdc *codec.Codec) error { + key sdk.Address, coins sdk.Coins, cdc *codec.Codec) error { accountIsInGenesis := false diff --git a/x/gov/keeper/vote.go b/x/gov/keeper/vote.go index 49ea2f704..0204e56be 100644 --- a/x/gov/keeper/vote.go +++ b/x/gov/keeper/vote.go @@ -18,7 +18,7 @@ func (keeper Keeper) AddVote(ctx sdk.Context, proposalID uint64, voterAddr sdk.A } if !types.ValidVoteOption(option) { - return types.ErrInvalidVote(keeper.codespace, option) + return types.ErrInvalidVote(keeper.codespace, option.String()) } vote := types.NewVote(proposalID, voterAddr, option) diff --git a/x/gov/simulation/decoder_test.go b/x/gov/simulation/decoder_test.go index 3cf9a08da..ec8f87cdb 100644 --- a/x/gov/simulation/decoder_test.go +++ b/x/gov/simulation/decoder_test.go @@ -61,6 +61,7 @@ func TestDecodeStore(t *testing.T) { } for i, tt := range tests { + i, tt := i, tt t.Run(tt.name, func(t *testing.T) { switch i { case len(tests) - 1: diff --git a/x/gov/types/errors.go b/x/gov/types/errors.go index 27102c7c5..dfc7bf5a4 100644 --- a/x/gov/types/errors.go +++ b/x/gov/types/errors.go @@ -51,8 +51,8 @@ func ErrInvalidProposalType(codespace sdk.CodespaceType, proposalType string) sd } // ErrInvalidVote error for an invalid vote option -func ErrInvalidVote(codespace sdk.CodespaceType, voteOption VoteOption) sdk.Error { - return sdk.NewError(codespace, CodeInvalidVote, fmt.Sprintf("'%v' is not a valid voting option", voteOption.String())) +func ErrInvalidVote(codespace sdk.CodespaceType, voteOption string) sdk.Error { + return sdk.NewError(codespace, CodeInvalidVote, fmt.Sprintf("'%v' is not a valid voting option", voteOption)) } // ErrInvalidGenesis error for an invalid governance GenesisState diff --git a/x/gov/types/msgs.go b/x/gov/types/msgs.go index aead43007..a29f2a20a 100644 --- a/x/gov/types/msgs.go +++ b/x/gov/types/msgs.go @@ -157,7 +157,7 @@ func (msg MsgVote) ValidateBasic() sdk.Error { return sdk.ErrInvalidAddress(msg.Voter.String()) } if !ValidVoteOption(msg.Option) { - return ErrInvalidVote(DefaultCodespace, msg.Option) + return ErrInvalidVote(DefaultCodespace, msg.Option.String()) } return nil diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index b6501baa7..853ddc3de 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -36,6 +36,7 @@ func TestDecodeStore(t *testing.T) { } for i, tt := range tests { + i, tt := i, tt t.Run(tt.name, func(t *testing.T) { switch i { case len(tests) - 1: diff --git a/x/params/keeper.go b/x/params/keeper.go index a3dc5c077..d5fc3ea53 100644 --- a/x/params/keeper.go +++ b/x/params/keeper.go @@ -21,7 +21,7 @@ type Keeper struct { } // NewKeeper constructs a params keeper -func NewKeeper(cdc *codec.Codec, key *sdk.KVStoreKey, tkey *sdk.TransientStoreKey, codespace sdk.CodespaceType) (k Keeper) { +func NewKeeper(cdc *codec.Codec, key, tkey sdk.StoreKey, codespace sdk.CodespaceType) (k Keeper) { k = Keeper{ cdc: cdc, key: key, diff --git a/x/params/keeper_test.go b/x/params/keeper_test.go index 1d4b4823a..6f66e7fe8 100644 --- a/x/params/keeper_test.go +++ b/x/params/keeper_test.go @@ -43,11 +43,13 @@ func TestKeeper(t *testing.T) { // Set params for i, kv := range kvs { + kv := kv require.NotPanics(t, func() { space.Set(ctx, []byte(kv.key), kv.param) }, "space.Set panics, tc #%d", i) } // Test space.Get for i, kv := range kvs { + i, kv := i, kv var param int64 require.NotPanics(t, func() { space.Get(ctx, []byte(kv.key), ¶m) }, "space.Get panics, tc #%d", i) require.Equal(t, kv.param, param, "stored param not equal, tc #%d", i) @@ -74,17 +76,20 @@ func TestKeeper(t *testing.T) { // Test invalid space.Get for i, kv := range kvs { + kv := kv var param bool require.Panics(t, func() { space.Get(ctx, []byte(kv.key), ¶m) }, "invalid space.Get not panics, tc #%d", i) } // Test invalid space.Set for i, kv := range kvs { + kv := kv require.Panics(t, func() { space.Set(ctx, []byte(kv.key), true) }, "invalid space.Set not panics, tc #%d", i) } // Test GetSubspace for i, kv := range kvs { + i, kv := i, kv var gparam, param int64 gspace, ok := keeper.GetSubspace("test") require.True(t, ok, "cannot retrieve subspace, tc #%d", i) @@ -146,6 +151,7 @@ func TestSubspace(t *testing.T) { // Test space.Set, space.Modified for i, kv := range kvs { + i, kv := i, kv require.False(t, space.Modified(ctx, []byte(kv.key)), "space.Modified returns true before setting, tc #%d", i) require.NotPanics(t, func() { space.Set(ctx, []byte(kv.key), kv.param) }, "space.Set panics, tc #%d", i) require.True(t, space.Modified(ctx, []byte(kv.key)), "space.Modified returns false after setting, tc #%d", i) @@ -153,6 +159,7 @@ func TestSubspace(t *testing.T) { // Test space.Get, space.GetIfExists for i, kv := range kvs { + i, kv := i, kv require.NotPanics(t, func() { space.GetIfExists(ctx, []byte("invalid"), kv.ptr) }, "space.GetIfExists panics when no value exists, tc #%d", i) require.Equal(t, kv.zero, indirect(kv.ptr), "space.GetIfExists unmarshalls when no value exists, tc #%d", i) require.Panics(t, func() { space.Get(ctx, []byte("invalid"), kv.ptr) }, "invalid space.Get not panics when no value exists, tc #%d", i) diff --git a/x/simulation/operation.go b/x/simulation/operation.go index e833807db..eaf0c8d14 100644 --- a/x/simulation/operation.go +++ b/x/simulation/operation.go @@ -154,6 +154,7 @@ func queueOperations(queuedOps OperationQueue, } for _, futureOp := range futureOps { + futureOp := futureOp if futureOp.BlockHeight != 0 { if val, ok := queuedOps[futureOp.BlockHeight]; ok { queuedOps[futureOp.BlockHeight] = append(val, futureOp.Op) diff --git a/x/slashing/simulation/decoder_test.go b/x/slashing/simulation/decoder_test.go index c4b1a2a89..9220ef917 100644 --- a/x/slashing/simulation/decoder_test.go +++ b/x/slashing/simulation/decoder_test.go @@ -55,6 +55,7 @@ func TestDecodeStore(t *testing.T) { {"other", ""}, } for i, tt := range tests { + i, tt := i, tt t.Run(tt.name, func(t *testing.T) { switch i { case len(tests) - 1: diff --git a/x/staking/client/cli/tx_test.go b/x/staking/client/cli/tx_test.go index f3ea62f3c..60283fa00 100644 --- a/x/staking/client/cli/tx_test.go +++ b/x/staking/client/cli/tx_test.go @@ -66,6 +66,7 @@ func TestPrepareFlagsForTxCreateValidator(t *testing.T) { defaultMinSelfDelegation, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) { runTest(t, tt, defaultParams) }) }) @@ -79,6 +80,7 @@ func TestPrepareFlagsForTxCreateValidator(t *testing.T) { viper.Set(FlagCommissionMaxChangeRate, params.commissionMaxChangeRate) viper.Set(FlagMinSelfDelegation, params.minSelfDelegation) for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { runTest(t, tt, params) }) } } diff --git a/x/staking/genesis_test.go b/x/staking/genesis_test.go index e3d15b25f..4a56b3ac9 100644 --- a/x/staking/genesis_test.go +++ b/x/staking/genesis_test.go @@ -129,6 +129,7 @@ func TestValidateGenesis(t *testing.T) { } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { genesisState := types.DefaultGenesisState() tt.mutate(&genesisState) diff --git a/x/staking/keeper/delegation.go b/x/staking/keeper/delegation.go index 2c0d8e52d..3aa244b3b 100644 --- a/x/staking/keeper/delegation.go +++ b/x/staking/keeper/delegation.go @@ -49,7 +49,7 @@ func (k Keeper) GetAllDelegations(ctx sdk.Context) (delegations []types.Delegati } // return all delegations to a specific validator. Useful for querier. -func (k Keeper) GetValidatorDelegations(ctx sdk.Context, valAddr sdk.ValAddress) (delegations []types.Delegation) { +func (k Keeper) GetValidatorDelegations(ctx sdk.Context, valAddr sdk.ValAddress) (delegations []types.Delegation) { //nolint:interfacer store := ctx.KVStore(k.storeKey) iterator := sdk.KVStorePrefixIterator(store, types.DelegationKey) defer iterator.Close() diff --git a/x/staking/simulation/decoder_test.go b/x/staking/simulation/decoder_test.go index 8774da60e..f5b2de545 100644 --- a/x/staking/simulation/decoder_test.go +++ b/x/staking/simulation/decoder_test.go @@ -62,6 +62,7 @@ func TestDecodeStore(t *testing.T) { {"other", ""}, } for i, tt := range tests { + i, tt := i, tt t.Run(tt.name, func(t *testing.T) { switch i { case len(tests) - 1: diff --git a/x/supply/internal/keeper/account.go b/x/supply/internal/keeper/account.go index d0f952cbf..312b039be 100644 --- a/x/supply/internal/keeper/account.go +++ b/x/supply/internal/keeper/account.go @@ -56,6 +56,6 @@ func (k Keeper) GetModuleAccount(ctx sdk.Context, moduleName string) exported.Mo } // SetModuleAccount sets the module account to the auth account store -func (k Keeper) SetModuleAccount(ctx sdk.Context, macc exported.ModuleAccountI) { +func (k Keeper) SetModuleAccount(ctx sdk.Context, macc exported.ModuleAccountI) { //nolint:interfacer k.ak.SetAccount(ctx, macc) } diff --git a/x/supply/internal/types/account_test.go b/x/supply/internal/types/account_test.go index b8acb4330..853049a80 100644 --- a/x/supply/internal/types/account_test.go +++ b/x/supply/internal/types/account_test.go @@ -89,6 +89,7 @@ func TestValidate(t *testing.T) { }, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { err := tt.acc.Validate() require.Equal(t, tt.expErr, err) diff --git a/x/supply/internal/types/permissions_test.go b/x/supply/internal/types/permissions_test.go index fad1408ae..75281a689 100644 --- a/x/supply/internal/types/permissions_test.go +++ b/x/supply/internal/types/permissions_test.go @@ -42,6 +42,7 @@ func TestValidatePermissions(t *testing.T) { } for i, tc := range cases { + i, tc := i, tc t.Run(tc.name, func(t *testing.T) { err := validatePermissions(tc.permissions...) if tc.expectPass { diff --git a/x/supply/simulation/decoder_test.go b/x/supply/simulation/decoder_test.go index 329b3e752..d40f62535 100644 --- a/x/supply/simulation/decoder_test.go +++ b/x/supply/simulation/decoder_test.go @@ -40,6 +40,7 @@ func TestDecodeStore(t *testing.T) { } for i, tt := range tests { + i, tt := i, tt t.Run(tt.name, func(t *testing.T) { switch i { case len(tests) - 1: