Merge branch 'master' into bez/upgrade-name-normalize-cmvsr

cosmos · Apr 13, 2022 · 95b9c76 · 95b9c76
2 parents 3a22f4e + dd2b9e1
commit 95b9c76
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 29 deletions.
diff --git a/simapp/helpers/test_helpers.go b/simapp/helpers/test_helpers.go
@@ -14,7 +14,7 @@ import (
 
 // SimAppChainID hardcoded chainID for simulation
 const (
-	DefaultGenTxGas = 1000000
+	DefaultGenTxGas = 10000000
 	SimAppChainID   = "simulation-app"
 )
 

diff --git a/x/group/client/testutil/tx.go b/x/group/client/testutil/tx.go
@@ -1103,6 +1103,7 @@ func (s *IntegrationTestSuite) TestTxUpdateGroupPolicyAdmin() {
 		fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
 		fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
 		fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
+		fmt.Sprintf("--%s=%d", flags.FlagGas, 300000),
 	}
 
 	testCases := []struct {
@@ -1206,6 +1207,7 @@ func (s *IntegrationTestSuite) TestTxUpdateGroupPolicyDecisionPolicy() {
 		fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
 		fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
 		fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
+		fmt.Sprintf("--%s=%d", flags.FlagGas, 300000),
 	}
 
 	testCases := []struct {
@@ -1354,6 +1356,7 @@ func (s *IntegrationTestSuite) TestTxUpdateGroupPolicyMetadata() {
 		fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
 		fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
 		fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
+		fmt.Sprintf("--%s=%d", flags.FlagGas, 300000),
 	}
 
 	testCases := []struct {

diff --git a/x/group/keeper/keeper.go b/x/group/keeper/keeper.go
@@ -278,6 +278,32 @@ func (k Keeper) pruneProposal(ctx sdk.Context, proposalID uint64) error {
 	return nil
 }
 
+// updateProposalStatus iterates through all proposals by group policy index and updates proposal status
+func (k Keeper) updateProposalStatus(ctx sdk.Context, groupPolicyAddr sdk.AccAddress) error {
+	proposalIt, err := k.proposalByGroupPolicyIndex.Get(ctx.KVStore(k.key), groupPolicyAddr.Bytes())
+	if err != nil {
+		return err
+	}
+	defer proposalIt.Close()
+
+	for {
+		var proposalInfo group.Proposal
+		_, err = proposalIt.LoadNext(&proposalInfo)
+		if errors.ErrORMIteratorDone.Is(err) {
+			break
+		}
+		if err != nil {
+			return err
+		}
+		proposalInfo.Status = group.PROPOSAL_STATUS_ABORTED
+
+		if err := k.proposalTable.Update(ctx.KVStore(k.key), proposalInfo.Id, &proposalInfo); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // pruneVotes prunes all votes for a proposal from state.
 func (k Keeper) pruneVotes(ctx sdk.Context, proposalID uint64) error {
 	store := ctx.KVStore(k.key)
@@ -340,13 +366,24 @@ func (k Keeper) TallyProposalsAtVPEnd(ctx sdk.Context) error {
 			return true, sdkerrors.Wrap(err, "group")
 		}
 
-		err = k.doTallyAndUpdate(ctx, &proposal, electorate, policyInfo)
-		if err != nil {
-			return true, sdkerrors.Wrap(err, "doTallyAndUpdate")
-		}
-
-		if err := k.proposalTable.Update(ctx.KVStore(k.key), proposal.Id, &proposal); err != nil {
-			return true, sdkerrors.Wrap(err, "proposal update")
+		proposalId := proposal.Id
+		if proposal.Status == group.PROPOSAL_STATUS_ABORTED || proposal.Status == group.PROPOSAL_STATUS_WITHDRAWN {
+			if err := k.pruneProposal(ctx, proposalId); err != nil {
+				return true, err
+			}
+			if err := k.pruneVotes(ctx, proposalId); err != nil {
+				return true, err
+			}
+
+		} else {
+			err = k.doTallyAndUpdate(ctx, &proposal, electorate, policyInfo)
+			if err != nil {
+				return true, sdkerrors.Wrap(err, "doTallyAndUpdate")
+			}
+
+			if err := k.proposalTable.Update(ctx.KVStore(k.key), proposal.Id, &proposal); err != nil {
+				return true, sdkerrors.Wrap(err, "proposal update")
+			}
 		}
 
 		return false, nil

diff --git a/x/group/keeper/keeper_test.go b/x/group/keeper/keeper_test.go
@@ -2430,6 +2430,8 @@ func (s *TestSuite) TestExecPrunedProposalsAndVotes() {
 				s.Require().NoError(err)
 				return myProposalID
 			},
+			expErr:            true, // since proposal status will be `aborted` when group policy is modified
+			expErrMsg:         "not possible with proposal status",
 			expExecutorResult: group.PROPOSAL_EXECUTOR_RESULT_NOT_RUN,
 		},
 		"proposal exists when rollback all msg updates on failure": {
@@ -2470,6 +2472,7 @@ func (s *TestSuite) TestExecPrunedProposalsAndVotes() {
 			_, err := s.keeper.Exec(ctx, &group.MsgExec{Executor: addr1.String(), ProposalId: proposalID})
 			if spec.expErr {
 				s.Require().Error(err)
+				s.Require().Contains(err.Error(), spec.expErrMsg)
 				return
 			}
 			s.Require().NoError(err)

diff --git a/x/group/keeper/msg_server.go b/x/group/keeper/msg_server.go
@@ -894,6 +894,11 @@ func (k Keeper) doUpdateGroupPolicy(ctx sdk.Context, groupPolicy string, admin s
 		return sdkerrors.Wrap(err, "load group policy")
 	}
 
+	groupPolicyAddr, err := sdk.AccAddressFromBech32(groupPolicy)
+	if err != nil {
+		return sdkerrors.Wrap(err, "group policy address")
+	}
+
 	groupPolicyAdmin, err := sdk.AccAddressFromBech32(admin)
 	if err != nil {
 		return sdkerrors.Wrap(err, "group policy admin")
@@ -913,6 +918,9 @@ func (k Keeper) doUpdateGroupPolicy(ctx sdk.Context, groupPolicy string, admin s
 		return err
 	}
 
+	if err = k.updateProposalStatus(ctx, groupPolicyAddr); err != nil {
+		return err
+	}
 	return nil
 }