diff --git a/.golangci.yml b/.golangci.yml index 0373de8806..b672a52652 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,7 +4,6 @@ run: linters: enable-all: true disable: - - gosimple - gocyclo - gochecknoinits - golint diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index eb50fc3ed2..d9c9fd3dce 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -104,13 +104,13 @@ func TestLoadVersion(t *testing.T) { header := abci.Header{Height: 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) res := app.Commit() - commitID1 := sdk.CommitID{1, res.Data} + commitID1 := sdk.CommitID{Version: 1, Hash: res.Data} // execute a block, collect commit ID header = abci.Header{Height: 2} app.BeginBlock(abci.RequestBeginBlock{Header: header}) res = app.Commit() - commitID2 := sdk.CommitID{2, res.Data} + commitID2 := sdk.CommitID{Version: 2, Hash: res.Data} // reload with LoadLatestVersion app = NewBaseApp(name, logger, db, nil, pruningOpt) @@ -307,7 +307,7 @@ func TestLoadVersionInvalid(t *testing.T) { header := abci.Header{Height: 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) res := app.Commit() - commitID1 := sdk.CommitID{1, res.Data} + commitID1 := sdk.CommitID{Version: 1, Hash: res.Data} // create a new app with the stores mounted under the same cap key app = NewBaseApp(name, logger, db, nil, pruningOpt) diff --git a/client/keys/codec_test.go b/client/keys/codec_test.go index 54499dcd8a..e8459aa635 100644 --- a/client/keys/codec_test.go +++ b/client/keys/codec_test.go @@ -18,6 +18,7 @@ type testCases struct { func getTestCases() testCases { return testCases{ + // nolint: govet []keys.KeyOutput{ {"A", "B", "C", "D", "E", 0, nil}, {"A", "B", "C", "D", "", 0, nil}, diff --git a/server/export.go b/server/export.go index 43c3c9e43b..e02c020ae9 100644 --- a/server/export.go +++ b/server/export.go @@ -92,8 +92,5 @@ func ExportCmd(ctx *Context, cdc *codec.Codec, appExporter AppExporter) *cobra.C } func isEmptyState(db dbm.DB) bool { - if db.Stats()["leveldb.sstables"] != "" { - return false - } - return true + return db.Stats()["leveldb.sstables"] != "" } diff --git a/store/cachekv/store_bench_test.go b/store/cachekv/store_bench_test.go index 44cc314566..4902819834 100644 --- a/store/cachekv/store_bench_test.go +++ b/store/cachekv/store_bench_test.go @@ -14,7 +14,7 @@ import ( func benchmarkCacheKVStoreIterator(numKVs int, b *testing.B) { mem := dbadapter.Store{DB: dbm.NewMemDB()} cstore := cachekv.NewStore(mem) - keys := make([]string, numKVs, numKVs) + keys := make([]string, numKVs) for i := 0; i < numKVs; i++ { key := make([]byte, 32) diff --git a/store/cachekv/store_test.go b/store/cachekv/store_test.go index 98c78ced5d..3074ae4fa2 100644 --- a/store/cachekv/store_test.go +++ b/store/cachekv/store_test.go @@ -14,7 +14,7 @@ import ( ) func newCacheKVStore() types.CacheKVStore { - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{DB: dbm.NewMemDB()} return cachekv.NewStore(mem) } @@ -22,7 +22,7 @@ func keyFmt(i int) []byte { return bz(fmt.Sprintf("key%0.8d", i)) } func valFmt(i int) []byte { return bz(fmt.Sprintf("value%0.8d", i)) } func TestCacheKVStore(t *testing.T) { - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{DB: dbm.NewMemDB()} st := cachekv.NewStore(mem) require.Empty(t, st.Get(keyFmt(1)), "Expected `key1` to be empty") @@ -65,13 +65,13 @@ func TestCacheKVStore(t *testing.T) { } func TestCacheKVStoreNoNilSet(t *testing.T) { - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{DB: dbm.NewMemDB()} st := cachekv.NewStore(mem) require.Panics(t, func() { st.Set([]byte("key"), nil) }, "setting a nil value should panic") } func TestCacheKVStoreNested(t *testing.T) { - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{DB: dbm.NewMemDB()} st := cachekv.NewStore(mem) // set. check its there on st and not on mem. diff --git a/store/gaskv/store_test.go b/store/gaskv/store_test.go index 470a818d94..6fab9ebf83 100644 --- a/store/gaskv/store_test.go +++ b/store/gaskv/store_test.go @@ -19,7 +19,7 @@ func keyFmt(i int) []byte { return bz(fmt.Sprintf("key%0.8d", i)) } func valFmt(i int) []byte { return bz(fmt.Sprintf("value%0.8d", i)) } func TestGasKVStoreBasic(t *testing.T) { - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{DB: dbm.NewMemDB()} meter := types.NewGasMeter(10000) st := gaskv.NewStore(mem, meter, types.KVGasConfig()) require.Empty(t, st.Get(keyFmt(1)), "Expected `key1` to be empty") @@ -31,7 +31,7 @@ func TestGasKVStoreBasic(t *testing.T) { } func TestGasKVStoreIterator(t *testing.T) { - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{DB: dbm.NewMemDB()} meter := types.NewGasMeter(10000) st := gaskv.NewStore(mem, meter, types.KVGasConfig()) require.Empty(t, st.Get(keyFmt(1)), "Expected `key1` to be empty") @@ -55,14 +55,14 @@ func TestGasKVStoreIterator(t *testing.T) { } func TestGasKVStoreOutOfGasSet(t *testing.T) { - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{DB: dbm.NewMemDB()} meter := types.NewGasMeter(0) st := gaskv.NewStore(mem, meter, types.KVGasConfig()) require.Panics(t, func() { st.Set(keyFmt(1), valFmt(1)) }, "Expected out-of-gas") } func TestGasKVStoreOutOfGasIterator(t *testing.T) { - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{DB: dbm.NewMemDB()} meter := types.NewGasMeter(20000) st := gaskv.NewStore(mem, meter, types.KVGasConfig()) st.Set(keyFmt(1), valFmt(1)) diff --git a/store/iavl/store_test.go b/store/iavl/store_test.go index 7480d07373..b70be1dee1 100644 --- a/store/iavl/store_test.go +++ b/store/iavl/store_test.go @@ -42,7 +42,7 @@ func newAlohaTree(t *testing.T, db dbm.DB) (*iavl.MutableTree, types.CommitID) { } hash, ver, err := tree.SaveVersion() require.Nil(t, err) - return tree, types.CommitID{ver, hash} + return tree, types.CommitID{Version: ver, Hash: hash} } func TestGetImmutable(t *testing.T) { @@ -52,7 +52,7 @@ func TestGetImmutable(t *testing.T) { require.True(t, tree.Set([]byte("hello"), []byte("adios"))) hash, ver, err := tree.SaveVersion() - cID = types.CommitID{ver, hash} + cID = types.CommitID{Version: ver, Hash: hash} require.Nil(t, err) _, err = store.GetImmutable(cID.Version + 1) diff --git a/store/prefix/store_test.go b/store/prefix/store_test.go index 1a59a03f8e..3414daec7c 100644 --- a/store/prefix/store_test.go +++ b/store/prefix/store_test.go @@ -96,14 +96,14 @@ func TestIAVLStorePrefix(t *testing.T) { func TestPrefixKVStoreNoNilSet(t *testing.T) { meter := types.NewGasMeter(100000000) - mem := dbadapter.Store{dbm.NewMemDB()} + mem := dbadapter.Store{DB: dbm.NewMemDB()} gasStore := gaskv.NewStore(mem, meter, types.KVGasConfig()) require.Panics(t, func() { gasStore.Set([]byte("key"), nil) }, "setting a nil value should panic") } func TestPrefixStoreIterate(t *testing.T) { db := dbm.NewMemDB() - baseStore := dbadapter.Store{db} + baseStore := dbadapter.Store{DB: db} prefix := []byte("test") prefixStore := NewStore(baseStore, prefix) @@ -149,7 +149,7 @@ func TestCloneAppend(t *testing.T) { func TestPrefixStoreIteratorEdgeCase(t *testing.T) { db := dbm.NewMemDB() - baseStore := dbadapter.Store{db} + baseStore := dbadapter.Store{DB: db} // overflow in cpIncr prefix := []byte{0xAA, 0xFF, 0xFF} @@ -179,7 +179,7 @@ func TestPrefixStoreIteratorEdgeCase(t *testing.T) { func TestPrefixStoreReverseIteratorEdgeCase(t *testing.T) { db := dbm.NewMemDB() - baseStore := dbadapter.Store{db} + baseStore := dbadapter.Store{DB: db} // overflow in cpIncr prefix := []byte{0xAA, 0xFF, 0xFF} @@ -207,7 +207,7 @@ func TestPrefixStoreReverseIteratorEdgeCase(t *testing.T) { iter.Close() db = dbm.NewMemDB() - baseStore = dbadapter.Store{db} + baseStore = dbadapter.Store{DB: db} // underflow in cpDecr prefix = []byte{0xAA, 0x00, 0x00} @@ -238,7 +238,7 @@ func TestPrefixStoreReverseIteratorEdgeCase(t *testing.T) { func mockStoreWithStuff() types.KVStore { db := dbm.NewMemDB() - store := dbadapter.Store{db} + store := dbadapter.Store{DB: db} // Under "key" prefix store.Set(bz("key"), bz("value")) store.Set(bz("key1"), bz("value1")) diff --git a/store/tracekv/store_test.go b/store/tracekv/store_test.go index 60c78e50f6..99b17233ea 100644 --- a/store/tracekv/store_test.go +++ b/store/tracekv/store_test.go @@ -38,7 +38,7 @@ func newTraceKVStore(w io.Writer) *tracekv.Store { } func newEmptyTraceKVStore(w io.Writer) *tracekv.Store { - memDB := dbadapter.Store{dbm.NewMemDB()} + memDB := dbadapter.Store{DB: dbm.NewMemDB()} tc := types.TraceContext(map[string]interface{}{"blockHeight": 64}) return tracekv.NewStore(memDB, w, tc) @@ -279,7 +279,7 @@ func TestTraceKVStorePrefix(t *testing.T) { } func TestTraceKVStoreGetStoreType(t *testing.T) { - memDB := dbadapter.Store{dbm.NewMemDB()} + memDB := dbadapter.Store{DB: dbm.NewMemDB()} store := newEmptyTraceKVStore(nil) require.Equal(t, memDB.GetStoreType(), store.GetStoreType()) } diff --git a/types/events.go b/types/events.go index bbe51819c5..87c95c3bab 100644 --- a/types/events.go +++ b/types/events.go @@ -111,7 +111,7 @@ func (e Events) AppendEvents(events Events) Events { // ToABCIEvents converts a slice of Event objects to a slice of abci.Event // objects. func (e Events) ToABCIEvents() []abci.Event { - res := make([]abci.Event, len(e), len(e)) + res := make([]abci.Event, len(e)) for i, ev := range e { res[i] = abci.Event{Type: ev.Type, Attributes: ev.Attributes} } diff --git a/types/rest/rest_test.go b/types/rest/rest_test.go index 17d0e3638b..c5e9d7ae3a 100644 --- a/types/rest/rest_test.go +++ b/types/rest/rest_test.go @@ -208,6 +208,7 @@ func runPostProcessResponse(t *testing.T, ctx context.CLIContext, obj interface{ PostProcessResponse(w, ctx, obj) require.Equal(t, http.StatusOK, w.Code, w.Body) resp := w.Result() + defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body) require.Nil(t, err) require.Equal(t, expectedBody, body) @@ -225,6 +226,7 @@ func runPostProcessResponse(t *testing.T, ctx context.CLIContext, obj interface{ PostProcessResponse(w, ctx, marshalled) require.Equal(t, http.StatusOK, w.Code, w.Body) resp = w.Result() + defer resp.Body.Close() body, err = ioutil.ReadAll(resp.Body) require.Nil(t, err) require.Equal(t, expectedBody, body) diff --git a/x/auth/client/utils/rest.go b/x/auth/client/utils/rest.go index c86933873e..9423fe629e 100644 --- a/x/auth/client/utils/rest.go +++ b/x/auth/client/utils/rest.go @@ -64,5 +64,4 @@ func WriteGenerateStdTxResponse(w http.ResponseWriter, cliCtx context.CLIContext log.Printf("could not write response: %v", err) } - return } diff --git a/x/auth/simulation/genesis.go b/x/auth/simulation/genesis.go index 554d031a0d..39906df7f9 100644 --- a/x/auth/simulation/genesis.go +++ b/x/auth/simulation/genesis.go @@ -99,8 +99,7 @@ func RandomGenesisAccounts(simState *module.SimulationState) (genesisAccs export panic(err) } - var gacc exported.GenesisAccount - gacc = &bacc + var gacc exported.GenesisAccount = &bacc // Only consider making a vesting account once the initial bonded validator // set is exhausted due to needing to track DelegatedVesting. diff --git a/x/bank/internal/keeper/keeper_test.go b/x/bank/internal/keeper/keeper_test.go index 1ed1d48099..ced226f1d2 100644 --- a/x/bank/internal/keeper/keeper_test.go +++ b/x/bank/internal/keeper/keeper_test.go @@ -146,7 +146,7 @@ func TestSendKeeper(t *testing.T) { // validate coins with invalid denoms or negative values cannot be sent // NOTE: We must use the Coin literal as the constructor does not allow // negative values. - err = sendKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.Coin{"FOOCOIN", sdk.NewInt(-5)}}) + err = sendKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.Coin{Denom: "FOOCOIN", Amount: sdk.NewInt(-5)}}) require.Error(t, err) } diff --git a/x/crisis/handler_test.go b/x/crisis/handler_test.go index b2448a0df3..dae98f0273 100644 --- a/x/crisis/handler_test.go +++ b/x/crisis/handler_test.go @@ -21,7 +21,6 @@ var ( testModuleName = "dummy" dummyRouteWhichPasses = crisis.NewInvarRoute(testModuleName, "which-passes", func(_ sdk.Context) (string, bool) { return "", false }) dummyRouteWhichFails = crisis.NewInvarRoute(testModuleName, "which-fails", func(_ sdk.Context) (string, bool) { return "whoops", true }) - addrs = distr.TestAddrs ) func createTestApp() (*simapp.SimApp, sdk.Context, []sdk.AccAddress) { diff --git a/x/distribution/keeper/allocation_test.go b/x/distribution/keeper/allocation_test.go index 4d2d33dc9e..8f1b84c5f3 100644 --- a/x/distribution/keeper/allocation_test.go +++ b/x/distribution/keeper/allocation_test.go @@ -23,13 +23,13 @@ func TestAllocateTokensToValidatorWithCommission(t *testing.T) { // allocate tokens tokens := sdk.DecCoins{ - {sdk.DefaultBondDenom, sdk.NewDec(10)}, + {Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(10)}, } k.AllocateTokensToValidator(ctx, val, tokens) // check commission expected := sdk.DecCoins{ - {sdk.DefaultBondDenom, sdk.NewDec(5)}, + {Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(5)}, } require.Equal(t, expected, k.GetValidatorAccumulatedCommission(ctx, val.GetOperator())) @@ -93,18 +93,18 @@ func TestAllocateTokensToManyValidators(t *testing.T) { k.AllocateTokens(ctx, 200, 200, valConsAddr2, votes) // 98 outstanding rewards (100 less 2 to community pool) - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDecWithPrec(465, 1)}}, k.GetValidatorOutstandingRewards(ctx, valOpAddr1)) - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDecWithPrec(515, 1)}}, k.GetValidatorOutstandingRewards(ctx, valOpAddr2)) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDecWithPrec(465, 1)}}, k.GetValidatorOutstandingRewards(ctx, valOpAddr1)) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDecWithPrec(515, 1)}}, k.GetValidatorOutstandingRewards(ctx, valOpAddr2)) // 2 community pool coins - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(2)}}, k.GetFeePool(ctx).CommunityPool) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(2)}}, k.GetFeePool(ctx).CommunityPool) // 50% commission for first proposer, (0.5 * 93%) * 100 / 2 = 23.25 - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDecWithPrec(2325, 2)}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDecWithPrec(2325, 2)}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) // zero commission for second proposer require.True(t, k.GetValidatorAccumulatedCommission(ctx, valOpAddr2).IsZero()) // just staking.proportional for first proposer less commission = (0.5 * 93%) * 100 / 2 = 23.25 - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDecWithPrec(2325, 2)}}, k.GetValidatorCurrentRewards(ctx, valOpAddr1).Rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDecWithPrec(2325, 2)}}, k.GetValidatorCurrentRewards(ctx, valOpAddr1).Rewards) // proposer reward + staking.proportional for second proposer = (5 % + 0.5 * (93%)) * 100 = 51.5 - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDecWithPrec(515, 1)}}, k.GetValidatorCurrentRewards(ctx, valOpAddr2).Rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDecWithPrec(515, 1)}}, k.GetValidatorCurrentRewards(ctx, valOpAddr2).Rewards) } func TestAllocateTokensTruncation(t *testing.T) { diff --git a/x/distribution/keeper/delegation_test.go b/x/distribution/keeper/delegation_test.go index 2faa1da417..db6f6fb434 100644 --- a/x/distribution/keeper/delegation_test.go +++ b/x/distribution/keeper/delegation_test.go @@ -46,7 +46,7 @@ func TestCalculateRewardsBasic(t *testing.T) { // allocate some rewards initial := int64(10) - tokens := sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial)}} + tokens := sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial)}} k.AllocateTokensToValidator(ctx, val, tokens) // end period @@ -56,10 +56,10 @@ func TestCalculateRewardsBasic(t *testing.T) { rewards = k.calculateDelegationRewards(ctx, val, del, endingPeriod) // rewards should be half the tokens - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial / 2)}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial / 2)}}, rewards) // commission should be the other half - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial / 2)}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial / 2)}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) } func TestCalculateRewardsAfterSlash(t *testing.T) { @@ -108,7 +108,7 @@ func TestCalculateRewardsAfterSlash(t *testing.T) { // allocate some rewards initial := sdk.TokensFromConsensusPower(10) - tokens := sdk.DecCoins{{sdk.DefaultBondDenom, initial.ToDec()}} + tokens := sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial.ToDec()}} k.AllocateTokensToValidator(ctx, val, tokens) // end period @@ -118,10 +118,10 @@ func TestCalculateRewardsAfterSlash(t *testing.T) { rewards = k.calculateDelegationRewards(ctx, val, del, endingPeriod) // rewards should be half the tokens - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, initial.QuoRaw(2).ToDec()}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial.QuoRaw(2).ToDec()}}, rewards) // commission should be the other half - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, initial.QuoRaw(2).ToDec()}}, + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial.QuoRaw(2).ToDec()}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) } @@ -170,7 +170,7 @@ func TestCalculateRewardsAfterManySlashes(t *testing.T) { // allocate some rewards initial := sdk.TokensFromConsensusPower(10) - tokens := sdk.DecCoins{{sdk.DefaultBondDenom, initial.ToDec()}} + tokens := sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial.ToDec()}} k.AllocateTokensToValidator(ctx, val, tokens) // slash the validator by 50% again @@ -192,10 +192,10 @@ func TestCalculateRewardsAfterManySlashes(t *testing.T) { rewards = k.calculateDelegationRewards(ctx, val, del, endingPeriod) // rewards should be half the tokens - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, initial.ToDec()}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial.ToDec()}}, rewards) // commission should be the other half - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, initial.ToDec()}}, + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial.ToDec()}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) } @@ -221,7 +221,7 @@ func TestCalculateRewardsMultiDelegator(t *testing.T) { // allocate some rewards initial := int64(20) - tokens := sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial)}} + tokens := sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial)}} k.AllocateTokensToValidator(ctx, val, tokens) // second delegation @@ -248,16 +248,16 @@ func TestCalculateRewardsMultiDelegator(t *testing.T) { rewards := k.calculateDelegationRewards(ctx, val, del1, endingPeriod) // rewards for del1 should be 3/4 initial - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial * 3 / 4)}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial * 3 / 4)}}, rewards) // calculate delegation rewards for del2 rewards = k.calculateDelegationRewards(ctx, val, del2, endingPeriod) // rewards for del2 should be 1/4 initial - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial * 1 / 4)}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial * 1 / 4)}}, rewards) // commission should be equal to initial (50% twice) - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial)}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial)}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) } func TestWithdrawDelegationRewardsBasic(t *testing.T) { @@ -369,7 +369,7 @@ func TestCalculateRewardsAfterManySlashesInSameBlock(t *testing.T) { // allocate some rewards initial := sdk.TokensFromConsensusPower(10).ToDec() - tokens := sdk.DecCoins{{sdk.DefaultBondDenom, initial}} + tokens := sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial}} k.AllocateTokensToValidator(ctx, val, tokens) // slash the validator by 50% @@ -394,10 +394,10 @@ func TestCalculateRewardsAfterManySlashesInSameBlock(t *testing.T) { rewards = k.calculateDelegationRewards(ctx, val, del, endingPeriod) // rewards should be half the tokens - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, initial}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial}}, rewards) // commission should be the other half - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, initial}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) } func TestCalculateRewardsMultiDelegatorMultiSlash(t *testing.T) { @@ -424,7 +424,7 @@ func TestCalculateRewardsMultiDelegatorMultiSlash(t *testing.T) { // allocate some rewards initial := sdk.TokensFromConsensusPower(30).ToDec() - tokens := sdk.DecCoins{{sdk.DefaultBondDenom, initial}} + tokens := sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial}} k.AllocateTokensToValidator(ctx, val, tokens) // slash the validator @@ -463,16 +463,16 @@ func TestCalculateRewardsMultiDelegatorMultiSlash(t *testing.T) { rewards := k.calculateDelegationRewards(ctx, val, del1, endingPeriod) // rewards for del1 should be 2/3 initial (half initial first period, 1/6 initial second period) - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, initial.QuoInt64(2).Add(initial.QuoInt64(6))}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial.QuoInt64(2).Add(initial.QuoInt64(6))}}, rewards) // calculate delegation rewards for del2 rewards = k.calculateDelegationRewards(ctx, val, del2, endingPeriod) // rewards for del2 should be initial / 3 - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, initial.QuoInt64(3)}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial.QuoInt64(3)}}, rewards) // commission should be equal to initial (twice 50% commission, unaffected by slashing) - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, initial}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) } func TestCalculateRewardsMultiDelegatorMultWithdraw(t *testing.T) { @@ -581,10 +581,10 @@ func TestCalculateRewardsMultiDelegatorMultWithdraw(t *testing.T) { rewards = k.calculateDelegationRewards(ctx, val, del2, endingPeriod) // rewards for del2 should be 1/4 initial - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial / 4)}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial / 4)}}, rewards) // commission should be half initial - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial / 2)}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial / 2)}}, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1)) // next block ctx = ctx.WithBlockHeight(ctx.BlockHeight() + 1) @@ -602,13 +602,13 @@ func TestCalculateRewardsMultiDelegatorMultWithdraw(t *testing.T) { rewards = k.calculateDelegationRewards(ctx, val, del1, endingPeriod) // rewards for del1 should be 1/4 initial - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial / 4)}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial / 4)}}, rewards) // calculate delegation rewards for del2 rewards = k.calculateDelegationRewards(ctx, val, del2, endingPeriod) // rewards for del2 should be 1/2 initial - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial / 2)}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial / 2)}}, rewards) // commission should be zero require.True(t, k.GetValidatorAccumulatedCommission(ctx, valOpAddr1).IsZero()) diff --git a/x/distribution/keeper/querier_test.go b/x/distribution/keeper/querier_test.go index 7bcd2f5016..b4a5d8e7d0 100644 --- a/x/distribution/keeper/querier_test.go +++ b/x/distribution/keeper/querier_test.go @@ -159,13 +159,13 @@ func TestQueries(t *testing.T) { require.Equal(t, withdrawAddrEnabled, retWithdrawAddrEnabled) // test outstanding rewards query - outstandingRewards := sdk.DecCoins{{"mytoken", sdk.NewDec(3)}, {"myothertoken", sdk.NewDecWithPrec(3, 7)}} + outstandingRewards := sdk.DecCoins{{Denom: "mytoken", Amount: sdk.NewDec(3)}, {Denom: "myothertoken", Amount: sdk.NewDecWithPrec(3, 7)}} keeper.SetValidatorOutstandingRewards(ctx, valOpAddr1, outstandingRewards) retOutstandingRewards := getQueriedValidatorOutstandingRewards(t, ctx, cdc, querier, valOpAddr1) require.Equal(t, outstandingRewards, retOutstandingRewards) // test validator commission query - commission := sdk.DecCoins{{"token1", sdk.NewDec(4)}, {"token2", sdk.NewDec(2)}} + commission := sdk.DecCoins{{Denom: "token1", Amount: sdk.NewDec(4)}, {Denom: "token2", Amount: sdk.NewDec(2)}} keeper.SetValidatorAccumulatedCommission(ctx, valOpAddr1, commission) retCommission := getQueriedValidatorCommission(t, ctx, cdc, querier, valOpAddr1) require.Equal(t, commission, retCommission) @@ -198,10 +198,10 @@ func TestQueries(t *testing.T) { require.True(t, rewards.IsZero()) initial := int64(10) ctx = ctx.WithBlockHeight(ctx.BlockHeight() + 1) - tokens := sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial)}} + tokens := sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial)}} keeper.AllocateTokensToValidator(ctx, val, tokens) rewards = getQueriedDelegationRewards(t, ctx, cdc, querier, sdk.AccAddress(valOpAddr1), valOpAddr1) - require.Equal(t, sdk.DecCoins{{sdk.DefaultBondDenom, sdk.NewDec(initial / 2)}}, rewards) + require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: sdk.NewDec(initial / 2)}}, rewards) // test delegator's total rewards query delRewards = getQueriedDelegatorTotalRewards(t, ctx, cdc, querier, sdk.AccAddress(valOpAddr1)) diff --git a/x/distribution/types/fee_pool_test.go b/x/distribution/types/fee_pool_test.go index bc85e56df2..ebf5bc4b02 100644 --- a/x/distribution/types/fee_pool_test.go +++ b/x/distribution/types/fee_pool_test.go @@ -13,7 +13,7 @@ func TestValidateGenesis(t *testing.T) { fp := InitialFeePool() require.Nil(t, fp.ValidateGenesis()) - fp2 := FeePool{CommunityPool: sdk.DecCoins{{"stake", sdk.NewDec(-1)}}} + fp2 := FeePool{CommunityPool: sdk.DecCoins{{Denom: "stake", Amount: sdk.NewDec(-1)}}} require.NotNil(t, fp2.ValidateGenesis()) } diff --git a/x/genutil/client/cli/init_test.go b/x/genutil/client/cli/init_test.go index 2426468532..540e57cfb5 100644 --- a/x/genutil/client/cli/init_test.go +++ b/x/genutil/client/cli/init_test.go @@ -116,9 +116,9 @@ func TestStartStandAlone(t *testing.T) { svr.Start() timer := time.NewTimer(time.Duration(2) * time.Second) - select { - case <-timer.C: + for range timer.C { svr.Stop() + break } } diff --git a/x/gov/keeper/vote_test.go b/x/gov/keeper/vote_test.go index c15978e42d..36c02d0913 100644 --- a/x/gov/keeper/vote_test.go +++ b/x/gov/keeper/vote_test.go @@ -16,8 +16,7 @@ func TestVotes(t *testing.T) { require.NoError(t, err) proposalID := proposal.ProposalID - var invalidOption types.VoteOption - invalidOption = 0x10 + var invalidOption types.VoteOption = 0x10 require.Error(t, keeper.AddVote(ctx, proposalID, TestAddrs[0], types.OptionYes), "proposal not on voting period") require.Error(t, keeper.AddVote(ctx, 10, TestAddrs[0], types.OptionYes), "invalid proposal ID") diff --git a/x/params/proposal_handler_test.go b/x/params/proposal_handler_test.go index 6797929a0d..934211356d 100644 --- a/x/params/proposal_handler_test.go +++ b/x/params/proposal_handler_test.go @@ -43,8 +43,8 @@ type testParams struct { func (tp *testParams) ParamSetPairs() subspace.ParamSetPairs { return subspace.ParamSetPairs{ - {[]byte(keyMaxValidators), &tp.MaxValidators}, - {[]byte(keySlashingRate), &tp.SlashingRate}, + {Key: []byte(keyMaxValidators), Value: &tp.MaxValidators}, + {Key: []byte(keySlashingRate), Value: &tp.SlashingRate}, } } diff --git a/x/params/simulation/operations/msgs.go b/x/params/simulation/operations/msgs.go index 92c9b253ed..bdcfa3f757 100644 --- a/x/params/simulation/operations/msgs.go +++ b/x/params/simulation/operations/msgs.go @@ -22,7 +22,7 @@ func SimulateParamChangeProposalContent(paramChangePool []simulation.ParamChange } numChanges := simulation.RandIntBetween(r, 1, lenParamChange) - paramChanges := make([]params.ParamChange, numChanges, numChanges) + paramChanges := make([]params.ParamChange, numChanges) // map from key to empty struct; used only for look-up of the keys of the // parameters that are already in the random set of changes. diff --git a/x/staking/keeper/querier.go b/x/staking/keeper/querier.go index b9c346d01e..3e3ced157c 100644 --- a/x/staking/keeper/querier.go +++ b/x/staking/keeper/querier.go @@ -359,7 +359,7 @@ func delegationsToDelegationResponses( ctx sdk.Context, k Keeper, delegations types.Delegations, ) (types.DelegationResponses, sdk.Error) { - resp := make(types.DelegationResponses, len(delegations), len(delegations)) + resp := make(types.DelegationResponses, len(delegations)) for i, del := range delegations { delResp, err := delegationToDelegationResponse(ctx, k, del) if err != nil { @@ -376,14 +376,14 @@ func redelegationsToRedelegationResponses( ctx sdk.Context, k Keeper, redels types.Redelegations, ) (types.RedelegationResponses, sdk.Error) { - resp := make(types.RedelegationResponses, len(redels), len(redels)) + resp := make(types.RedelegationResponses, len(redels)) for i, redel := range redels { val, found := k.GetValidator(ctx, redel.ValidatorDstAddress) if !found { return nil, types.ErrNoValidatorFound(types.DefaultCodespace) } - entryResponses := make([]types.RedelegationEntryResponse, len(redel.Entries), len(redel.Entries)) + entryResponses := make([]types.RedelegationEntryResponse, len(redel.Entries)) for j, entry := range redel.Entries { entryResponses[j] = types.NewRedelegationEntryResponse( entry.CreationHeight, diff --git a/x/staking/keeper/slash.go b/x/staking/keeper/slash.go index 6e1c54045c..9ce1b79ce8 100644 --- a/x/staking/keeper/slash.go +++ b/x/staking/keeper/slash.go @@ -137,8 +137,6 @@ func (k Keeper) Slash(ctx sdk.Context, consAddr sdk.ConsAddress, infractionHeigh "validator %s slashed by slash factor of %s; burned %v tokens", validator.GetOperator(), slashFactor.String(), tokensToBurn)) - // TODO Return event(s), blocked on https://github.com/tendermint/tendermint/pull/1803 - return } // jail a validator @@ -147,8 +145,6 @@ func (k Keeper) Jail(ctx sdk.Context, consAddr sdk.ConsAddress) { k.jailValidator(ctx, validator) logger := k.Logger(ctx) logger.Info(fmt.Sprintf("validator %s jailed", consAddr)) - // TODO Return event(s), blocked on https://github.com/tendermint/tendermint/pull/1803 - return } // unjail a validator @@ -157,8 +153,6 @@ func (k Keeper) Unjail(ctx sdk.Context, consAddr sdk.ConsAddress) { k.unjailValidator(ctx, validator) logger := k.Logger(ctx) logger.Info(fmt.Sprintf("validator %s unjailed", consAddr)) - // TODO Return event(s), blocked on https://github.com/tendermint/tendermint/pull/1803 - return } // slash an unbonding delegation and update the pool