From 4779359e2913dadbc713d2676503a5ba01893c8f Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Fri, 19 Oct 2018 03:21:11 +0200 Subject: [PATCH] Linter, enable simulated distribution msgs again --- cmd/gaia/app/sim_test.go | 6 +++--- x/auth/feekeeper.go | 1 + x/auth/feekeeper_test.go | 4 ++-- x/auth/simulation/fake.go | 5 ++++- x/stake/simulation/sim_test.go | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cmd/gaia/app/sim_test.go b/cmd/gaia/app/sim_test.go index 2321db835..50db94023 100644 --- a/cmd/gaia/app/sim_test.go +++ b/cmd/gaia/app/sim_test.go @@ -107,9 +107,9 @@ func testAndRunTxs(app *GaiaApp) []simulation.WeightedOperation { {5, authsim.SimulateDeductFee(app.accountMapper, app.feeCollectionKeeper)}, {100, banksim.SingleInputSendMsg(app.accountMapper, app.bankKeeper)}, {50, distributionsim.SimulateMsgSetWithdrawAddress(app.accountMapper, app.distrKeeper)}, - //{50, distributionsim.SimulateMsgWithdrawDelegatorRewardsAll(app.accountMapper, app.distrKeeper)}, - //{50, distributionsim.SimulateMsgWithdrawDelegatorReward(app.accountMapper, app.distrKeeper)}, - //{50, distributionsim.SimulateMsgWithdrawValidatorRewardsAll(app.accountMapper, app.distrKeeper)}, + {50, distributionsim.SimulateMsgWithdrawDelegatorRewardsAll(app.accountMapper, app.distrKeeper)}, + {50, distributionsim.SimulateMsgWithdrawDelegatorReward(app.accountMapper, app.distrKeeper)}, + {50, distributionsim.SimulateMsgWithdrawValidatorRewardsAll(app.accountMapper, app.distrKeeper)}, {5, govsim.SimulateSubmittingVotingAndSlashingForProposal(app.govKeeper, app.stakeKeeper)}, {100, govsim.SimulateMsgDeposit(app.govKeeper, app.stakeKeeper)}, {100, stakesim.SimulateMsgCreateValidator(app.accountMapper, app.stakeKeeper)}, diff --git a/x/auth/feekeeper.go b/x/auth/feekeeper.go index 83aa2b33b..dc7e91987 100644 --- a/x/auth/feekeeper.go +++ b/x/auth/feekeeper.go @@ -46,6 +46,7 @@ func (fck FeeCollectionKeeper) setCollectedFees(ctx sdk.Context, coins sdk.Coins store.Set(collectedFeesKey, bz) } +// add collected fees (mostly exposed for simulation...) func (fck FeeCollectionKeeper) AddCollectedFees(ctx sdk.Context, coins sdk.Coins) sdk.Coins { newCoins := fck.GetCollectedFees(ctx).Plus(coins) fck.setCollectedFees(ctx, newCoins) diff --git a/x/auth/feekeeper_test.go b/x/auth/feekeeper_test.go index 82bbe9c35..d48151161 100644 --- a/x/auth/feekeeper_test.go +++ b/x/auth/feekeeper_test.go @@ -49,11 +49,11 @@ func TestFeeCollectionKeeperAdd(t *testing.T) { require.True(t, fck.GetCollectedFees(ctx).IsEqual(emptyCoins)) // add oneCoin and check that pool is now oneCoin - fck.addCollectedFees(ctx, oneCoin) + fck.AddCollectedFees(ctx, oneCoin) require.True(t, fck.GetCollectedFees(ctx).IsEqual(oneCoin)) // add oneCoin again and check that pool is now twoCoins - fck.addCollectedFees(ctx, oneCoin) + fck.AddCollectedFees(ctx, oneCoin) require.True(t, fck.GetCollectedFees(ctx).IsEqual(twoCoins)) } diff --git a/x/auth/simulation/fake.go b/x/auth/simulation/fake.go index 99001617c..82f4e607b 100644 --- a/x/auth/simulation/fake.go +++ b/x/auth/simulation/fake.go @@ -35,7 +35,10 @@ func SimulateDeductFee(m auth.AccountMapper, f auth.FeeCollectionKeeper) simulat } coins := sdk.Coins{sdk.NewCoin(initCoins[denomIndex].Denom, amt)} - stored.SetCoins(initCoins.Minus(coins)) + err = stored.SetCoins(initCoins.Minus(coins)) + if err != nil { + panic(err) + } m.SetAccount(ctx, stored) f.AddCollectedFees(ctx, coins) diff --git a/x/stake/simulation/sim_test.go b/x/stake/simulation/sim_test.go index 207f42e61..2ce9fa00d 100644 --- a/x/stake/simulation/sim_test.go +++ b/x/stake/simulation/sim_test.go @@ -64,7 +64,7 @@ func TestStakeWithRandomMessages(t *testing.T) { }, []simulation.RandSetup{ Setup(mapp, stakeKeeper), }, []simulation.Invariant{ - AllInvariants(bankKeeper, stakeKeeper, distrKeeper, mapp.AccountMapper), + AllInvariants(bankKeeper, stakeKeeper, feeCollectionKeeper, distrKeeper, mapp.AccountMapper), }, 10, 100, false, )