chore: clean-up of #15151 (#15219)

cosmos · Mar 1, 2023 · 2f4654e · 2f4654e
1 parent 44495e7
commit 2f4654e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 28 deletions.
diff --git a/api/cosmos/gov/v1/gov.pulsar.go b/api/cosmos/gov/v1/gov.pulsar.go
diff --git a/proto/cosmos/gov/v1/gov.proto b/proto/cosmos/gov/v1/gov.proto
@@ -245,15 +245,11 @@ message Params {
   repeated cosmos.base.v1beta1.Coin expedited_min_deposit = 12 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
 
   // burn deposits if a proposal does not meet quorum
-  //
-  // Since: cosmos-sdk 0.47
   bool burn_vote_quorum = 13;
+
   // burn deposits if the proposal does not enter voting period
-  //
-  // Since: cosmos-sdk 0.47
   bool burn_proposal_deposit_prevote = 14;
+
   // burn deposits if quorum with vote type no_veto is met
-  //
-  // Since: cosmos-sdk 0.47
   bool burn_vote_veto = 15;
 }
diff --git a/x/gov/abci.go b/x/gov/abci.go
@@ -21,7 +21,8 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) {
 	keeper.IterateInactiveProposalsQueue(ctx, ctx.BlockHeader().Time, func(proposal v1.Proposal) bool {
 		keeper.DeleteProposal(ctx, proposal.Id)
 
-		if !keeper.GetParams(ctx).BurnProposalDepositPrevote {
+		params := keeper.GetParams(ctx)
+		if !params.BurnProposalDepositPrevote {
 			keeper.RefundAndDeleteDeposits(ctx, proposal.Id) // refund deposit if proposal got removed without getting 100% of the proposal
 		} else {
 			keeper.DeleteAndBurnDeposits(ctx, proposal.Id) // burn the deposit if proposal got removed without getting 100% of the proposal
@@ -43,7 +44,7 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) {
 			"proposal", proposal.Id,
 			"expedited", proposal.Expedited,
 			"title", proposal.Title,
-			"min_deposit", sdk.NewCoins(proposal.GetMinDepositFromParams(keeper.GetParams(ctx))...).String(),
+			"min_deposit", sdk.NewCoins(proposal.GetMinDepositFromParams(params)...).String(),
 			"total_deposit", sdk.NewCoins(proposal.TotalDeposit...).String(),
 		)
 

diff --git 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/v4/store.go b/x/gov/migrations/v4/store.go
@@ -36,9 +36,9 @@ func migrateParams(ctx sdk.Context, storeKey storetypes.StoreKey, legacySubspace
 		tp.Threshold,
 		defaultParams.ExpeditedThreshold,
 		tp.VetoThreshold,
-		sdk.ZeroDec().String(),
-		sdk.ZeroDec().String(),
-		"",
+		defaultParams.MinInitialDepositRatio,
+		defaultParams.ProposalCancelRatio,
+		defaultParams.ProposalCancelDest,
 		defaultParams.BurnProposalDepositPrevote,
 		defaultParams.BurnVoteQuorum,
 		defaultParams.BurnVoteVeto,

diff --git a/x/gov/migrations/v5/store.go b/x/gov/migrations/v5/store.go
@@ -24,9 +24,8 @@ 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
+	params.ProposalCancelRatio = defaultParams.ProposalCancelRatio
+	params.ProposalCancelDest = defaultParams.ProposalCancelDest
 
 	bz, err := cdc.Marshal(&params)
 	if err != nil {

diff --git a/x/gov/types/v1/gov.pb.go b/x/gov/types/v1/gov.pb.go