replace v1beta1 proposal in test since legacy server is disabled

bnb-chain · Feb 20, 2023 · f1a033d · f1a033d
1 parent 63c2075
commit f1a033d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/x/feegrant/client/testutil/suite.go b/x/feegrant/client/testutil/suite.go
@@ -820,7 +820,7 @@ func (s *IntegrationTestSuite) TestFilteredFeeAllowance() {
 	}
 	spendLimit := sdk.NewCoin("stake", sdk.NewInt(1000))
 
-	allowMsgs := strings.Join([]string{sdk.MsgTypeURL(&govv1beta1.MsgSubmitProposal{}), sdk.MsgTypeURL(&govv1.MsgVoteWeighted{})}, ",")
+	allowMsgs := strings.Join([]string{sdk.MsgTypeURL(&govv1.MsgSubmitProposal{}), sdk.MsgTypeURL(&govv1.MsgVoteWeighted{})}, ",")
 
 	testCases := []struct {
 		name         string

diff --git a/x/gov/client/cli/tx.go b/x/gov/client/cli/tx.go
@@ -5,6 +5,8 @@ import (
 	"strconv"
 	"strings"
 
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+
 	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -186,11 +188,15 @@ $ %s tx gov submit-legacy-proposal --title="Test Proposal" --description="My awe
 				return fmt.Errorf("failed to create proposal content: unknown proposal type %s", proposal.Type)
 			}
 
-			msg, err := v1beta1.NewMsgSubmitProposal(content, amount, clientCtx.GetFromAddress())
+			govAcctAddress := authtypes.NewModuleAddress(types.ModuleName).String()
+			contentMsg, err := v1.NewLegacyContent(content, govAcctAddress)
+			if err != nil {
+				return err
+			}
+			msg, err := v1.NewMsgSubmitProposal([]sdk.Msg{contentMsg}, amount, clientCtx.GetFromAddress().String(), "")
 			if err != nil {
 				return fmt.Errorf("invalid message: %w", err)
 			}
-
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}

diff --git a/x/params/keeper/sync_params.go b/x/params/keeper/sync_params.go
@@ -21,11 +21,11 @@ func (k Keeper) SyncParams(ctx sdk.Context, p *types.ParameterChangeProposal) er
 
 	for i, c := range p.Changes {
 		values = append(values, []byte(c.Value)...)
-		adr, err := sdk.AccAddressFromHexUnsafe(p.Addresses[i])
+		addr, err := sdk.AccAddressFromHexUnsafe(p.Addresses[i])
 		if err != nil {
 			return sdkerrors.Wrapf(types.ErrAddressNotValid, "smart contract address is not valid %s", p.Addresses[i])
 		}
-		addresses = append(addresses, adr.Bytes()...)
+		addresses = append(addresses, addr.Bytes()...)
 	}
 
 	pack := types.SyncParamsPackage{