simplify methods

x/gov/abci.go

@@ -66,15 +66,17 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) {
 			// Messages may mutate state thus we use a cached context. If one of
 			// the handlers fails, no state mutation is written and the error
 			// message is logged.
+			keeper.PopulateProposalStaticData(ctx, &proposal)
+			messages, err := proposal.GetMsgs()
+
 			cacheCtx, writeCache := ctx.CacheContext()
-			messages := keeper.GetProposalMessages(ctx, proposal.GetId())
-
-			var err error
-			for idx, msg = range messages {
-				handler := keeper.Router().Handler(msg)
-				_, err = handler(cacheCtx, msg)
-				if err != nil {
-					break
+			if err == nil {
+				for idx, msg = range messages {
+					handler := keeper.Router().Handler(msg)
+					_, err = handler(cacheCtx, msg)
+					if err != nil {
+						break
+					}
 				}
 			}
 

x/gov/abci_test.go

@@ -263,7 +263,7 @@ func TestTickPassedVotingPeriod(t *testing.T) {
 	require.True(t, activeQueue.Valid())
 
 	activeProposalID := types.GetProposalIDFromBytes(activeQueue.Value())
-	proposal, ok := suite.GovKeeper.GetProposal(ctx, activeProposalID)
+	proposal, ok := suite.GovKeeper.GetProposal(ctx, activeProposalID, false)
 	require.True(t, ok)
 	require.Equal(t, v1.StatusVotingPeriod, proposal.Status)
 

x/gov/keeper/deposit.go

@@ -108,7 +108,7 @@ func (keeper Keeper) IterateDeposits(ctx sdk.Context, proposalID uint64, cb func
 // Activates voting period when appropriate and returns true in that case, else returns false.
 func (keeper Keeper) AddDeposit(ctx sdk.Context, proposalID uint64, depositorAddr sdk.AccAddress, depositAmount sdk.Coins) (bool, error) {
 	// Checks to see if proposal exists
-	proposal, ok := keeper.GetProposal(ctx, proposalID)
+	proposal, ok := keeper.GetProposal(ctx, proposalID, false)
 	if !ok {
 		return false, sdkerrors.Wrapf(types.ErrUnknownProposal, "%d", proposalID)
 	}

x/gov/keeper/grpc_query.go

@@ -9,7 +9,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"
-	sdktx "github.com/cosmos/cosmos-sdk/types/tx"
 	v3 "github.com/cosmos/cosmos-sdk/x/gov/migrations/v3"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 	v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
@@ -30,18 +29,11 @@ func (q Keeper) Proposal(c context.Context, req *v1.QueryProposalRequest) (*v1.Q
 
 	ctx := sdk.UnwrapSDKContext(c)
 
-	proposal, found := q.GetProposal(ctx, req.ProposalId)
+	proposal, found := q.GetProposal(ctx, req.ProposalId, true)
 	if !found {
 		return nil, status.Errorf(codes.NotFound, "proposal %d doesn't exist", req.ProposalId)
 	}
 
-	msgs := q.GetProposalMessages(ctx, req.ProposalId)
-	var err error
-	proposal.Messages, err = sdktx.SetMsgs(msgs)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get proposal messages: %v", err)
-	}
-
 	return &v1.QueryProposalResponse{Proposal: &proposal}, nil
 }
 
@@ -96,12 +88,7 @@ func (q Keeper) Proposals(c context.Context, req *v1.QueryProposalsRequest) (*v1
 	}
 
 	for i := range filteredProposals {
-		msgs := q.GetProposalMessages(ctx, filteredProposals[i].Id)
-		var err error
-		filteredProposals[i].Messages, err = sdktx.SetMsgs(msgs)
-		if err != nil {
-			return nil, status.Errorf(codes.Internal, "failed to get proposal messages: %v", err)
-		}
+		q.PopulateProposalStaticData(ctx, filteredProposals[i])
 	}
 
 	return &v1.QueryProposalsResponse{Proposals: filteredProposals, Pagination: pageRes}, nil
@@ -276,7 +263,7 @@ func (q Keeper) TallyResult(c context.Context, req *v1.QueryTallyResultRequest)
 
 	ctx := sdk.UnwrapSDKContext(c)
 
-	proposal, ok := q.GetProposal(ctx, req.ProposalId)
+	proposal, ok := q.GetProposal(ctx, req.ProposalId, false)
 	if !ok {
 		return nil, status.Errorf(codes.NotFound, "proposal %d doesn't exist", req.ProposalId)
 	}

x/gov/keeper/keeper.go

@@ -179,7 +179,7 @@ func (keeper Keeper) IterateActiveProposalsQueue(ctx sdk.Context, endTime time.T
 	defer iterator.Close()
 	for ; iterator.Valid(); iterator.Next() {
 		proposalID, _ := types.SplitActiveProposalQueueKey(iterator.Key())
-		proposal, found := keeper.GetProposal(ctx, proposalID)
+		proposal, found := keeper.GetProposal(ctx, proposalID, false)
 		if !found {
 			panic(fmt.Sprintf("proposal %d does not exist", proposalID))
 		}
@@ -198,7 +198,7 @@ func (keeper Keeper) IterateInactiveProposalsQueue(ctx sdk.Context, endTime time
 	defer iterator.Close()
 	for ; iterator.Valid(); iterator.Next() {
 		proposalID, _ := types.SplitInactiveProposalQueueKey(iterator.Key())
-		proposal, found := keeper.GetProposal(ctx, proposalID)
+		proposal, found := keeper.GetProposal(ctx, proposalID, false)
 		if !found {
 			panic(fmt.Sprintf("proposal %d does not exist", proposalID))
 		}

x/gov/keeper/proposal.go

@@ -8,7 +8,6 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	sdktx "github.com/cosmos/cosmos-sdk/types/tx"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 	v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 )
@@ -98,8 +97,9 @@ func (keeper Keeper) SubmitProposal(ctx sdk.Context, messages []sdk.Msg, metadat
 }
 
 // GetProposal gets a proposal from store by ProposalID.
+// If withStaticData is true, it will get the proposal's messages from the separate store.
 // Panics if can't unmarshal the proposal.
-func (keeper Keeper) GetProposal(ctx sdk.Context, proposalID uint64) (v1.Proposal, bool) {
+func (keeper Keeper) GetProposal(ctx sdk.Context, proposalID uint64, withStaticData bool) (v1.Proposal, bool) {
 	store := ctx.KVStore(keeper.storeKey)
 
 	bz := store.Get(types.ProposalKey(proposalID))
@@ -112,6 +112,10 @@ func (keeper Keeper) GetProposal(ctx sdk.Context, proposalID uint64) (v1.Proposa
 		panic(err)
 	}
 
+	if withStaticData {
+		keeper.PopulateProposalStaticData(ctx, &proposal)
+	}
+
 	return proposal, true
 }
 
@@ -142,7 +146,14 @@ func (keeper Keeper) setProposalMessages(ctx sdk.Context, proposalID uint64, mes
 	store.Set(types.ProposalMessagesKey(proposalID), bz)
 }
 
-func (keeper Keeper) GetProposalMessages(ctx sdk.Context, proposalID uint64) []sdk.Msg {
+// PopulateProposalStaticData populates the proposal's static data from the separate stores.
+func (keeper Keeper) PopulateProposalStaticData(ctx sdk.Context, proposal *v1.Proposal) {
+	proposal.Messages = keeper.getProposalMessages(ctx, proposal.Id)
+}
+
+// getProposalMessages gets the proposal's messages from the separate store.
+// TODO: define if we would like this to be exported.
+func (keeper Keeper) getProposalMessages(ctx sdk.Context, proposalID uint64) []*cdctypes.Any {
 	store := ctx.KVStore(keeper.storeKey)
 
 	bz := store.Get(types.ProposalMessagesKey(proposalID))
@@ -156,24 +167,14 @@ func (keeper Keeper) GetProposalMessages(ctx sdk.Context, proposalID uint64) []s
 		panic(err)
 	}
 
-	err = sdktx.UnpackInterfaces(keeper.cdc, propMsgs.Messages)
-	if err != nil {
-		panic(err)
-	}
-
-	msgs, err := sdktx.GetMsgs(propMsgs.Messages, "sdk.MsgProposal")
-	if err != nil {
-		panic(err)
-	}
-
-	return msgs
+	return propMsgs.Messages
 }
 
 // DeleteProposal deletes a proposal from store.
 // Panics if the proposal doesn't exist.
 func (keeper Keeper) DeleteProposal(ctx sdk.Context, proposalID uint64) {
 	store := ctx.KVStore(keeper.storeKey)
-	proposal, ok := keeper.GetProposal(ctx, proposalID)
+	proposal, ok := keeper.GetProposal(ctx, proposalID, false)
 	if !ok {
 		panic(fmt.Sprintf("couldn't find proposal with id#%d", proposalID))
 	}

x/gov/keeper/proposal_test.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdktx "github.com/cosmos/cosmos-sdk/types/tx"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 	v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	"github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
@@ -24,13 +23,7 @@ func (suite *KeeperTestSuite) TestGetSetProposal() {
 	proposalID := proposal.Id
 	suite.govKeeper.SetProposal(suite.ctx, proposal)
 
-	gotProposal, ok := suite.govKeeper.GetProposal(suite.ctx, proposalID)
-
-	msgs := suite.govKeeper.GetProposalMessages(suite.ctx, proposalID)
-	suite.Require().Equal(len(tp), len(msgs))
-	gotProposal.Messages, err = sdktx.SetMsgs(msgs)
-	suite.Require().NoError(err)
-
+	gotProposal, ok := suite.govKeeper.GetProposal(suite.ctx, proposalID, true)
 	suite.Require().True(ok)
 	suite.Require().Equal(proposal, gotProposal)
 }

x/gov/keeper/vote.go

@@ -11,7 +11,7 @@ import (
 
 // AddVote adds a vote on a specific proposal
 func (keeper Keeper) AddVote(ctx sdk.Context, proposalID uint64, voterAddr sdk.AccAddress, options v1.WeightedVoteOptions, metadata string) error {
-	proposal, ok := keeper.GetProposal(ctx, proposalID)
+	proposal, ok := keeper.GetProposal(ctx, proposalID, false)
 	if !ok {
 		return sdkerrors.Wrapf(types.ErrUnknownProposal, "%d", proposalID)
 	}

x/gov/simulation/operations.go

@@ -452,7 +452,7 @@ func randomProposalID(r *rand.Rand, k *keeper.Keeper, ctx sdk.Context, status v1
 		initialProposalID = proposalID
 	}
 
-	proposal, ok := k.GetProposal(ctx, proposalID)
+	proposal, ok := k.GetProposal(ctx, proposalID, false)
 	if !ok || proposal.Status != status {
 		return proposalID, false
 	}