From 652c7b95ac0a0a5d68c2611155a1600853cf6d57 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 1 Mar 2023 00:18:40 +0100 Subject: [PATCH] chore: clean-up of #15151 --- x/gov/keeper/tally.go | 4 ++-- x/gov/migrations/v5/store.go | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/x/gov/keeper/tally.go b/x/gov/keeper/tally.go index b2cf46d74fe..37c1b2af1a9 100644 --- a/x/gov/keeper/tally.go +++ b/x/gov/keeper/tally.go @@ -102,7 +102,7 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal v1.Proposal) (passes bool, percentVoting := totalVotingPower.Quo(sdk.NewDecFromInt(keeper.sk.TotalBondedTokens(ctx))) quorum, _ := sdk.NewDecFromStr(params.Quorum) if percentVoting.LT(quorum) { - return false, keeper.GetParams(ctx).BurnVoteQuorum, tallyResults + return false, params.BurnVoteQuorum, tallyResults } // If no one votes (everyone abstains), proposal fails @@ -113,7 +113,7 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal v1.Proposal) (passes bool, // If more than 1/3 of voters veto, proposal fails vetoThreshold, _ := sdk.NewDecFromStr(params.VetoThreshold) if results[v1.OptionNoWithVeto].Quo(totalVotingPower).GT(vetoThreshold) { - return false, keeper.GetParams(ctx).BurnVoteVeto, tallyResults + return false, params.BurnVoteVeto, tallyResults } // If more than 1/2 of non-abstaining voters vote Yes, proposal passes diff --git a/x/gov/migrations/v5/store.go b/x/gov/migrations/v5/store.go index f073fbc5c9a..d17f93ba472 100644 --- a/x/gov/migrations/v5/store.go +++ b/x/gov/migrations/v5/store.go @@ -24,9 +24,6 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar params.ExpeditedMinDeposit = defaultParams.ExpeditedMinDeposit params.ExpeditedVotingPeriod = defaultParams.ExpeditedVotingPeriod params.ExpeditedThreshold = defaultParams.ExpeditedThreshold - params.BurnProposalDepositPrevote = defaultParams.BurnProposalDepositPrevote - params.BurnVoteQuorum = defaultParams.BurnVoteQuorum - params.BurnVoteVeto = defaultParams.BurnVoteVeto bz, err := cdc.Marshal(¶ms) if err != nil {