fix(x/gov): proposal v1 to v1beta1 converter (#35)

Author: julienrbrt

CHANGELOG.md

@@ -55,6 +55,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [#22](https://github.com/atomone-hub/cosmos-sdk/pull/22) Remove non forked go modules from repository.
 * [#25](https://github.com/atomone-hub/cosmos-sdk/pull/25) feat: remove `client/v2` workspace.
 
+### Bug Fixes
+
+* (x/gov) [#35](https://github.com/atomone-hub/cosmos-sdk/pull/35) Cherry-pick [proposal v1 to v1beta1 converter fix from AtomOne](https://github.com/atomone-hub/atomone/pull/102)
+
 ## [Unreleased]
 
 ### Improvements

x/gov/keeper/grpc_query_test.go

@@ -133,7 +133,7 @@ func (suite *KeeperTestSuite) TestLegacyGRPCQueryProposal() {
 			false,
 		},
 		{
-			"valid request",
+			"valid request with proposal containing no msg",
 			func() {
 				req = &v1beta1.QueryProposalRequest{ProposalId: 1}
 				testProposal := v1beta1.NewTextProposal("Proposal", "testing proposal")
@@ -149,13 +149,11 @@ func (suite *KeeperTestSuite) TestLegacyGRPCQueryProposal() {
 			true,
 		},
 		{
-			"valid request - expedited",
+			"valid request with proposal containing no msg",
 			func() {
 				req = &v1beta1.QueryProposalRequest{ProposalId: 2}
-				testProposal := v1beta1.NewTextProposal("Proposal", "testing proposal")
-				msgContent, err := v1.NewLegacyContent(testProposal, govAcct.String())
-				suite.Require().NoError(err)
-				submittedProposal, err := suite.govKeeper.SubmitProposal(ctx, []sdk.Msg{msgContent}, "", "title", "summary", addrs[0])
+
+				submittedProposal, err := suite.govKeeper.SubmitProposal(ctx, nil, "metadata", "test", "summary", sdk.AccAddress("cosmos1ghekyjucln7y67ntx7cf27m9dpuxxemn4c8g4r"))
 				suite.Require().NoError(err)
 				suite.Require().NotEmpty(submittedProposal)
 

x/gov/migrations/v3/convert.go

@@ -3,6 +3,8 @@ package v3
 import (
 	"fmt"
 
+	"github.com/cosmos/gogoproto/proto"
+
 	"cosmossdk.io/math"
 
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -49,8 +51,18 @@ func ConvertToLegacyProposal(proposal v1.Proposal) (v1beta1.Proposal, error) {
 	if err != nil {
 		return v1beta1.Proposal{}, err
 	}
-	if len(msgs) != 1 {
-		return v1beta1.Proposal{}, sdkerrors.ErrInvalidType.Wrap("can't convert a gov/v1 Proposal to gov/v1beta1 Proposal when amount of proposal messages not exactly one")
+	if len(msgs) == 0 {
+		// If there is no messages, consider proposal as a text proposal
+		content := v1beta1.NewTextProposal(proposal.Title, proposal.Summary)
+		msg, ok := content.(proto.Message)
+		if !ok {
+			return v1beta1.Proposal{}, sdkerrors.ErrInvalidType.Wrap("can't convert a gov/v1 Proposal to gov/v1beta1 Proposal: content is not a proto message")
+		}
+		legacyProposal.Content, err = codectypes.NewAnyWithValue(msg)
+		return legacyProposal, err
+	}
+	if len(msgs) > 1 {
+		return v1beta1.Proposal{}, sdkerrors.ErrInvalidType.Wrap("can't convert a gov/v1 Proposal to gov/v1beta1 Proposal when amount of proposal messages exceeds one")
 	}
 	if legacyMsg, ok := msgs[0].(*v1.MsgExecLegacyContent); ok {
 		// check that the content struct can be unmarshalled

x/gov/migrations/v3/convert_test.go

@@ -99,10 +99,10 @@ func TestConvertToLegacyProposalContent(t *testing.T) {
 	_, err = v3.ConvertToLegacyProposal(proposal)
 	require.ErrorIs(t, sdkerrors.ErrInvalidType, err)
 
-	// zero messages is not supported
+	// zero messages is supported
 	proposal.Messages = nil
 	_, err = v3.ConvertToLegacyProposal(proposal)
-	require.ErrorIs(t, sdkerrors.ErrInvalidType, err)
+	require.NoError(t, err)
 }
 
 func TestConvertToLegacyTallyResult(t *testing.T) {