From bdee3337d350c20eb258d799367e5fe12643c619 Mon Sep 17 00:00:00 2001 From: atheeshp <59333759+atheeshp@users.noreply.github.com> Date: Tue, 4 Jan 2022 21:40:02 +0530 Subject: [PATCH] refactor: move gov types to v1beta2 (#10852) ## Description Closes: #10793 --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) --- CHANGELOG.md | 1 + proto/cosmos/gov/v1beta2/genesis.proto | 2 +- proto/cosmos/gov/v1beta2/gov.proto | 2 +- proto/cosmos/gov/v1beta2/query.proto | 2 +- proto/cosmos/gov/v1beta2/tx.proto | 2 +- x/authz/simulation/genesis.go | 4 +- x/gov/client/testutil/cli_test.go | 8 +- x/gov/keeper/params.go | 14 +-- x/gov/keeper/querier.go | 33 ++--- x/gov/keeper/querier_test.go | 5 +- x/gov/simulation/genesis.go | 12 +- x/gov/simulation/genesis_test.go | 12 +- x/gov/types/{ => v1beta2}/codec.go | 2 +- x/gov/types/v1beta2/content.go | 27 ++++ x/gov/types/{ => v1beta2}/deposit.go | 2 +- x/gov/types/{ => v1beta2}/genesis.go | 2 +- x/gov/types/{ => v1beta2}/genesis.pb.go | 48 +++---- x/gov/types/{ => v1beta2}/genesis_test.go | 7 +- x/gov/types/{ => v1beta2}/gov.pb.go | 132 ++++++++++---------- x/gov/types/{ => v1beta2}/msgs.go | 17 +-- x/gov/types/{ => v1beta2}/msgs_test.go | 69 +++++----- x/gov/types/{ => v1beta2}/params.go | 2 +- x/gov/types/{ => v1beta2}/proposal.go | 2 +- x/gov/types/{ => v1beta2}/proposals_test.go | 8 +- x/gov/types/{ => v1beta2}/querier.go | 2 +- x/gov/types/{ => v1beta2}/query.pb.go | 120 +++++++++--------- x/gov/types/{ => v1beta2}/query.pb.gw.go | 32 +---- x/gov/types/{ => v1beta2}/tally.go | 2 +- x/gov/types/{ => v1beta2}/tx.pb.go | 78 ++++++------ x/gov/types/{ => v1beta2}/vote.go | 2 +- 30 files changed, 329 insertions(+), 322 deletions(-) rename x/gov/types/{ => v1beta2}/codec.go (99%) create mode 100644 x/gov/types/v1beta2/content.go rename x/gov/types/{ => v1beta2}/deposit.go (98%) rename x/gov/types/{ => v1beta2}/genesis.go (99%) rename x/gov/types/{ => v1beta2}/genesis.pb.go (88%) rename x/gov/types/{ => v1beta2}/genesis_test.go (53%) rename x/gov/types/{ => v1beta2}/gov.pb.go (91%) rename x/gov/types/{ => v1beta2}/msgs.go (92%) rename x/gov/types/{ => v1beta2}/msgs_test.go (53%) rename x/gov/types/{ => v1beta2}/params.go (99%) rename x/gov/types/{ => v1beta2}/proposal.go (99%) rename x/gov/types/{ => v1beta2}/proposals_test.go (67%) rename x/gov/types/{ => v1beta2}/querier.go (99%) rename x/gov/types/{ => v1beta2}/query.pb.go (94%) rename x/gov/types/{ => v1beta2}/query.pb.gw.go (94%) rename x/gov/types/{ => v1beta2}/tally.go (99%) rename x/gov/types/{ => v1beta2}/tx.pb.go (93%) rename x/gov/types/{ => v1beta2}/vote.go (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad94668c93..cddab6efc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -114,6 +114,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [\#10692](https://github.com/cosmos/cosmos-sdk/pull/10612) `SignerData` takes 2 new fields, `Address` and `PubKey`, which need to get populated when using SIGN_MODE_DIRECT_AUX. * [\#10748](https://github.com/cosmos/cosmos-sdk/pull/10748) Move legacy `x/gov` api to `v1beta1` directory. * [\#10816](https://github.com/cosmos/cosmos-sdk/pull/10816) Reuse blocked addresses from the bank module. No need to pass them to distribution. +* [\#10852](https://github.com/cosmos/cosmos-sdk/pull/10852) Move `x/gov/types` to `x/gov/types/v1beta2`. ### Client Breaking Changes diff --git a/proto/cosmos/gov/v1beta2/genesis.proto b/proto/cosmos/gov/v1beta2/genesis.proto index 082def6ab2..edb68877f4 100644 --- a/proto/cosmos/gov/v1beta2/genesis.proto +++ b/proto/cosmos/gov/v1beta2/genesis.proto @@ -4,7 +4,7 @@ package cosmos.gov.v1beta2; import "cosmos/gov/v1beta2/gov.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2"; // GenesisState defines the gov module's genesis state. message GenesisState { diff --git a/proto/cosmos/gov/v1beta2/gov.proto b/proto/cosmos/gov/v1beta2/gov.proto index 81fc4ebee0..92bcbb2c6d 100644 --- a/proto/cosmos/gov/v1beta2/gov.proto +++ b/proto/cosmos/gov/v1beta2/gov.proto @@ -8,7 +8,7 @@ import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2"; // VoteOption enumerates the valid vote options for a given governance proposal. enum VoteOption { diff --git a/proto/cosmos/gov/v1beta2/query.proto b/proto/cosmos/gov/v1beta2/query.proto index 14e97dfb93..944a21566f 100644 --- a/proto/cosmos/gov/v1beta2/query.proto +++ b/proto/cosmos/gov/v1beta2/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/gov/v1beta2/gov.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2"; // Query defines the gRPC querier service for gov module service Query { diff --git a/proto/cosmos/gov/v1beta2/tx.proto b/proto/cosmos/gov/v1beta2/tx.proto index cb60a3e9c3..f1869d7150 100644 --- a/proto/cosmos/gov/v1beta2/tx.proto +++ b/proto/cosmos/gov/v1beta2/tx.proto @@ -7,7 +7,7 @@ import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/any.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2"; // Msg defines the gov Msg service. service Msg { diff --git a/x/authz/simulation/genesis.go b/x/authz/simulation/genesis.go index b95207be97..2955bf2597 100644 --- a/x/authz/simulation/genesis.go +++ b/x/authz/simulation/genesis.go @@ -9,7 +9,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/authz" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" ) // genGrant returns a slice of authorization grants. @@ -31,7 +31,7 @@ func genGrant(r *rand.Rand, accounts []simtypes.Account) []authz.GrantAuthorizat func generateRandomGrant(r *rand.Rand) *codectypes.Any { authorizations := make([]*codectypes.Any, 2) authorizations[0] = newAnyAuthorization(banktypes.NewSendAuthorization(sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(1000))))) - authorizations[1] = newAnyAuthorization(authz.NewGenericAuthorization(sdk.MsgTypeURL(&govtypes.MsgSubmitProposal{}))) + authorizations[1] = newAnyAuthorization(authz.NewGenericAuthorization(sdk.MsgTypeURL(&v1beta2.MsgSubmitProposal{}))) return authorizations[r.Intn(len(authorizations))] } diff --git a/x/gov/client/testutil/cli_test.go b/x/gov/client/testutil/cli_test.go index 907879f502..94a102d108 100644 --- a/x/gov/client/testutil/cli_test.go +++ b/x/gov/client/testutil/cli_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" @@ -17,9 +17,9 @@ func TestIntegrationTestSuite(t *testing.T) { cfg.NumValidators = 1 suite.Run(t, NewIntegrationTestSuite(cfg)) - dp := types.NewDepositParams(sdk.NewCoins(sdk.NewCoin(cfg.BondDenom, types.DefaultMinDepositTokens)), time.Duration(15)*time.Second) - vp := types.NewVotingParams(time.Duration(5) * time.Second) - genesisState := types.DefaultGenesisState() + dp := v1beta2.NewDepositParams(sdk.NewCoins(sdk.NewCoin(cfg.BondDenom, v1beta2.DefaultMinDepositTokens)), time.Duration(15)*time.Second) + vp := v1beta2.NewVotingParams(time.Duration(5) * time.Second) + genesisState := v1beta2.DefaultGenesisState() genesisState.DepositParams = &dp genesisState.VotingParams = &vp bz, err := cfg.Codec.MarshalJSON(genesisState) diff --git a/x/gov/keeper/params.go b/x/gov/keeper/params.go index 4ff77cf392..19200b8d80 100644 --- a/x/gov/keeper/params.go +++ b/x/gov/keeper/params.go @@ -2,42 +2,42 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" ) // GetDepositParams returns the current DepositParams from the global param store func (keeper Keeper) GetDepositParams(ctx sdk.Context) v1beta1.DepositParams { var depositParams v1beta1.DepositParams - keeper.paramSpace.Get(ctx, types.ParamStoreKeyDepositParams, &depositParams) + keeper.paramSpace.Get(ctx, v1beta2.ParamStoreKeyDepositParams, &depositParams) return depositParams } // GetVotingParams returns the current VotingParams from the global param store func (keeper Keeper) GetVotingParams(ctx sdk.Context) v1beta1.VotingParams { var votingParams v1beta1.VotingParams - keeper.paramSpace.Get(ctx, types.ParamStoreKeyVotingParams, &votingParams) + keeper.paramSpace.Get(ctx, v1beta2.ParamStoreKeyVotingParams, &votingParams) return votingParams } // GetTallyParams returns the current TallyParam from the global param store func (keeper Keeper) GetTallyParams(ctx sdk.Context) v1beta1.TallyParams { var tallyParams v1beta1.TallyParams - keeper.paramSpace.Get(ctx, types.ParamStoreKeyTallyParams, &tallyParams) + keeper.paramSpace.Get(ctx, v1beta2.ParamStoreKeyTallyParams, &tallyParams) return tallyParams } // SetDepositParams sets DepositParams to the global param store func (keeper Keeper) SetDepositParams(ctx sdk.Context, depositParams v1beta1.DepositParams) { - keeper.paramSpace.Set(ctx, types.ParamStoreKeyDepositParams, &depositParams) + keeper.paramSpace.Set(ctx, v1beta2.ParamStoreKeyDepositParams, &depositParams) } // SetVotingParams sets VotingParams to the global param store func (keeper Keeper) SetVotingParams(ctx sdk.Context, votingParams v1beta1.VotingParams) { - keeper.paramSpace.Set(ctx, types.ParamStoreKeyVotingParams, &votingParams) + keeper.paramSpace.Set(ctx, v1beta2.ParamStoreKeyVotingParams, &votingParams) } // SetTallyParams sets TallyParams to the global param store func (keeper Keeper) SetTallyParams(ctx sdk.Context, tallyParams v1beta1.TallyParams) { - keeper.paramSpace.Set(ctx, types.ParamStoreKeyTallyParams, &tallyParams) + keeper.paramSpace.Set(ctx, v1beta2.ParamStoreKeyTallyParams, &tallyParams) } diff --git a/x/gov/keeper/querier.go b/x/gov/keeper/querier.go index ff37b11842..0e9cd59c3d 100644 --- a/x/gov/keeper/querier.go +++ b/x/gov/keeper/querier.go @@ -9,34 +9,35 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" ) // NewQuerier creates a new gov Querier instance func NewQuerier(keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { return func(ctx sdk.Context, path []string, req abci.RequestQuery) ([]byte, error) { switch path[0] { - case types.QueryParams: + case v1beta2.QueryParams: return queryParams(ctx, path[1:], req, keeper, legacyQuerierCdc) - case types.QueryProposals: + case v1beta2.QueryProposals: return queryProposals(ctx, path[1:], req, keeper, legacyQuerierCdc) - case types.QueryProposal: + case v1beta2.QueryProposal: return queryProposal(ctx, path[1:], req, keeper, legacyQuerierCdc) - case types.QueryDeposits: + case v1beta2.QueryDeposits: return queryDeposits(ctx, path[1:], req, keeper, legacyQuerierCdc) - case types.QueryDeposit: + case v1beta2.QueryDeposit: return queryDeposit(ctx, path[1:], req, keeper, legacyQuerierCdc) - case types.QueryVotes: + case v1beta2.QueryVotes: return queryVotes(ctx, path[1:], req, keeper, legacyQuerierCdc) - case types.QueryVote: + case v1beta2.QueryVote: return queryVote(ctx, path[1:], req, keeper, legacyQuerierCdc) - case types.QueryTally: + case v1beta2.QueryTally: return queryTally(ctx, path[1:], req, keeper, legacyQuerierCdc) default: @@ -47,21 +48,21 @@ func NewQuerier(keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier func queryParams(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { switch path[0] { - case types.ParamDeposit: + case v1beta2.ParamDeposit: bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, keeper.GetDepositParams(ctx)) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) } return bz, nil - case types.ParamVoting: + case v1beta2.ParamVoting: bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, keeper.GetVotingParams(ctx)) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) } return bz, nil - case types.ParamTallying: + case v1beta2.ParamTallying: bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, keeper.GetTallyParams(ctx)) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) @@ -75,7 +76,7 @@ func queryParams(ctx sdk.Context, path []string, req abci.RequestQuery, keeper K // nolint: unparam func queryProposal(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryProposalParams + var params v1beta2.QueryProposalParams err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) @@ -96,7 +97,7 @@ func queryProposal(ctx sdk.Context, path []string, req abci.RequestQuery, keeper // nolint: unparam func queryDeposit(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryDepositParams + var params v1beta2.QueryDepositParams err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) @@ -113,7 +114,7 @@ func queryDeposit(ctx sdk.Context, path []string, req abci.RequestQuery, keeper // nolint: unparam func queryVote(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryVoteParams + var params v1beta2.QueryVoteParams err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) @@ -130,7 +131,7 @@ func queryVote(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Kee // nolint: unparam func queryDeposits(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryProposalParams + var params v1beta2.QueryProposalParams err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) @@ -151,7 +152,7 @@ func queryDeposits(ctx sdk.Context, path []string, req abci.RequestQuery, keeper // nolint: unparam func queryTally(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryProposalParams + var params v1beta2.QueryProposalParams err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) diff --git a/x/gov/keeper/querier_test.go b/x/gov/keeper/querier_test.go index 6b8cab612d..a06e4189f4 100644 --- a/x/gov/keeper/querier_test.go +++ b/x/gov/keeper/querier_test.go @@ -16,6 +16,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/keeper" "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" ) const custom = "custom" @@ -202,7 +203,7 @@ func TestQueries(t *testing.T) { proposal2.TotalDeposit = proposal2.TotalDeposit.Add(deposit4.Amount...) proposal2.Status = v1beta1.StatusVotingPeriod - proposal2.VotingEndTime = proposal2.VotingEndTime.Add(types.DefaultPeriod) + proposal2.VotingEndTime = proposal2.VotingEndTime.Add(v1beta2.DefaultPeriod) deposit5 := v1beta1.NewDeposit(proposal3.ProposalId, TestAddrs[1], depositParams.MinDeposit) depositer5, err := sdk.AccAddressFromBech32(deposit5.Depositor) @@ -212,7 +213,7 @@ func TestQueries(t *testing.T) { proposal3.TotalDeposit = proposal3.TotalDeposit.Add(deposit5.Amount...) proposal3.Status = v1beta1.StatusVotingPeriod - proposal3.VotingEndTime = proposal3.VotingEndTime.Add(types.DefaultPeriod) + proposal3.VotingEndTime = proposal3.VotingEndTime.Add(v1beta2.DefaultPeriod) // total deposit of TestAddrs[1] on proposal #3 is worth the proposal deposit + individual deposit deposit5.Amount = deposit5.Amount.Add(deposit3.Amount...) diff --git a/x/gov/simulation/genesis.go b/x/gov/simulation/genesis.go index 3f9ed2d086..1d696f0f6f 100644 --- a/x/gov/simulation/genesis.go +++ b/x/gov/simulation/genesis.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" ) // Simulation parameter constants @@ -94,11 +94,11 @@ func RandomizedGenState(simState *module.SimulationState) { func(r *rand.Rand) { veto = GenTallyParamsVeto(r) }, ) - govGenesis := types.NewGenesisState( + govGenesis := v1beta2.NewGenesisState( startingProposalID, - types.NewDepositParams(minDeposit, depositPeriod), - types.NewVotingParams(votingPeriod), - types.NewTallyParams(quorum, threshold, veto), + v1beta2.NewDepositParams(minDeposit, depositPeriod), + v1beta2.NewVotingParams(votingPeriod), + v1beta2.NewTallyParams(quorum, threshold, veto), ) bz, err := json.MarshalIndent(&govGenesis, "", " ") @@ -106,5 +106,5 @@ func RandomizedGenState(simState *module.SimulationState) { panic(err) } fmt.Printf("Selected randomly generated governance parameters:\n%s\n", bz) - simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(govGenesis) + simState.GenState[v1beta2.ModuleName] = simState.Cdc.MustMarshalJSON(govGenesis) } diff --git a/x/gov/simulation/genesis_test.go b/x/gov/simulation/genesis_test.go index a7e7e4bd41..2042d342aa 100644 --- a/x/gov/simulation/genesis_test.go +++ b/x/gov/simulation/genesis_test.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/gov/simulation" - "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. @@ -37,8 +37,8 @@ func TestRandomizedGenState(t *testing.T) { simulation.RandomizedGenState(&simState) - var govGenesis types.GenesisState - simState.Cdc.MustUnmarshalJSON(simState.GenState[types.ModuleName], &govGenesis) + var govGenesis v1beta2.GenesisState + simState.Cdc.MustUnmarshalJSON(simState.GenState[v1beta2.ModuleName], &govGenesis) dec1, _ := sdk.NewDecFromStr("0.361000000000000000") dec2, _ := sdk.NewDecFromStr("0.512000000000000000") @@ -51,9 +51,9 @@ func TestRandomizedGenState(t *testing.T) { require.Equal(t, dec2.String(), govGenesis.TallyParams.Threshold) require.Equal(t, dec3.String(), govGenesis.TallyParams.VetoThreshold) require.Equal(t, uint64(0x28), govGenesis.StartingProposalId) - require.Equal(t, []*types.Deposit{}, govGenesis.Deposits) - require.Equal(t, []*types.Vote{}, govGenesis.Votes) - require.Equal(t, []*types.Proposal{}, govGenesis.Proposals) + require.Equal(t, []*v1beta2.Deposit{}, govGenesis.Deposits) + require.Equal(t, []*v1beta2.Vote{}, govGenesis.Votes) + require.Equal(t, []*v1beta2.Proposal{}, govGenesis.Proposals) } // TestRandomizedGenState tests abnormal scenarios of applying RandomizedGenState. diff --git a/x/gov/types/codec.go b/x/gov/types/v1beta2/codec.go similarity index 99% rename from x/gov/types/codec.go rename to x/gov/types/v1beta2/codec.go index 62da2c5b22..94915af369 100644 --- a/x/gov/types/codec.go +++ b/x/gov/types/v1beta2/codec.go @@ -1,4 +1,4 @@ -package types +package v1beta2 import ( "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/gov/types/v1beta2/content.go b/x/gov/types/v1beta2/content.go new file mode 100644 index 0000000000..db0ff42ccc --- /dev/null +++ b/x/gov/types/v1beta2/content.go @@ -0,0 +1,27 @@ +package v1beta2 + +import sdk "github.com/cosmos/cosmos-sdk/types" + +// Copied over from /x/gov/types/keys.go to avoid circular imports +const ( + ModuleName = "gov" + + RouterKey = ModuleName +) + +// Content defines an interface that a proposal must implement. It contains +// information such as the title and description along with the type and routing +// information for the appropriate handler to process the proposal. Content can +// have additional fields, which will handled by a proposal's Handler. +type Content interface { + GetTitle() string + GetDescription() string + ProposalRoute() string + ProposalType() string + ValidateBasic() error + String() string +} + +// Handler defines a function that handles a proposal after it has passed the +// governance process. +type Handler func(ctx sdk.Context, content Content) error diff --git a/x/gov/types/deposit.go b/x/gov/types/v1beta2/deposit.go similarity index 98% rename from x/gov/types/deposit.go rename to x/gov/types/v1beta2/deposit.go index 5f106859f1..8a5d82ceab 100644 --- a/x/gov/types/deposit.go +++ b/x/gov/types/v1beta2/deposit.go @@ -1,4 +1,4 @@ -package types +package v1beta2 import ( "fmt" diff --git a/x/gov/types/genesis.go b/x/gov/types/v1beta2/genesis.go similarity index 99% rename from x/gov/types/genesis.go rename to x/gov/types/v1beta2/genesis.go index 276a06c442..693082b3f5 100644 --- a/x/gov/types/genesis.go +++ b/x/gov/types/v1beta2/genesis.go @@ -1,4 +1,4 @@ -package types +package v1beta2 import ( "errors" diff --git a/x/gov/types/genesis.pb.go b/x/gov/types/v1beta2/genesis.pb.go similarity index 88% rename from x/gov/types/genesis.pb.go rename to x/gov/types/v1beta2/genesis.pb.go index 8f6fece87a..36df754005 100644 --- a/x/gov/types/genesis.pb.go +++ b/x/gov/types/v1beta2/genesis.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: cosmos/gov/v1beta2/genesis.proto -package types +package v1beta2 import ( fmt "fmt" @@ -129,29 +129,29 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta2/genesis.proto", fileDescriptor_7915ab39bb5aa171) } var fileDescriptor_7915ab39bb5aa171 = []byte{ - // 341 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xbd, 0x4e, 0xc3, 0x30, - 0x14, 0x85, 0x1b, 0xfa, 0x03, 0xb8, 0x2d, 0x83, 0xc5, 0x10, 0x41, 0x15, 0x02, 0x53, 0x16, 0x1c, - 0x28, 0x03, 0x12, 0x63, 0x05, 0x02, 0xb6, 0x2a, 0x20, 0x06, 0x96, 0xca, 0x6d, 0xac, 0x10, 0xd1, - 0xf6, 0x46, 0xf1, 0xc5, 0xa2, 0x6f, 0xc1, 0xf3, 0xf0, 0x04, 0x8c, 0x1d, 0x19, 0x51, 0xf3, 0x22, - 0xa8, 0x76, 0x42, 0x2b, 0x11, 0x98, 0xa2, 0x2b, 0x7f, 0xe7, 0xcb, 0x91, 0x7d, 0x89, 0x3b, 0x02, - 0x39, 0x01, 0xe9, 0x47, 0xa0, 0x7c, 0x75, 0x3a, 0x14, 0xc8, 0xbb, 0x7e, 0x24, 0xa6, 0x42, 0xc6, - 0x92, 0x25, 0x29, 0x20, 0x50, 0x6a, 0x08, 0x16, 0x81, 0x62, 0x39, 0xb1, 0xd7, 0x29, 0x4b, 0x81, - 0x32, 0x89, 0xa3, 0xf7, 0x2a, 0x69, 0x5d, 0x1b, 0xc7, 0x1d, 0x72, 0x14, 0xf4, 0x84, 0xec, 0x4a, - 0xe4, 0x29, 0xc6, 0xd3, 0x68, 0x90, 0xa4, 0x90, 0x80, 0xe4, 0xe3, 0x41, 0x1c, 0xda, 0x96, 0x6b, - 0x79, 0xb5, 0x80, 0x16, 0x67, 0xfd, 0xfc, 0xe8, 0x36, 0xa4, 0xe7, 0x64, 0x2b, 0x14, 0x09, 0xc8, - 0x18, 0xa5, 0xbd, 0xe1, 0x56, 0xbd, 0x66, 0x77, 0x9f, 0xfd, 0xee, 0xc1, 0x2e, 0x0d, 0x13, 0xfc, - 0xc0, 0x94, 0x91, 0xba, 0x02, 0x14, 0xd2, 0xae, 0xea, 0x94, 0x5d, 0x96, 0x7a, 0x00, 0x14, 0x81, - 0xc1, 0xe8, 0x05, 0xd9, 0x2e, 0x1a, 0x49, 0xbb, 0xa6, 0x33, 0x9d, 0xb2, 0x4c, 0xd1, 0x2d, 0x58, - 0xe1, 0xf4, 0x86, 0xec, 0xe4, 0xff, 0x1d, 0x24, 0x3c, 0xe5, 0x13, 0x69, 0xd7, 0x5d, 0xcb, 0x6b, - 0x76, 0x0f, 0xff, 0xa9, 0xda, 0xd7, 0x60, 0xd0, 0x0e, 0xd7, 0x47, 0x7a, 0x45, 0xda, 0x0a, 0xcc, - 0xf5, 0x18, 0x51, 0x43, 0x8b, 0xdc, 0x3f, 0xda, 0x2f, 0xef, 0xca, 0x78, 0x5a, 0x6a, 0x6d, 0xa2, - 0x3d, 0xd2, 0x42, 0x3e, 0x1e, 0xcf, 0x0a, 0xcb, 0xa6, 0xb6, 0x1c, 0x94, 0x59, 0xee, 0x97, 0x5c, - 0x2e, 0x69, 0xe2, 0x6a, 0xe8, 0xf5, 0x3e, 0x16, 0x8e, 0x35, 0x5f, 0x38, 0xd6, 0xd7, 0xc2, 0xb1, - 0xde, 0x32, 0xa7, 0x32, 0xcf, 0x9c, 0xca, 0x67, 0xe6, 0x54, 0x1e, 0xbd, 0x28, 0xc6, 0xa7, 0x97, - 0x21, 0x1b, 0xc1, 0xc4, 0xcf, 0xdf, 0xdf, 0x7c, 0x8e, 0x65, 0xf8, 0xec, 0xbf, 0xea, 0x65, 0xc0, - 0x59, 0x22, 0xe4, 0xb0, 0xa1, 0xf7, 0xe0, 0xec, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x73, 0x78, - 0xdf, 0x5d, 0x02, 0x00, 0x00, + // 345 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xbb, 0x4e, 0xc3, 0x30, + 0x14, 0x86, 0x1b, 0x7a, 0x01, 0xdc, 0x96, 0xc1, 0x62, 0x88, 0xa0, 0x0a, 0x81, 0xa9, 0x0b, 0x4e, + 0x29, 0x03, 0x12, 0x63, 0x05, 0xe2, 0x32, 0x55, 0x01, 0x31, 0xb0, 0x54, 0x6e, 0x63, 0x85, 0x88, + 0xb6, 0x27, 0x8a, 0x0f, 0x16, 0x7d, 0x0b, 0x9e, 0x87, 0x27, 0x60, 0xec, 0xc8, 0x88, 0x9a, 0x17, + 0x41, 0xb5, 0x13, 0x5a, 0x89, 0xc0, 0x14, 0x1d, 0xf9, 0xfb, 0xbf, 0xfc, 0xb2, 0x0f, 0x71, 0x47, + 0x20, 0x27, 0x20, 0xbd, 0x10, 0x94, 0xa7, 0x4e, 0x86, 0x02, 0x79, 0xd7, 0x0b, 0xc5, 0x54, 0xc8, + 0x48, 0xb2, 0x38, 0x01, 0x04, 0x4a, 0x0d, 0xc1, 0x42, 0x50, 0x2c, 0x23, 0xf6, 0x5a, 0x45, 0x29, + 0x50, 0x26, 0x71, 0xf4, 0x5e, 0x26, 0x8d, 0x2b, 0xe3, 0xb8, 0x43, 0x8e, 0x82, 0x76, 0xc8, 0xae, + 0x44, 0x9e, 0x60, 0x34, 0x0d, 0x07, 0x71, 0x02, 0x31, 0x48, 0x3e, 0x1e, 0x44, 0x81, 0x6d, 0xb9, + 0x56, 0xbb, 0xe2, 0xd3, 0xfc, 0xac, 0x9f, 0x1d, 0xdd, 0x04, 0xf4, 0x8c, 0x6c, 0x05, 0x22, 0x06, + 0x19, 0xa1, 0xb4, 0x37, 0xdc, 0x72, 0xbb, 0xde, 0xdd, 0x67, 0xbf, 0x7b, 0xb0, 0x0b, 0xc3, 0xf8, + 0x3f, 0x30, 0x65, 0xa4, 0xaa, 0x00, 0x85, 0xb4, 0xcb, 0x3a, 0x65, 0x17, 0xa5, 0x1e, 0x00, 0x85, + 0x6f, 0x30, 0x7a, 0x4e, 0xb6, 0xf3, 0x46, 0xd2, 0xae, 0xe8, 0x4c, 0xab, 0x28, 0x93, 0x77, 0xf3, + 0x57, 0x38, 0xbd, 0x26, 0x3b, 0xd9, 0x7f, 0x07, 0x31, 0x4f, 0xf8, 0x44, 0xda, 0x55, 0xd7, 0x6a, + 0xd7, 0xbb, 0x87, 0xff, 0x54, 0xed, 0x6b, 0xd0, 0x6f, 0x06, 0xeb, 0x23, 0xbd, 0x24, 0x4d, 0x05, + 0xe6, 0x7a, 0x8c, 0xa8, 0xa6, 0x45, 0xee, 0x1f, 0xed, 0x97, 0x77, 0x65, 0x3c, 0x0d, 0xb5, 0x36, + 0xd1, 0x1e, 0x69, 0x20, 0x1f, 0x8f, 0x67, 0xb9, 0x65, 0x53, 0x5b, 0x0e, 0x8a, 0x2c, 0xf7, 0x4b, + 0x2e, 0x93, 0xd4, 0x71, 0x35, 0xf4, 0x6e, 0x3f, 0x16, 0x8e, 0x35, 0x5f, 0x38, 0xd6, 0xd7, 0xc2, + 0xb1, 0xde, 0x52, 0xa7, 0x34, 0x4f, 0x9d, 0xd2, 0x67, 0xea, 0x94, 0x1e, 0x3b, 0x61, 0x84, 0x4f, + 0x2f, 0x43, 0x36, 0x82, 0x89, 0x97, 0xbd, 0xbf, 0xf9, 0x1c, 0xcb, 0xe0, 0xd9, 0x7b, 0xd5, 0xcb, + 0x80, 0xb3, 0x58, 0xc8, 0x7c, 0x25, 0x86, 0x35, 0xbd, 0x0f, 0xa7, 0xdf, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xb6, 0x88, 0x7e, 0xc1, 0x65, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/gov/types/genesis_test.go b/x/gov/types/v1beta2/genesis_test.go similarity index 53% rename from x/gov/types/genesis_test.go rename to x/gov/types/v1beta2/genesis_test.go index 6f13c5ebae..26d54c93a4 100644 --- a/x/gov/types/genesis_test.go +++ b/x/gov/types/v1beta2/genesis_test.go @@ -1,15 +1,16 @@ -package types +package v1beta2_test import ( "testing" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" "github.com/stretchr/testify/require" ) func TestEmptyGenesis(t *testing.T) { - state1 := GenesisState{} + state1 := v1beta2.GenesisState{} require.True(t, state1.Empty()) - state2 := DefaultGenesisState() + state2 := v1beta2.DefaultGenesisState() require.False(t, state2.Empty()) } diff --git a/x/gov/types/gov.pb.go b/x/gov/types/v1beta2/gov.pb.go similarity index 91% rename from x/gov/types/gov.pb.go rename to x/gov/types/v1beta2/gov.pb.go index 0a9ad1dac4..b8064e1014 100644 --- a/x/gov/types/gov.pb.go +++ b/x/gov/types/v1beta2/gov.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: cosmos/gov/v1beta2/gov.proto -package types +package v1beta2 import ( fmt "fmt" @@ -671,71 +671,71 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta2/gov.proto", fileDescriptor_5abf7b8852811c49) } var fileDescriptor_5abf7b8852811c49 = []byte{ - // 1019 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xc1, 0x6e, 0xdb, 0x46, - 0x10, 0x35, 0x25, 0x59, 0xb6, 0x47, 0xb6, 0xc2, 0x6e, 0x8c, 0x86, 0x76, 0x52, 0xca, 0xd5, 0xc1, - 0x10, 0x82, 0x5a, 0x8a, 0x5d, 0x34, 0x05, 0x7a, 0x8a, 0x64, 0x32, 0x0d, 0x03, 0xc7, 0x14, 0x48, - 0x46, 0x46, 0x7b, 0x21, 0x28, 0x73, 0x43, 0x11, 0x15, 0xb9, 0x2a, 0x77, 0xe5, 0xd8, 0x9f, 0xd0, - 0x5b, 0x8e, 0x45, 0x7b, 0xe9, 0xbd, 0xd7, 0x7c, 0x44, 0x4e, 0x45, 0x10, 0x20, 0x40, 0x4f, 0x6d, - 0x61, 0xff, 0x48, 0xc1, 0xe5, 0xd2, 0x96, 0x65, 0x05, 0xd6, 0xc9, 0xab, 0x99, 0xf7, 0xde, 0xce, - 0xec, 0xbe, 0x1d, 0x13, 0x1e, 0x1c, 0x13, 0x1a, 0x11, 0xda, 0x0a, 0xc8, 0x49, 0xeb, 0x64, 0xb7, - 0x8f, 0x99, 0xb7, 0x97, 0xae, 0x9b, 0xa3, 0x84, 0x30, 0x82, 0x50, 0x96, 0x6d, 0xa6, 0x11, 0x91, - 0xdd, 0x54, 0x05, 0xa3, 0xef, 0x51, 0x2c, 0x28, 0xbb, 0xad, 0x63, 0x12, 0xc6, 0x19, 0x67, 0x73, - 0x3d, 0x20, 0x01, 0xe1, 0xcb, 0x56, 0xba, 0x12, 0xd1, 0x5a, 0x40, 0x48, 0x30, 0xc4, 0x2d, 0xfe, - 0xab, 0x3f, 0x7e, 0xd5, 0x62, 0x61, 0x84, 0x29, 0xf3, 0xa2, 0x91, 0x00, 0x6c, 0x4c, 0x03, 0xbc, - 0xf8, 0x4c, 0xa4, 0xd4, 0xe9, 0x94, 0x3f, 0x4e, 0x3c, 0x16, 0x92, 0x7c, 0xc7, 0x8d, 0xac, 0x22, - 0x37, 0xdb, 0x54, 0x94, 0xcc, 0x7f, 0xd4, 0x19, 0xa0, 0x23, 0x1c, 0x06, 0x03, 0x86, 0xfd, 0x1e, - 0x61, 0xd8, 0x1c, 0xa5, 0x34, 0xf4, 0x18, 0xca, 0x84, 0xaf, 0x14, 0x69, 0x4b, 0x6a, 0x54, 0xf7, - 0xd4, 0xe6, 0xcd, 0x3e, 0x9b, 0x57, 0x78, 0x4b, 0xa0, 0xd1, 0x36, 0x94, 0x5f, 0x73, 0x35, 0xa5, - 0xb0, 0x25, 0x35, 0x56, 0x3a, 0xd5, 0x0f, 0x6f, 0x77, 0x40, 0x50, 0x35, 0x7c, 0x6c, 0x89, 0x6c, - 0xfd, 0x77, 0x09, 0x96, 0x34, 0x3c, 0x22, 0x34, 0x64, 0xa8, 0x06, 0x95, 0x51, 0x42, 0x46, 0x84, - 0x7a, 0x43, 0x37, 0xf4, 0xf9, 0x86, 0x25, 0x0b, 0xf2, 0x90, 0xe1, 0xa3, 0xc7, 0xb0, 0xe2, 0x67, - 0x58, 0x92, 0x08, 0x5d, 0xe5, 0xc3, 0xdb, 0x9d, 0x75, 0xa1, 0xdb, 0xf6, 0xfd, 0x04, 0x53, 0x6a, - 0xb3, 0x24, 0x8c, 0x03, 0xeb, 0x0a, 0x8a, 0xbe, 0x85, 0xb2, 0x17, 0x91, 0x71, 0xcc, 0x94, 0xe2, - 0x56, 0xb1, 0x51, 0xd9, 0xdb, 0xc8, 0x9b, 0x48, 0x2f, 0x46, 0x74, 0xb1, 0xdb, 0xdc, 0x27, 0x61, - 0xdc, 0x29, 0xbd, 0xfb, 0xa7, 0xb6, 0x60, 0x09, 0x78, 0xfd, 0x63, 0x09, 0x96, 0xbb, 0x62, 0xff, - 0xdb, 0xcb, 0x7b, 0x04, 0xcb, 0x11, 0xa6, 0xd4, 0x0b, 0x30, 0x55, 0x0a, 0x7c, 0xa3, 0xf5, 0x66, - 0x76, 0x1f, 0xcd, 0xfc, 0x3e, 0x9a, 0xed, 0xf8, 0xcc, 0xba, 0x44, 0xa1, 0xef, 0xa0, 0x4c, 0x99, - 0xc7, 0xc6, 0x54, 0x29, 0xf2, 0xd3, 0xad, 0xcf, 0x3a, 0xdd, 0xbc, 0x00, 0x9b, 0x23, 0x2d, 0xc1, - 0x40, 0x2f, 0x00, 0xbd, 0x0a, 0x63, 0x6f, 0xe8, 0x32, 0x6f, 0x38, 0x3c, 0x73, 0x13, 0x4c, 0xc7, - 0x43, 0xa6, 0x94, 0xb6, 0xa4, 0x46, 0x65, 0xaf, 0x36, 0x4b, 0xc7, 0x49, 0x71, 0x16, 0x87, 0x59, - 0x32, 0xa7, 0x4e, 0x44, 0x50, 0x1b, 0x2a, 0x74, 0xdc, 0x8f, 0x42, 0xe6, 0xa6, 0x76, 0x53, 0x16, - 0xb9, 0xce, 0xe6, 0x8d, 0xfa, 0x9d, 0xdc, 0x8b, 0x9d, 0xd2, 0x9b, 0x7f, 0x6b, 0x92, 0x05, 0x19, - 0x29, 0x0d, 0xa3, 0xe7, 0x20, 0x8b, 0x33, 0x77, 0x71, 0xec, 0x67, 0x3a, 0xe5, 0x39, 0x75, 0xaa, - 0x82, 0xa9, 0xc7, 0x3e, 0xd7, 0xd2, 0x60, 0x8d, 0x11, 0xe6, 0x0d, 0x5d, 0x11, 0x57, 0x96, 0xe6, - 0xbb, 0xb9, 0x55, 0xce, 0xca, 0x1d, 0x75, 0x00, 0x9f, 0x9d, 0x10, 0x16, 0xc6, 0x81, 0x4b, 0x99, - 0x97, 0x88, 0xd6, 0x96, 0xe7, 0x2c, 0xe9, 0x4e, 0x46, 0xb5, 0x53, 0x26, 0xaf, 0xe9, 0x19, 0x88, - 0xd0, 0x55, 0x7b, 0x2b, 0x73, 0x6a, 0xad, 0x65, 0x44, 0xd1, 0x5d, 0xfd, 0x4f, 0x09, 0x2a, 0x93, - 0x87, 0xbf, 0x05, 0xc5, 0x33, 0x4c, 0xb9, 0xa5, 0xae, 0x3f, 0x15, 0x23, 0x66, 0x56, 0x9a, 0x42, - 0x0d, 0x58, 0xf2, 0xfa, 0x94, 0x79, 0x61, 0x3c, 0xe3, 0x41, 0xa5, 0xa8, 0x3c, 0x8d, 0x54, 0x28, - 0xc4, 0x84, 0xfb, 0xe9, 0x26, 0xa8, 0x10, 0x13, 0xf4, 0x08, 0x56, 0x63, 0xe2, 0xbe, 0x0e, 0xd9, - 0xc0, 0x3d, 0xc1, 0x8c, 0x70, 0xc7, 0xdc, 0x44, 0x42, 0x4c, 0x8e, 0x42, 0x36, 0xe8, 0x61, 0x46, - 0xea, 0x1f, 0x25, 0x28, 0xa5, 0x4f, 0xfc, 0xf6, 0x17, 0xd0, 0x84, 0xc5, 0x13, 0xc2, 0xf0, 0xed, - 0x8f, 0x33, 0x83, 0xa5, 0xfe, 0x17, 0xd3, 0xa5, 0x38, 0xcf, 0x74, 0xe9, 0x14, 0x14, 0xe9, 0x72, - 0xc2, 0x3c, 0x81, 0xa5, 0x6c, 0x45, 0x95, 0x12, 0xf7, 0xc6, 0xf6, 0x2c, 0xf2, 0xcd, 0x91, 0x66, - 0xe5, 0xb4, 0xfa, 0x1f, 0x12, 0xac, 0x09, 0xa7, 0x74, 0xbd, 0xc4, 0x8b, 0x28, 0x7a, 0x02, 0x95, - 0x28, 0x8c, 0x2f, 0x3d, 0x27, 0xcd, 0xe7, 0x39, 0x88, 0xc2, 0x38, 0x77, 0xdc, 0x0b, 0x40, 0x91, - 0x77, 0x9a, 0x2b, 0xb8, 0x23, 0x9c, 0x84, 0xc4, 0xe7, 0xc7, 0x91, 0x0a, 0x4d, 0xdb, 0x44, 0x13, - 0xd3, 0xb9, 0x53, 0xfa, 0x35, 0x75, 0x89, 0x1c, 0x79, 0xa7, 0x79, 0x41, 0x9c, 0x58, 0x77, 0x60, - 0xb5, 0xc7, 0x9d, 0x23, 0x0a, 0xd4, 0x40, 0x38, 0x29, 0x57, 0x96, 0xe6, 0x53, 0x5e, 0xcd, 0x58, - 0x42, 0xf5, 0xb7, 0xdc, 0x7e, 0x42, 0x75, 0x1b, 0xca, 0x3f, 0x8f, 0x49, 0x32, 0x8e, 0x66, 0x38, - 0x90, 0x0f, 0xeb, 0x2c, 0x8b, 0xbe, 0x82, 0x15, 0x36, 0x48, 0x30, 0x1d, 0x90, 0xa1, 0xff, 0x89, - 0xb9, 0x7e, 0x05, 0x40, 0xdf, 0x40, 0x35, 0x35, 0x98, 0x7b, 0x45, 0x29, 0xce, 0xa4, 0xac, 0xa5, - 0x28, 0x27, 0x07, 0x3d, 0xfc, 0x45, 0x02, 0x98, 0xf8, 0x07, 0x74, 0x1f, 0xee, 0xf5, 0x4c, 0x47, - 0x77, 0xcd, 0xae, 0x63, 0x98, 0x87, 0xee, 0xcb, 0x43, 0xbb, 0xab, 0xef, 0x1b, 0x4f, 0x0d, 0x5d, - 0x93, 0x17, 0xd0, 0x5d, 0xb8, 0x33, 0x99, 0xfc, 0x41, 0xb7, 0x65, 0x09, 0xdd, 0x83, 0xbb, 0x93, - 0xc1, 0x76, 0xc7, 0x76, 0xda, 0xc6, 0xa1, 0x5c, 0x40, 0x08, 0xaa, 0x93, 0x89, 0x43, 0x53, 0x2e, - 0xa2, 0x07, 0xa0, 0x5c, 0x8f, 0xb9, 0x47, 0x86, 0xf3, 0xcc, 0xed, 0xe9, 0x8e, 0x29, 0x97, 0x1e, - 0xfe, 0x25, 0x41, 0xf5, 0xfa, 0xf8, 0x45, 0x35, 0xb8, 0xdf, 0xb5, 0xcc, 0xae, 0x69, 0xb7, 0x0f, - 0x5c, 0xdb, 0x69, 0x3b, 0x2f, 0xed, 0xa9, 0x9a, 0xea, 0xa0, 0x4e, 0x03, 0x34, 0xbd, 0x6b, 0xda, - 0x86, 0xe3, 0x76, 0x75, 0xcb, 0x30, 0x35, 0x59, 0x42, 0x5f, 0xc2, 0x17, 0xd3, 0x98, 0x9e, 0xe9, - 0x18, 0x87, 0xdf, 0xe7, 0x90, 0x02, 0xda, 0x84, 0xcf, 0xa7, 0x21, 0xdd, 0xb6, 0x6d, 0xeb, 0x5a, - 0x56, 0xf4, 0x74, 0xce, 0xd2, 0x9f, 0xeb, 0xfb, 0x8e, 0xae, 0xc9, 0xa5, 0x59, 0xcc, 0xa7, 0x6d, - 0xe3, 0x40, 0xd7, 0xe4, 0xc5, 0x4e, 0xe7, 0xdd, 0xb9, 0x2a, 0xbd, 0x3f, 0x57, 0xa5, 0xff, 0xce, - 0x55, 0xe9, 0xcd, 0x85, 0xba, 0xf0, 0xfe, 0x42, 0x5d, 0xf8, 0xfb, 0x42, 0x5d, 0xf8, 0xb1, 0x11, - 0x84, 0x6c, 0x30, 0xee, 0x37, 0x8f, 0x49, 0x24, 0xbe, 0x0b, 0xc4, 0x9f, 0x1d, 0xea, 0xff, 0xd4, - 0x3a, 0xe5, 0x5f, 0x3d, 0xec, 0x6c, 0x84, 0x69, 0xbf, 0xcc, 0x4d, 0xf6, 0xf5, 0xff, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xa4, 0x3d, 0x7c, 0xd7, 0x10, 0x09, 0x00, 0x00, + // 1022 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x41, 0x6f, 0xdb, 0x36, + 0x14, 0x8e, 0x6c, 0xc7, 0x49, 0x9e, 0x13, 0x57, 0x63, 0x83, 0x55, 0x49, 0x3b, 0x39, 0xf3, 0x21, + 0x08, 0x8a, 0xc5, 0x4e, 0x32, 0xac, 0x03, 0x76, 0xaa, 0x1d, 0xa9, 0xab, 0x82, 0x34, 0x32, 0x24, + 0xd5, 0xc1, 0x76, 0x11, 0xe4, 0x88, 0x95, 0x85, 0x59, 0xa2, 0x27, 0xd2, 0x69, 0xf2, 0x13, 0x76, + 0xeb, 0x71, 0xd8, 0x2e, 0xbb, 0xef, 0xda, 0x1f, 0xd1, 0xd3, 0x50, 0x14, 0x28, 0xb0, 0xd3, 0x36, + 0x24, 0x7f, 0x64, 0x10, 0x45, 0x25, 0x8e, 0xe3, 0x22, 0x3e, 0x99, 0x7a, 0xef, 0xfb, 0x3e, 0x3e, + 0x92, 0x1f, 0x9f, 0x09, 0x8f, 0x4e, 0x08, 0x8d, 0x08, 0x6d, 0x06, 0xe4, 0xb4, 0x79, 0xba, 0xdb, + 0xc3, 0xcc, 0xdb, 0x4b, 0xc7, 0x8d, 0x61, 0x42, 0x18, 0x41, 0x28, 0xcb, 0x36, 0xd2, 0x88, 0xc8, + 0xae, 0xab, 0x82, 0xd1, 0xf3, 0x28, 0x16, 0x94, 0xdd, 0xe6, 0x09, 0x09, 0xe3, 0x8c, 0xb3, 0xbe, + 0x1a, 0x90, 0x80, 0xf0, 0x61, 0x33, 0x1d, 0x89, 0x68, 0x2d, 0x20, 0x24, 0x18, 0xe0, 0x26, 0xff, + 0xea, 0x8d, 0x5e, 0x35, 0x59, 0x18, 0x61, 0xca, 0xbc, 0x68, 0x28, 0x00, 0x6b, 0x93, 0x00, 0x2f, + 0x3e, 0x17, 0x29, 0x75, 0x32, 0xe5, 0x8f, 0x12, 0x8f, 0x85, 0x24, 0x9f, 0x71, 0x2d, 0xab, 0xc8, + 0xcd, 0x26, 0x15, 0x25, 0xf3, 0x8f, 0x3a, 0x03, 0x74, 0x8c, 0xc3, 0xa0, 0xcf, 0xb0, 0xdf, 0x25, + 0x0c, 0x9b, 0xc3, 0x94, 0x86, 0x9e, 0x40, 0x99, 0xf0, 0x91, 0x22, 0x6d, 0x48, 0x5b, 0xd5, 0x3d, + 0xb5, 0x71, 0x7b, 0x9d, 0x8d, 0x6b, 0xbc, 0x25, 0xd0, 0x68, 0x13, 0xca, 0xaf, 0xb9, 0x9a, 0x52, + 0xd8, 0x90, 0xb6, 0x96, 0xda, 0xd5, 0x0f, 0x6f, 0xb7, 0x41, 0x50, 0x35, 0x7c, 0x62, 0x89, 0x6c, + 0xfd, 0x77, 0x09, 0x16, 0x34, 0x3c, 0x24, 0x34, 0x64, 0xa8, 0x06, 0x95, 0x61, 0x42, 0x86, 0x84, + 0x7a, 0x03, 0x37, 0xf4, 0xf9, 0x84, 0x25, 0x0b, 0xf2, 0x90, 0xe1, 0xa3, 0x27, 0xb0, 0xe4, 0x67, + 0x58, 0x92, 0x08, 0x5d, 0xe5, 0xc3, 0xdb, 0xed, 0x55, 0xa1, 0xdb, 0xf2, 0xfd, 0x04, 0x53, 0x6a, + 0xb3, 0x24, 0x8c, 0x03, 0xeb, 0x1a, 0x8a, 0xbe, 0x85, 0xb2, 0x17, 0x91, 0x51, 0xcc, 0x94, 0xe2, + 0x46, 0x71, 0xab, 0xb2, 0xb7, 0x96, 0x2f, 0x22, 0x3d, 0x18, 0xb1, 0x8a, 0xdd, 0xc6, 0x3e, 0x09, + 0xe3, 0x76, 0xe9, 0xdd, 0x3f, 0xb5, 0x39, 0x4b, 0xc0, 0xeb, 0x1f, 0x4b, 0xb0, 0xd8, 0x11, 0xf3, + 0xdf, 0x5d, 0xde, 0x0e, 0x2c, 0x46, 0x98, 0x52, 0x2f, 0xc0, 0x54, 0x29, 0xf0, 0x89, 0x56, 0x1b, + 0xd9, 0x79, 0x34, 0xf2, 0xf3, 0x68, 0xb4, 0xe2, 0x73, 0xeb, 0x0a, 0x85, 0xbe, 0x83, 0x32, 0x65, + 0x1e, 0x1b, 0x51, 0xa5, 0xc8, 0x77, 0xb7, 0x3e, 0x6d, 0x77, 0xf3, 0x02, 0x6c, 0x8e, 0xb4, 0x04, + 0x03, 0xbd, 0x00, 0xf4, 0x2a, 0x8c, 0xbd, 0x81, 0xcb, 0xbc, 0xc1, 0xe0, 0xdc, 0x4d, 0x30, 0x1d, + 0x0d, 0x98, 0x52, 0xda, 0x90, 0xb6, 0x2a, 0x7b, 0xb5, 0x69, 0x3a, 0x4e, 0x8a, 0xb3, 0x38, 0xcc, + 0x92, 0x39, 0x75, 0x2c, 0x82, 0x5a, 0x50, 0xa1, 0xa3, 0x5e, 0x14, 0x32, 0x37, 0xb5, 0x9b, 0x32, + 0xcf, 0x75, 0xd6, 0x6f, 0xd5, 0xef, 0xe4, 0x5e, 0x6c, 0x97, 0xde, 0xfc, 0x5b, 0x93, 0x2c, 0xc8, + 0x48, 0x69, 0x18, 0x1d, 0x80, 0x2c, 0xf6, 0xdc, 0xc5, 0xb1, 0x9f, 0xe9, 0x94, 0x67, 0xd4, 0xa9, + 0x0a, 0xa6, 0x1e, 0xfb, 0x5c, 0x4b, 0x83, 0x15, 0x46, 0x98, 0x37, 0x70, 0x45, 0x5c, 0x59, 0x98, + 0xed, 0xe4, 0x96, 0x39, 0x2b, 0x77, 0xd4, 0x21, 0x7c, 0x76, 0x4a, 0x58, 0x18, 0x07, 0x2e, 0x65, + 0x5e, 0x22, 0x96, 0xb6, 0x38, 0x63, 0x49, 0xf7, 0x32, 0xaa, 0x9d, 0x32, 0x79, 0x4d, 0xcf, 0x41, + 0x84, 0xae, 0x97, 0xb7, 0x34, 0xa3, 0xd6, 0x4a, 0x46, 0x14, 0xab, 0xab, 0xff, 0x29, 0x41, 0x65, + 0x7c, 0xf3, 0x37, 0xa0, 0x78, 0x8e, 0x29, 0xb7, 0xd4, 0xcd, 0xab, 0x62, 0xc4, 0xcc, 0x4a, 0x53, + 0x68, 0x0b, 0x16, 0xbc, 0x1e, 0x65, 0x5e, 0x18, 0x4f, 0xb9, 0x50, 0x29, 0x2a, 0x4f, 0x23, 0x15, + 0x0a, 0x31, 0xe1, 0x7e, 0xba, 0x0d, 0x2a, 0xc4, 0x04, 0xed, 0xc0, 0x72, 0x4c, 0xdc, 0xd7, 0x21, + 0xeb, 0xbb, 0xa7, 0x98, 0x11, 0xee, 0x98, 0xdb, 0x48, 0x88, 0xc9, 0x71, 0xc8, 0xfa, 0x5d, 0xcc, + 0x48, 0xfd, 0xa3, 0x04, 0xa5, 0xf4, 0x8a, 0xdf, 0x7d, 0x03, 0x1a, 0x30, 0x7f, 0x4a, 0x18, 0xbe, + 0xfb, 0x72, 0x66, 0xb0, 0xd4, 0xff, 0xa2, 0xbb, 0x14, 0x67, 0xe9, 0x2e, 0xed, 0x82, 0x22, 0x5d, + 0x75, 0x98, 0xa7, 0xb0, 0x90, 0x8d, 0xa8, 0x52, 0xe2, 0xde, 0xd8, 0x9c, 0x46, 0xbe, 0xdd, 0xd2, + 0xac, 0x9c, 0x56, 0xff, 0x43, 0x82, 0x15, 0xe1, 0x94, 0x8e, 0x97, 0x78, 0x11, 0x45, 0x4f, 0xa1, + 0x12, 0x85, 0xf1, 0x95, 0xe7, 0xa4, 0xd9, 0x3c, 0x07, 0x51, 0x18, 0xe7, 0x8e, 0x7b, 0x01, 0x28, + 0xf2, 0xce, 0x72, 0x05, 0x77, 0x88, 0x93, 0x90, 0xf8, 0x7c, 0x3b, 0x52, 0xa1, 0x49, 0x9b, 0x68, + 0xa2, 0x3b, 0xb7, 0x4b, 0xbf, 0xa6, 0x2e, 0x91, 0x23, 0xef, 0x2c, 0x2f, 0x88, 0x13, 0xeb, 0x0e, + 0x2c, 0x77, 0xb9, 0x73, 0x44, 0x81, 0x1a, 0x08, 0x27, 0xe5, 0xca, 0xd2, 0x6c, 0xca, 0xcb, 0x19, + 0x4b, 0xa8, 0xfe, 0x96, 0xdb, 0x4f, 0xa8, 0x6e, 0x42, 0xf9, 0xe7, 0x11, 0x49, 0x46, 0xd1, 0x14, + 0x07, 0xf2, 0x66, 0x9d, 0x65, 0xd1, 0x57, 0xb0, 0xc4, 0xfa, 0x09, 0xa6, 0x7d, 0x32, 0xf0, 0x3f, + 0xd1, 0xd7, 0xaf, 0x01, 0xe8, 0x1b, 0xa8, 0xa6, 0x06, 0x73, 0xaf, 0x29, 0xc5, 0xa9, 0x94, 0x95, + 0x14, 0xe5, 0xe4, 0xa0, 0xc7, 0xbf, 0x48, 0x00, 0x63, 0x7f, 0x40, 0x0f, 0xe1, 0x41, 0xd7, 0x74, + 0x74, 0xd7, 0xec, 0x38, 0x86, 0x79, 0xe4, 0xbe, 0x3c, 0xb2, 0x3b, 0xfa, 0xbe, 0xf1, 0xcc, 0xd0, + 0x35, 0x79, 0x0e, 0xdd, 0x87, 0x7b, 0xe3, 0xc9, 0x1f, 0x74, 0x5b, 0x96, 0xd0, 0x03, 0xb8, 0x3f, + 0x1e, 0x6c, 0xb5, 0x6d, 0xa7, 0x65, 0x1c, 0xc9, 0x05, 0x84, 0xa0, 0x3a, 0x9e, 0x38, 0x32, 0xe5, + 0x22, 0x7a, 0x04, 0xca, 0xcd, 0x98, 0x7b, 0x6c, 0x38, 0xcf, 0xdd, 0xae, 0xee, 0x98, 0x72, 0xe9, + 0xf1, 0x5f, 0x12, 0x54, 0x6f, 0xb6, 0x5f, 0x54, 0x83, 0x87, 0x1d, 0xcb, 0xec, 0x98, 0x76, 0xeb, + 0xd0, 0xb5, 0x9d, 0x96, 0xf3, 0xd2, 0x9e, 0xa8, 0xa9, 0x0e, 0xea, 0x24, 0x40, 0xd3, 0x3b, 0xa6, + 0x6d, 0x38, 0x6e, 0x47, 0xb7, 0x0c, 0x53, 0x93, 0x25, 0xf4, 0x25, 0x7c, 0x31, 0x89, 0xe9, 0x9a, + 0x8e, 0x71, 0xf4, 0x7d, 0x0e, 0x29, 0xa0, 0x75, 0xf8, 0x7c, 0x12, 0xd2, 0x69, 0xd9, 0xb6, 0xae, + 0x65, 0x45, 0x4f, 0xe6, 0x2c, 0xfd, 0x40, 0xdf, 0x77, 0x74, 0x4d, 0x2e, 0x4d, 0x63, 0x3e, 0x6b, + 0x19, 0x87, 0xba, 0x26, 0xcf, 0xb7, 0x0f, 0xde, 0x5d, 0xa8, 0xd2, 0xfb, 0x0b, 0x55, 0xfa, 0xef, + 0x42, 0x95, 0xde, 0x5c, 0xaa, 0x73, 0xef, 0x2f, 0xd5, 0xb9, 0xbf, 0x2f, 0xd5, 0xb9, 0x1f, 0x77, + 0x82, 0x90, 0xf5, 0x47, 0xbd, 0xc6, 0x09, 0x89, 0xc4, 0xbb, 0x40, 0xfc, 0x6c, 0x53, 0xff, 0xa7, + 0xe6, 0x19, 0x7f, 0xf5, 0xb0, 0xf3, 0x21, 0xa6, 0xf9, 0xdb, 0xa7, 0x57, 0xe6, 0x66, 0xfb, 0xfa, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x59, 0x87, 0xaa, 0xdc, 0x18, 0x09, 0x00, 0x00, } func (m *WeightedVoteOption) Marshal() (dAtA []byte, err error) { diff --git a/x/gov/types/msgs.go b/x/gov/types/v1beta2/msgs.go similarity index 92% rename from x/gov/types/msgs.go rename to x/gov/types/v1beta2/msgs.go index 8b9a6e58bb..a5a512681e 100644 --- a/x/gov/types/msgs.go +++ b/x/gov/types/v1beta2/msgs.go @@ -1,4 +1,4 @@ -package types +package v1beta2 import ( "fmt" @@ -9,6 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" sdktx "github.com/cosmos/cosmos-sdk/types/tx" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) // Governance message types and routes @@ -104,7 +105,7 @@ func (m MsgSubmitProposal) ValidateBasic() error { for idx, msg := range msgs { if err := msg.ValidateBasic(); err != nil { - return sdkerrors.Wrap(ErrInvalidProposalMsg, + return sdkerrors.Wrap(govtypes.ErrInvalidProposalMsg, fmt.Sprintf("msg: %d, err: %s", idx, err.Error())) } } @@ -187,7 +188,7 @@ func (msg MsgVote) ValidateBasic() error { return sdkerrors.ErrInvalidAddress.Wrapf("invalid voter address: %s", err) } if !ValidVoteOption(msg.Option) { - return sdkerrors.Wrap(ErrInvalidVote, msg.Option.String()) + return sdkerrors.Wrap(govtypes.ErrInvalidVote, msg.Option.String()) } return nil @@ -230,25 +231,25 @@ func (msg MsgVoteWeighted) ValidateBasic() error { usedOptions := make(map[VoteOption]bool) for _, option := range msg.Options { if !option.IsValid() { - return sdkerrors.Wrap(ErrInvalidVote, option.String()) + return sdkerrors.Wrap(govtypes.ErrInvalidVote, option.String()) } weight, err := sdk.NewDecFromStr(option.Weight) if err != nil { - return sdkerrors.Wrapf(ErrInvalidVote, "Invalid weight: %s", err) + return sdkerrors.Wrapf(govtypes.ErrInvalidVote, "Invalid weight: %s", err) } totalWeight = totalWeight.Add(weight) if usedOptions[option.Option] { - return sdkerrors.Wrap(ErrInvalidVote, "Duplicated vote option") + return sdkerrors.Wrap(govtypes.ErrInvalidVote, "Duplicated vote option") } usedOptions[option.Option] = true } if totalWeight.GT(sdk.NewDec(1)) { - return sdkerrors.Wrap(ErrInvalidVote, "Total weight overflow 1.00") + return sdkerrors.Wrap(govtypes.ErrInvalidVote, "Total weight overflow 1.00") } if totalWeight.LT(sdk.NewDec(1)) { - return sdkerrors.Wrap(ErrInvalidVote, "Total weight lower than 1.00") + return sdkerrors.Wrap(govtypes.ErrInvalidVote, "Total weight lower than 1.00") } return nil diff --git a/x/gov/types/msgs_test.go b/x/gov/types/v1beta2/msgs_test.go similarity index 53% rename from x/gov/types/msgs_test.go rename to x/gov/types/v1beta2/msgs_test.go index 616023e1de..1977ba990b 100644 --- a/x/gov/types/msgs_test.go +++ b/x/gov/types/v1beta2/msgs_test.go @@ -1,4 +1,4 @@ -package types +package v1beta2_test import ( "testing" @@ -6,6 +6,7 @@ import ( "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" ) var ( @@ -24,7 +25,7 @@ func init() { func TestMsgDepositGetSignBytes(t *testing.T) { addr := sdk.AccAddress("addr1") - msg := NewMsgDeposit(addr, 0, coinsPos) + msg := v1beta2.NewMsgDeposit(addr, 0, coinsPos) res := msg.GetSignBytes() expected := `{"type":"cosmos-sdk/MsgDeposit","value":{"amount":[{"amount":"1000","denom":"stake"}],"depositor":"cosmos1v9jxgu33kfsgr5"}}` @@ -46,7 +47,7 @@ func TestMsgDeposit(t *testing.T) { } for i, tc := range tests { - msg := NewMsgDeposit(tc.depositorAddr, tc.proposalID, tc.depositAmount) + msg := v1beta2.NewMsgDeposit(tc.depositorAddr, tc.proposalID, tc.depositAmount) if tc.expectPass { require.NoError(t, msg.ValidateBasic(), "test: %v", i) } else { @@ -60,19 +61,19 @@ func TestMsgVote(t *testing.T) { tests := []struct { proposalID uint64 voterAddr sdk.AccAddress - option VoteOption + option v1beta2.VoteOption expectPass bool }{ - {0, addrs[0], OptionYes, true}, - {0, sdk.AccAddress{}, OptionYes, false}, - {0, addrs[0], OptionNo, true}, - {0, addrs[0], OptionNoWithVeto, true}, - {0, addrs[0], OptionAbstain, true}, - {0, addrs[0], VoteOption(0x13), false}, + {0, addrs[0], v1beta2.OptionYes, true}, + {0, sdk.AccAddress{}, v1beta2.OptionYes, false}, + {0, addrs[0], v1beta2.OptionNo, true}, + {0, addrs[0], v1beta2.OptionNoWithVeto, true}, + {0, addrs[0], v1beta2.OptionAbstain, true}, + {0, addrs[0], v1beta2.VoteOption(0x13), false}, } for i, tc := range tests { - msg := NewMsgVote(tc.voterAddr, tc.proposalID, tc.option) + msg := v1beta2.NewMsgVote(tc.voterAddr, tc.proposalID, tc.option) if tc.expectPass { require.Nil(t, msg.ValidateBasic(), "test: %v", i) } else { @@ -86,37 +87,37 @@ func TestMsgVoteWeighted(t *testing.T) { tests := []struct { proposalID uint64 voterAddr sdk.AccAddress - options WeightedVoteOptions + options v1beta2.WeightedVoteOptions expectPass bool }{ - {0, addrs[0], NewNonSplitVoteOption(OptionYes), true}, - {0, sdk.AccAddress{}, NewNonSplitVoteOption(OptionYes), false}, - {0, addrs[0], NewNonSplitVoteOption(OptionNo), true}, - {0, addrs[0], NewNonSplitVoteOption(OptionNoWithVeto), true}, - {0, addrs[0], NewNonSplitVoteOption(OptionAbstain), true}, - {0, addrs[0], WeightedVoteOptions{ // weight sum > 1 - NewWeightedVoteOption(OptionYes, sdk.NewDec(1)), - NewWeightedVoteOption(OptionAbstain, sdk.NewDec(1)), + {0, addrs[0], v1beta2.NewNonSplitVoteOption(v1beta2.OptionYes), true}, + {0, sdk.AccAddress{}, v1beta2.NewNonSplitVoteOption(v1beta2.OptionYes), false}, + {0, addrs[0], v1beta2.NewNonSplitVoteOption(v1beta2.OptionNo), true}, + {0, addrs[0], v1beta2.NewNonSplitVoteOption(v1beta2.OptionNoWithVeto), true}, + {0, addrs[0], v1beta2.NewNonSplitVoteOption(v1beta2.OptionAbstain), true}, + {0, addrs[0], v1beta2.WeightedVoteOptions{ // weight sum > 1 + v1beta2.NewWeightedVoteOption(v1beta2.OptionYes, sdk.NewDec(1)), + v1beta2.NewWeightedVoteOption(v1beta2.OptionAbstain, sdk.NewDec(1)), }, false}, - {0, addrs[0], WeightedVoteOptions{ // duplicate option - NewWeightedVoteOption(OptionYes, sdk.NewDecWithPrec(5, 1)), - NewWeightedVoteOption(OptionYes, sdk.NewDecWithPrec(5, 1)), + {0, addrs[0], v1beta2.WeightedVoteOptions{ // duplicate option + v1beta2.NewWeightedVoteOption(v1beta2.OptionYes, sdk.NewDecWithPrec(5, 1)), + v1beta2.NewWeightedVoteOption(v1beta2.OptionYes, sdk.NewDecWithPrec(5, 1)), }, false}, - {0, addrs[0], WeightedVoteOptions{ // zero weight - NewWeightedVoteOption(OptionYes, sdk.NewDec(0)), + {0, addrs[0], v1beta2.WeightedVoteOptions{ // zero weight + v1beta2.NewWeightedVoteOption(v1beta2.OptionYes, sdk.NewDec(0)), }, false}, - {0, addrs[0], WeightedVoteOptions{ // negative weight - NewWeightedVoteOption(OptionYes, sdk.NewDec(-1)), + {0, addrs[0], v1beta2.WeightedVoteOptions{ // negative weight + v1beta2.NewWeightedVoteOption(v1beta2.OptionYes, sdk.NewDec(-1)), }, false}, - {0, addrs[0], WeightedVoteOptions{}, false}, - {0, addrs[0], NewNonSplitVoteOption(VoteOption(0x13)), false}, - {0, addrs[0], WeightedVoteOptions{ // weight sum <1 - NewWeightedVoteOption(OptionYes, sdk.NewDecWithPrec(5, 1)), + {0, addrs[0], v1beta2.WeightedVoteOptions{}, false}, + {0, addrs[0], v1beta2.NewNonSplitVoteOption(v1beta2.VoteOption(0x13)), false}, + {0, addrs[0], v1beta2.WeightedVoteOptions{ // weight sum <1 + v1beta2.NewWeightedVoteOption(v1beta2.OptionYes, sdk.NewDecWithPrec(5, 1)), }, false}, } for i, tc := range tests { - msg := NewMsgVoteWeighted(tc.voterAddr, tc.proposalID, tc.options) + msg := v1beta2.NewMsgVoteWeighted(tc.voterAddr, tc.proposalID, tc.options) if tc.expectPass { require.Nil(t, msg.ValidateBasic(), "test: %v", i) } else { @@ -127,8 +128,8 @@ func TestMsgVoteWeighted(t *testing.T) { // this tests that Amino JSON MsgSubmitProposal.GetSignBytes() still works with Content as Any using the ModuleCdc func TestMsgSubmitProposal_GetSignBytes(t *testing.T) { - proposal := []sdk.Msg{NewMsgVote(addrs[0], 1, OptionYes)} - msg, err := NewMsgSubmitProposal(proposal, sdk.NewCoins(), sdk.AccAddress{}) + proposal := []sdk.Msg{v1beta2.NewMsgVote(addrs[0], 1, v1beta2.OptionYes)} + msg, err := v1beta2.NewMsgSubmitProposal(proposal, sdk.NewCoins(), sdk.AccAddress{}) require.NoError(t, err) var bz []byte require.NotPanics(t, func() { diff --git a/x/gov/types/params.go b/x/gov/types/v1beta2/params.go similarity index 99% rename from x/gov/types/params.go rename to x/gov/types/v1beta2/params.go index a4ab8d9659..f65cf333cc 100644 --- a/x/gov/types/params.go +++ b/x/gov/types/v1beta2/params.go @@ -1,4 +1,4 @@ -package types +package v1beta2 import ( "errors" diff --git a/x/gov/types/proposal.go b/x/gov/types/v1beta2/proposal.go similarity index 99% rename from x/gov/types/proposal.go rename to x/gov/types/v1beta2/proposal.go index b22808f9c5..4c27f5ba66 100644 --- a/x/gov/types/proposal.go +++ b/x/gov/types/v1beta2/proposal.go @@ -1,4 +1,4 @@ -package types +package v1beta2 import ( "fmt" diff --git a/x/gov/types/proposals_test.go b/x/gov/types/v1beta2/proposals_test.go similarity index 67% rename from x/gov/types/proposals_test.go rename to x/gov/types/v1beta2/proposals_test.go index ca670e91e9..f038ebfaf6 100644 --- a/x/gov/types/proposals_test.go +++ b/x/gov/types/v1beta2/proposals_test.go @@ -1,17 +1,17 @@ -package types_test +package v1beta2_test import ( "fmt" "testing" - "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" "github.com/stretchr/testify/require" ) func TestProposalStatus_Format(t *testing.T) { - statusDepositPeriod, _ := types.ProposalStatusFromString("PROPOSAL_STATUS_DEPOSIT_PERIOD") + statusDepositPeriod, _ := v1beta2.ProposalStatusFromString("PROPOSAL_STATUS_DEPOSIT_PERIOD") tests := []struct { - pt types.ProposalStatus + pt v1beta2.ProposalStatus sprintFArgs string expectedStringOutput string }{ diff --git a/x/gov/types/querier.go b/x/gov/types/v1beta2/querier.go similarity index 99% rename from x/gov/types/querier.go rename to x/gov/types/v1beta2/querier.go index fe9b5e0f15..a78df106e9 100644 --- a/x/gov/types/querier.go +++ b/x/gov/types/v1beta2/querier.go @@ -1,4 +1,4 @@ -package types +package v1beta2 import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gov/types/query.pb.go b/x/gov/types/v1beta2/query.pb.go similarity index 94% rename from x/gov/types/query.pb.go rename to x/gov/types/v1beta2/query.pb.go index d696f322c0..7605012ba6 100644 --- a/x/gov/types/query.pb.go +++ b/x/gov/types/v1beta2/query.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: cosmos/gov/v1beta2/query.proto -package types +package v1beta2 import ( context "context" @@ -895,67 +895,67 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta2/query.proto", fileDescriptor_3efdc0c4615c3665) } var fileDescriptor_3efdc0c4615c3665 = []byte{ - // 952 bytes of a gzipped FileDescriptorProto + // 955 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0x1b, 0x45, 0x14, 0xcf, 0x38, 0x49, 0x1b, 0xbf, 0xb4, 0x01, 0x1e, 0x05, 0x8c, 0x29, 0x4e, 0x58, 0xd1, 0xd6, - 0xa4, 0xcd, 0x2e, 0x49, 0x68, 0x4b, 0x0b, 0x07, 0x62, 0x41, 0x29, 0x42, 0x48, 0xa9, 0x5b, 0x71, - 0xe0, 0x12, 0x6d, 0xe2, 0xd5, 0xb2, 0xc2, 0xd9, 0xd9, 0x7a, 0xc6, 0x16, 0x51, 0x88, 0x90, 0xb8, - 0x21, 0x84, 0x04, 0xa2, 0x42, 0xe2, 0xd0, 0x13, 0x12, 0x9f, 0x80, 0x0f, 0xc1, 0xb1, 0x02, 0x0e, - 0x1c, 0x51, 0xc2, 0x89, 0x4f, 0x81, 0x76, 0xe6, 0xcd, 0x7a, 0xd7, 0x59, 0x7b, 0xed, 0x12, 0xf5, - 0x14, 0xcd, 0xcc, 0xef, 0xbd, 0xf7, 0x7b, 0x7f, 0xf6, 0xf7, 0x62, 0xa8, 0xed, 0x70, 0xb1, 0xcb, - 0x85, 0xe3, 0xf3, 0x9e, 0xd3, 0x5b, 0xdd, 0xf6, 0xa4, 0xbb, 0xe6, 0xdc, 0xef, 0x7a, 0x9d, 0x3d, - 0x3b, 0xea, 0x70, 0xc9, 0x11, 0xf5, 0xbb, 0xed, 0xf3, 0x9e, 0x4d, 0xef, 0xd5, 0x65, 0xb2, 0xd9, - 0x76, 0x85, 0xa7, 0xc1, 0x64, 0xba, 0xea, 0x44, 0xae, 0x1f, 0x84, 0xae, 0x0c, 0x78, 0xa8, 0xed, - 0xab, 0xe7, 0x7d, 0xce, 0xfd, 0xb6, 0xe7, 0xb8, 0x51, 0xe0, 0xb8, 0x61, 0xc8, 0xa5, 0x7a, 0x14, - 0xe6, 0x35, 0x27, 0x7a, 0x1c, 0x49, 0xbf, 0xbe, 0xa8, 0x5f, 0xb7, 0xd4, 0xc9, 0x21, 0x22, 0xea, - 0x60, 0x5d, 0x87, 0x73, 0x77, 0xe2, 0xc0, 0x9b, 0x1d, 0x1e, 0x71, 0xe1, 0xb6, 0x9b, 0xde, 0xfd, - 0xae, 0x27, 0x24, 0x2e, 0xc2, 0x7c, 0x44, 0x57, 0x5b, 0x41, 0xab, 0xc2, 0x96, 0x58, 0x7d, 0xa6, - 0x09, 0xe6, 0xea, 0x83, 0x96, 0x75, 0x07, 0x9e, 0x1b, 0x30, 0x14, 0x11, 0x0f, 0x85, 0x87, 0x6f, - 0xc2, 0x9c, 0x81, 0x29, 0xb3, 0xf9, 0xb5, 0xf3, 0xf6, 0xf1, 0xdc, 0xed, 0xc4, 0x2e, 0x41, 0x5b, - 0x0f, 0x4a, 0x03, 0x3e, 0x85, 0x61, 0xf3, 0x21, 0x3c, 0x95, 0xb0, 0x11, 0xd2, 0x95, 0x5d, 0xa1, - 0x5c, 0x2f, 0xac, 0x59, 0xa3, 0x5c, 0xdf, 0x55, 0xc8, 0xe6, 0x42, 0x94, 0x39, 0xa3, 0x0d, 0xb3, - 0x3d, 0x2e, 0xbd, 0x4e, 0xa5, 0xb4, 0xc4, 0xea, 0xe5, 0x46, 0xe5, 0xf7, 0x5f, 0x57, 0xce, 0x91, - 0x97, 0x8d, 0x56, 0xab, 0xe3, 0x09, 0x71, 0x57, 0x76, 0x82, 0xd0, 0x6f, 0x6a, 0x18, 0x5e, 0x83, - 0x72, 0xcb, 0x8b, 0xb8, 0x08, 0x24, 0xef, 0x54, 0xa6, 0x0b, 0x6c, 0xfa, 0x50, 0xbc, 0x05, 0xd0, - 0xef, 0x62, 0x65, 0x46, 0x95, 0xe2, 0xa2, 0xe1, 0x1b, 0xb7, 0xdc, 0xd6, 0xf3, 0x41, 0x2d, 0xb7, - 0x37, 0x5d, 0xdf, 0xa3, 0x84, 0x9b, 0x29, 0x4b, 0xeb, 0x21, 0x83, 0xe7, 0x07, 0xcb, 0x42, 0xb5, - 0xbe, 0x09, 0x65, 0x93, 0x5c, 0x5c, 0x91, 0xe9, 0xc2, 0x62, 0xf7, 0xe1, 0xf8, 0x7e, 0x86, 0x5e, - 0x49, 0xd1, 0xbb, 0x54, 0x48, 0x4f, 0x07, 0xce, 0xf0, 0xdb, 0x81, 0xa7, 0x15, 0xbd, 0x8f, 0xb9, - 0xf4, 0xc6, 0x1d, 0x9f, 0x49, 0x9b, 0x60, 0x6d, 0xc0, 0x33, 0xa9, 0x20, 0x94, 0xfe, 0x15, 0x98, - 0x89, 0x5f, 0x69, 0xcc, 0x2a, 0x79, 0x99, 0x2b, 0xbc, 0x42, 0x59, 0x5f, 0xa4, 0x5c, 0x88, 0xb1, - 0x89, 0xde, 0xca, 0x29, 0xd3, 0xe3, 0x74, 0xf1, 0x5b, 0x06, 0x98, 0x0e, 0x4f, 0x29, 0x50, 0x1d, - 0x4c, 0xf7, 0x86, 0xe7, 0xa0, 0x61, 0x27, 0xd7, 0xb5, 0xab, 0x44, 0x67, 0xd3, 0xed, 0xb8, 0xbb, - 0x99, 0x72, 0xa8, 0x8b, 0x2d, 0xb9, 0x17, 0xe9, 0xc2, 0x96, 0x63, 0xb3, 0xf8, 0xea, 0xde, 0x5e, - 0xe4, 0x59, 0xff, 0x32, 0x78, 0x36, 0x63, 0x47, 0x79, 0xbc, 0x07, 0x67, 0x7b, 0x5c, 0x06, 0xa1, - 0xbf, 0xa5, 0xc1, 0xd4, 0x93, 0xa5, 0x21, 0xf9, 0x04, 0xa1, 0x4f, 0x0e, 0xce, 0xf4, 0x52, 0x27, - 0xbc, 0x0d, 0x0b, 0xf4, 0x01, 0x19, 0x3f, 0x3a, 0xc5, 0x57, 0xf2, 0xfc, 0xbc, 0xab, 0x91, 0xe4, - 0xe8, 0x6c, 0x2b, 0x7d, 0xc4, 0x06, 0x9c, 0x91, 0x6e, 0xbb, 0xbd, 0x67, 0xfc, 0x4c, 0x2b, 0x3f, - 0x8b, 0x79, 0x7e, 0xee, 0xc5, 0x38, 0xf2, 0x32, 0x2f, 0xfb, 0x07, 0x2b, 0xa4, 0x5c, 0x29, 0xd0, - 0xd8, 0x33, 0x93, 0x51, 0x8c, 0xd2, 0xd8, 0x8a, 0x61, 0x7d, 0x44, 0x62, 0x9c, 0xc4, 0xa3, 0xe2, - 0x5e, 0x85, 0xd3, 0x04, 0xa2, 0xb2, 0xbe, 0x34, 0xa2, 0x1c, 0x4d, 0x83, 0xb5, 0xbe, 0xcc, 0xba, - 0x7b, 0xf2, 0x33, 0xff, 0x13, 0x23, 0x41, 0xef, 0x33, 0xa0, 0x8c, 0xae, 0xc3, 0x1c, 0xb1, 0x34, - 0x93, 0x3f, 0x32, 0xa5, 0x04, 0x7c, 0x72, 0xf3, 0x7f, 0x13, 0x5e, 0x50, 0xd4, 0x54, 0xf3, 0x9b, - 0x9e, 0xe8, 0xb6, 0xe5, 0x04, 0xbb, 0xaf, 0x72, 0xdc, 0x36, 0xe9, 0xd5, 0xac, 0x1a, 0x21, 0xea, - 0xd4, 0xf0, 0x81, 0x23, 0x3b, 0x8d, 0x5e, 0xfb, 0xb3, 0x0c, 0xb3, 0xca, 0x27, 0x3e, 0x60, 0x30, - 0x67, 0xf4, 0x1a, 0xeb, 0x79, 0xe6, 0x79, 0x0b, 0xbb, 0xfa, 0xda, 0x18, 0x48, 0x4d, 0xd1, 0x5a, - 0xff, 0xea, 0x8f, 0x7f, 0x7e, 0x28, 0xad, 0xe0, 0x65, 0x27, 0xe7, 0xbf, 0x86, 0x64, 0x41, 0x38, - 0xfb, 0xa9, 0x22, 0x1c, 0xe0, 0xd7, 0x0c, 0xca, 0xc9, 0x02, 0xc2, 0xe2, 0x68, 0x66, 0xda, 0xaa, - 0xcb, 0xe3, 0x40, 0x89, 0xd9, 0x05, 0xc5, 0x6c, 0x11, 0x5f, 0x1e, 0xc9, 0x0c, 0x7f, 0x64, 0x30, - 0x13, 0x8b, 0x22, 0xbe, 0x3a, 0xd4, 0x77, 0x6a, 0x19, 0x55, 0x2f, 0x14, 0xa0, 0x28, 0xf8, 0x86, - 0x0a, 0xfe, 0x16, 0xde, 0x98, 0xa0, 0x2c, 0x8e, 0x52, 0x65, 0x67, 0x5f, 0x2d, 0xa9, 0x03, 0xfc, - 0x9e, 0xc1, 0xac, 0xd2, 0x77, 0x1c, 0x1d, 0x33, 0x29, 0xce, 0xc5, 0x22, 0x18, 0x71, 0xbb, 0xa1, - 0xb8, 0xad, 0xe3, 0xea, 0xc4, 0xdc, 0xf0, 0x1b, 0x06, 0xa7, 0x48, 0x13, 0x87, 0x47, 0xcb, 0x6c, - 0x81, 0xea, 0xa5, 0x42, 0x1c, 0xd1, 0x7a, 0x5d, 0xd1, 0x5a, 0xc6, 0x7a, 0x2e, 0x2d, 0x85, 0x75, - 0xf6, 0x53, 0x0b, 0xe5, 0x00, 0x7f, 0x61, 0x70, 0x9a, 0xbe, 0x6a, 0x1c, 0x1e, 0x26, 0x2b, 0xb8, - 0xd5, 0x7a, 0x31, 0x90, 0x08, 0xdd, 0x56, 0x84, 0x1a, 0xf8, 0xce, 0x24, 0x75, 0x32, 0xe2, 0xe2, - 0xec, 0x27, 0x52, 0x7c, 0x80, 0x0f, 0x19, 0xcc, 0x19, 0xd9, 0xc2, 0x42, 0x02, 0xa2, 0xf8, 0x33, - 0x1c, 0xd4, 0x40, 0xeb, 0x6d, 0xc5, 0xf5, 0x1a, 0xbe, 0xf1, 0x38, 0x5c, 0xf1, 0x67, 0x06, 0xf3, - 0x29, 0x1d, 0xc1, 0xcb, 0x43, 0x03, 0x1f, 0x57, 0xb8, 0xea, 0x95, 0xf1, 0xc0, 0xff, 0x67, 0xf8, - 0x94, 0xac, 0x35, 0x1a, 0xbf, 0x1d, 0xd6, 0xd8, 0xa3, 0xc3, 0x1a, 0xfb, 0xfb, 0xb0, 0xc6, 0xbe, - 0x3b, 0xaa, 0x4d, 0x3d, 0x3a, 0xaa, 0x4d, 0xfd, 0x75, 0x54, 0x9b, 0xfa, 0xa4, 0xee, 0x07, 0xf2, - 0xd3, 0xee, 0xb6, 0xbd, 0xc3, 0x77, 0x8d, 0x5b, 0xfd, 0x67, 0x45, 0xb4, 0x3e, 0x73, 0x3e, 0x57, - 0x31, 0xe2, 0x91, 0x11, 0xdb, 0xa7, 0xd4, 0x2f, 0x95, 0xf5, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, - 0x6d, 0xa1, 0x92, 0x20, 0x62, 0x0d, 0x00, 0x00, + 0xa4, 0xcd, 0x6e, 0x93, 0xd0, 0x96, 0x16, 0x0e, 0x24, 0x82, 0x52, 0x40, 0x48, 0xa9, 0x5b, 0x71, + 0xe0, 0x12, 0x6d, 0xe2, 0xd5, 0xb2, 0xc2, 0xd9, 0xd9, 0xee, 0x8c, 0x2d, 0xa2, 0x10, 0x21, 0x71, + 0x43, 0x08, 0x09, 0x44, 0x85, 0xc4, 0xa1, 0x27, 0x24, 0x3e, 0x01, 0x1f, 0x82, 0x63, 0x05, 0x1c, + 0x38, 0xa2, 0x84, 0x13, 0x9f, 0x02, 0xed, 0xcc, 0x9b, 0xf5, 0x6e, 0xb2, 0xf6, 0xda, 0xa5, 0xea, + 0x29, 0x9a, 0x99, 0xdf, 0x7b, 0xef, 0xf7, 0xfe, 0xec, 0xef, 0xc5, 0xd0, 0xd8, 0xe6, 0x62, 0x87, + 0x0b, 0xc7, 0xe7, 0x3d, 0xa7, 0xb7, 0xbc, 0xe5, 0x49, 0x77, 0xc5, 0xb9, 0xd7, 0xf5, 0xe2, 0x5d, + 0x3b, 0x8a, 0xb9, 0xe4, 0x88, 0xfa, 0xdd, 0xf6, 0x79, 0xcf, 0xa6, 0xf7, 0xfa, 0x22, 0xd9, 0x6c, + 0xb9, 0xc2, 0xd3, 0x60, 0x32, 0x5d, 0x76, 0x22, 0xd7, 0x0f, 0x42, 0x57, 0x06, 0x3c, 0xd4, 0xf6, + 0xf5, 0xb3, 0x3e, 0xe7, 0x7e, 0xc7, 0x73, 0xdc, 0x28, 0x70, 0xdc, 0x30, 0xe4, 0x52, 0x3d, 0x0a, + 0xf3, 0x5a, 0x10, 0x3d, 0x89, 0xa4, 0x5f, 0x5f, 0xd4, 0xaf, 0x9b, 0xea, 0xe4, 0x10, 0x11, 0x75, + 0xb0, 0xae, 0xc1, 0x99, 0xdb, 0x49, 0xe0, 0x8d, 0x98, 0x47, 0x5c, 0xb8, 0x9d, 0x96, 0x77, 0xaf, + 0xeb, 0x09, 0x89, 0xf3, 0x30, 0x1b, 0xd1, 0xd5, 0x66, 0xd0, 0xae, 0xb1, 0x05, 0xd6, 0x9c, 0x6a, + 0x81, 0xb9, 0x7a, 0xbf, 0x6d, 0xdd, 0x86, 0xe7, 0x8e, 0x18, 0x8a, 0x88, 0x87, 0xc2, 0xc3, 0x37, + 0x60, 0xc6, 0xc0, 0x94, 0xd9, 0xec, 0xca, 0x59, 0xfb, 0x78, 0xee, 0x76, 0x6a, 0x97, 0xa2, 0xad, + 0xfb, 0x95, 0x23, 0x3e, 0x85, 0x61, 0xf3, 0x21, 0x3c, 0x95, 0xb2, 0x11, 0xd2, 0x95, 0x5d, 0xa1, + 0x5c, 0xcf, 0xad, 0x58, 0xc3, 0x5c, 0xdf, 0x51, 0xc8, 0xd6, 0x5c, 0x94, 0x3b, 0xa3, 0x0d, 0xd3, + 0x3d, 0x2e, 0xbd, 0xb8, 0x56, 0x59, 0x60, 0xcd, 0xea, 0x7a, 0xed, 0xf7, 0x5f, 0x97, 0xce, 0x90, + 0x97, 0xb5, 0x76, 0x3b, 0xf6, 0x84, 0xb8, 0x23, 0xe3, 0x20, 0xf4, 0x5b, 0x1a, 0x86, 0x57, 0xa1, + 0xda, 0xf6, 0x22, 0x2e, 0x02, 0xc9, 0xe3, 0xda, 0x64, 0x89, 0x4d, 0x1f, 0x8a, 0x37, 0x01, 0xfa, + 0x5d, 0xac, 0x4d, 0xa9, 0x52, 0x9c, 0x37, 0x7c, 0x93, 0x96, 0xdb, 0x7a, 0x3e, 0xa8, 0xe5, 0xf6, + 0x86, 0xeb, 0x7b, 0x94, 0x70, 0x2b, 0x63, 0x69, 0x3d, 0x60, 0xf0, 0xfc, 0xd1, 0xb2, 0x50, 0xad, + 0x6f, 0x40, 0xd5, 0x24, 0x97, 0x54, 0x64, 0xb2, 0xb4, 0xd8, 0x7d, 0x38, 0xbe, 0x97, 0xa3, 0x57, + 0x51, 0xf4, 0x2e, 0x94, 0xd2, 0xd3, 0x81, 0x73, 0xfc, 0xb6, 0xe1, 0x69, 0x45, 0xef, 0x63, 0x2e, + 0xbd, 0x51, 0xc7, 0x67, 0xdc, 0x26, 0x58, 0x6b, 0xf0, 0x4c, 0x26, 0x08, 0xa5, 0x7f, 0x09, 0xa6, + 0x92, 0x57, 0x1a, 0xb3, 0x5a, 0x51, 0xe6, 0x0a, 0xaf, 0x50, 0xd6, 0x17, 0x19, 0x17, 0x62, 0x64, + 0xa2, 0x37, 0x0b, 0xca, 0xf4, 0x28, 0x5d, 0xfc, 0x96, 0x01, 0x66, 0xc3, 0x53, 0x0a, 0x54, 0x07, + 0xd3, 0xbd, 0xc1, 0x39, 0x68, 0xd8, 0xe3, 0xeb, 0xda, 0x15, 0xa2, 0xb3, 0xe1, 0xc6, 0xee, 0x4e, + 0xae, 0x1c, 0xea, 0x62, 0x53, 0xee, 0x46, 0xba, 0xb0, 0xd5, 0xc4, 0x2c, 0xb9, 0xba, 0xbb, 0x1b, + 0x79, 0xd6, 0xbf, 0x0c, 0x9e, 0xcd, 0xd9, 0x51, 0x1e, 0xef, 0xc2, 0xe9, 0x1e, 0x97, 0x41, 0xe8, + 0x6f, 0x6a, 0x30, 0xf5, 0x64, 0x61, 0x40, 0x3e, 0x41, 0xe8, 0x93, 0x83, 0x53, 0xbd, 0xcc, 0x09, + 0x6f, 0xc1, 0x1c, 0x7d, 0x40, 0xc6, 0x8f, 0x4e, 0xf1, 0x95, 0x22, 0x3f, 0xef, 0x68, 0x24, 0x39, + 0x3a, 0xdd, 0xce, 0x1e, 0x71, 0x1d, 0x4e, 0x49, 0xb7, 0xd3, 0xd9, 0x35, 0x7e, 0x26, 0x95, 0x9f, + 0xf9, 0x22, 0x3f, 0x77, 0x13, 0x1c, 0x79, 0x99, 0x95, 0xfd, 0x83, 0x15, 0x52, 0xae, 0x14, 0x68, + 0xe4, 0x99, 0xc9, 0x29, 0x46, 0x65, 0x64, 0xc5, 0xb0, 0x3e, 0x22, 0x31, 0x4e, 0xe3, 0x51, 0x71, + 0xaf, 0xc0, 0x49, 0x02, 0x51, 0x59, 0x5f, 0x1a, 0x52, 0x8e, 0x96, 0xc1, 0x5a, 0x5f, 0xe6, 0xdd, + 0x3d, 0xf9, 0x99, 0xff, 0x89, 0x91, 0xa0, 0xf7, 0x19, 0x50, 0x46, 0xd7, 0x60, 0x86, 0x58, 0x9a, + 0xc9, 0x1f, 0x9a, 0x52, 0x0a, 0x7e, 0x7c, 0xf3, 0x7f, 0x03, 0x5e, 0x50, 0xd4, 0x54, 0xf3, 0x5b, + 0x9e, 0xe8, 0x76, 0xe4, 0x18, 0xbb, 0xaf, 0x76, 0xdc, 0x36, 0xed, 0xd5, 0xb4, 0x1a, 0x21, 0xea, + 0xd4, 0xe0, 0x81, 0x23, 0x3b, 0x8d, 0x5e, 0xf9, 0xb3, 0x0a, 0xd3, 0xca, 0x27, 0xde, 0x67, 0x30, + 0x63, 0xf4, 0x1a, 0x9b, 0x45, 0xe6, 0x45, 0x0b, 0xbb, 0xfe, 0xda, 0x08, 0x48, 0x4d, 0xd1, 0x5a, + 0xfd, 0xea, 0x8f, 0x7f, 0x7e, 0xa8, 0x2c, 0xe1, 0x45, 0xa7, 0xe0, 0xbf, 0x86, 0x74, 0x41, 0x38, + 0x7b, 0x99, 0x22, 0xec, 0xe3, 0xd7, 0x0c, 0xaa, 0xe9, 0x02, 0xc2, 0xf2, 0x68, 0x66, 0xda, 0xea, + 0x8b, 0xa3, 0x40, 0x89, 0xd9, 0x39, 0xc5, 0x6c, 0x1e, 0x5f, 0x1e, 0xca, 0x0c, 0x7f, 0x64, 0x30, + 0x95, 0x88, 0x22, 0xbe, 0x3a, 0xd0, 0x77, 0x66, 0x19, 0xd5, 0xcf, 0x95, 0xa0, 0x28, 0xf8, 0x9a, + 0x0a, 0xfe, 0x26, 0x5e, 0x1f, 0xa3, 0x2c, 0x8e, 0x52, 0x65, 0x67, 0x4f, 0x2d, 0xa9, 0x7d, 0xfc, + 0x9e, 0xc1, 0xb4, 0xd2, 0x77, 0x1c, 0x1e, 0x33, 0x2d, 0xce, 0xf9, 0x32, 0x18, 0x71, 0xbb, 0xae, + 0xb8, 0xad, 0xe2, 0xf2, 0xd8, 0xdc, 0xf0, 0x1b, 0x06, 0x27, 0x48, 0x13, 0x07, 0x47, 0xcb, 0x6d, + 0x81, 0xfa, 0x85, 0x52, 0x1c, 0xd1, 0xba, 0xac, 0x68, 0x2d, 0x62, 0xb3, 0x90, 0x96, 0xc2, 0x3a, + 0x7b, 0x99, 0x85, 0xb2, 0x8f, 0xbf, 0x30, 0x38, 0x49, 0x5f, 0x35, 0x0e, 0x0e, 0x93, 0x17, 0xdc, + 0x7a, 0xb3, 0x1c, 0x48, 0x84, 0x6e, 0x29, 0x42, 0xeb, 0xf8, 0xf6, 0x38, 0x75, 0x32, 0xe2, 0xe2, + 0xec, 0xa5, 0x52, 0xbc, 0x8f, 0x0f, 0x18, 0xcc, 0x18, 0xd9, 0xc2, 0x52, 0x02, 0xa2, 0xfc, 0x33, + 0x3c, 0xaa, 0x81, 0xd6, 0x5b, 0x8a, 0xeb, 0x55, 0x7c, 0xfd, 0x51, 0xb8, 0xe2, 0xcf, 0x0c, 0x66, + 0x33, 0x3a, 0x82, 0x17, 0x07, 0x06, 0x3e, 0xae, 0x70, 0xf5, 0x4b, 0xa3, 0x81, 0xff, 0xcf, 0xf0, + 0x29, 0x59, 0x5b, 0xff, 0xe0, 0xb7, 0x83, 0x06, 0x7b, 0x78, 0xd0, 0x60, 0x7f, 0x1f, 0x34, 0xd8, + 0x77, 0x87, 0x8d, 0x89, 0x87, 0x87, 0x8d, 0x89, 0xbf, 0x0e, 0x1b, 0x13, 0x9f, 0x5c, 0xf6, 0x03, + 0xf9, 0x69, 0x77, 0xcb, 0xde, 0xe6, 0x3b, 0xc6, 0xad, 0xfe, 0xb3, 0x24, 0xda, 0x9f, 0x39, 0x9f, + 0xab, 0x18, 0xc9, 0xc8, 0x08, 0x13, 0x69, 0xeb, 0x84, 0xfa, 0xc5, 0xb2, 0xfa, 0x5f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xb2, 0x31, 0x71, 0x47, 0x6a, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gov/types/query.pb.gw.go b/x/gov/types/v1beta2/query.pb.gw.go similarity index 94% rename from x/gov/types/query.pb.gw.go rename to x/gov/types/v1beta2/query.pb.gw.go index db14e2a204..73fbf22e78 100644 --- a/x/gov/types/query.pb.gw.go +++ b/x/gov/types/v1beta2/query.pb.gw.go @@ -2,11 +2,11 @@ // source: cosmos/gov/v1beta2/query.proto /* -Package types is a reverse proxy. +Package v1beta2 is a reverse proxy. It translates gRPC into RESTful JSON APIs. */ -package types +package v1beta2 import ( "context" @@ -20,7 +20,6 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" ) @@ -31,7 +30,6 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = descriptor.ForMessage -var _ = metadata.Join func request_Query_Proposal_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryProposalRequest @@ -530,14 +528,12 @@ func local_request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Ma // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. -// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. +// Note that using this registration option will cause many gRPC library features (such as grpc.SendHeader, etc) to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { mux.Handle("GET", pattern_Query_Proposal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -545,7 +541,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Proposal_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -559,8 +554,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Proposals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -568,7 +561,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Proposals_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -582,8 +574,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Vote_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -591,7 +581,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Vote_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -605,8 +594,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Votes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -614,7 +601,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Votes_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -628,8 +614,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -637,7 +621,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Params_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -651,8 +634,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Deposit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -660,7 +641,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Deposit_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -674,8 +654,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Deposits_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -683,7 +661,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Deposits_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -697,8 +674,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_TallyResult_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -706,7 +681,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_TallyResult_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) diff --git a/x/gov/types/tally.go b/x/gov/types/v1beta2/tally.go similarity index 99% rename from x/gov/types/tally.go rename to x/gov/types/v1beta2/tally.go index 25d1e35846..e8c5d99410 100644 --- a/x/gov/types/tally.go +++ b/x/gov/types/v1beta2/tally.go @@ -1,4 +1,4 @@ -package types +package v1beta2 import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gov/types/tx.pb.go b/x/gov/types/v1beta2/tx.pb.go similarity index 93% rename from x/gov/types/tx.pb.go rename to x/gov/types/v1beta2/tx.pb.go index c6062c7c82..e211ffac2c 100644 --- a/x/gov/types/tx.pb.go +++ b/x/gov/types/v1beta2/tx.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: cosmos/gov/v1beta2/tx.proto -package types +package v1beta2 import ( context "context" @@ -450,44 +450,44 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta2/tx.proto", fileDescriptor_4214261f6b3f9ed4) } var fileDescriptor_4214261f6b3f9ed4 = []byte{ - // 585 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x8d, 0x9b, 0x7e, 0xfd, 0xb9, 0xfd, 0x94, 0xaa, 0x56, 0x24, 0x1c, 0x17, 0xb9, 0x91, 0x11, - 0x55, 0x24, 0x94, 0x31, 0x09, 0xa8, 0x6c, 0x58, 0xd0, 0xc0, 0xa2, 0x2c, 0x22, 0xc0, 0x95, 0x40, - 0x62, 0x13, 0xec, 0x78, 0x3a, 0x1d, 0x91, 0xf8, 0x5a, 0x9e, 0x49, 0xd4, 0xbc, 0x05, 0xe2, 0x01, - 0x58, 0xf1, 0x08, 0xbc, 0x02, 0x52, 0x97, 0x15, 0x2b, 0x56, 0x08, 0x25, 0x5b, 0x1e, 0x02, 0xc5, - 0x1e, 0xbb, 0xd0, 0xa4, 0x49, 0x17, 0xac, 0xe2, 0xdc, 0x73, 0xce, 0xbd, 0xe7, 0x7a, 0x8e, 0x07, - 0x76, 0xbb, 0x28, 0xfa, 0x28, 0x1c, 0x86, 0x43, 0x67, 0xd8, 0xf0, 0xa9, 0xf4, 0x9a, 0x8e, 0x3c, - 0x23, 0x51, 0x8c, 0x12, 0x75, 0x3d, 0x05, 0x09, 0xc3, 0x21, 0x51, 0xa0, 0x69, 0x29, 0x81, 0xef, - 0x09, 0xaa, 0x14, 0x0d, 0xa7, 0x8b, 0x3c, 0x4c, 0x35, 0xe6, 0xed, 0x39, 0x0d, 0xa7, 0xfa, 0x14, - 0x2d, 0x33, 0x64, 0x98, 0x3c, 0x3a, 0xd3, 0x27, 0x55, 0xad, 0xa4, 0x9a, 0x4e, 0x0a, 0xa8, 0xa1, - 0x0a, 0x62, 0x88, 0xac, 0x47, 0x9d, 0xe4, 0x9f, 0x3f, 0x38, 0x71, 0xbc, 0x70, 0x94, 0x42, 0xf6, - 0x57, 0x0d, 0x76, 0xda, 0x82, 0x1d, 0x0f, 0xfc, 0x3e, 0x97, 0x2f, 0x63, 0x8c, 0x50, 0x78, 0x3d, - 0xfd, 0x3e, 0x6c, 0xf4, 0xa9, 0x10, 0x1e, 0xa3, 0xc2, 0xd0, 0xaa, 0xc5, 0xda, 0x56, 0xb3, 0x4c, - 0xd2, 0x1e, 0x24, 0xeb, 0x41, 0x0e, 0xc3, 0x91, 0x9b, 0xb3, 0xf4, 0x23, 0xd8, 0xe6, 0x21, 0x97, - 0xdc, 0xeb, 0x75, 0x02, 0x1a, 0xa1, 0xe0, 0xd2, 0x58, 0x49, 0x84, 0x15, 0xa2, 0xac, 0x4c, 0x77, - 0x55, 0x2f, 0xa0, 0x41, 0x9e, 0x22, 0x0f, 0x5b, 0xab, 0xe7, 0x3f, 0xf6, 0x0a, 0x6e, 0x49, 0xe9, - 0x9e, 0xa5, 0x32, 0xfd, 0x21, 0x6c, 0x44, 0x89, 0x0f, 0x1a, 0x1b, 0xc5, 0xaa, 0x56, 0xdb, 0x6c, - 0x19, 0xdf, 0xbe, 0xd4, 0xcb, 0xaa, 0xcb, 0x61, 0x10, 0xc4, 0x54, 0x88, 0x63, 0x19, 0xf3, 0x90, - 0xb9, 0x39, 0xd3, 0x7e, 0x0c, 0x95, 0x99, 0x35, 0x5c, 0x2a, 0x22, 0x0c, 0x05, 0xd5, 0xf7, 0x60, - 0x2b, 0x52, 0xb5, 0x0e, 0x0f, 0x0c, 0xad, 0xaa, 0xd5, 0x56, 0x5d, 0xc8, 0x4a, 0xcf, 0x03, 0xfb, - 0xa3, 0x06, 0xeb, 0x6d, 0xc1, 0x5e, 0xa3, 0x5c, 0x4e, 0xd6, 0x09, 0xfc, 0x37, 0x44, 0x49, 0x63, - 0x63, 0x65, 0x89, 0xbb, 0x94, 0xa6, 0x1f, 0xc0, 0x1a, 0x46, 0x92, 0x63, 0x98, 0xac, 0x53, 0x6a, - 0x5a, 0x64, 0x36, 0x11, 0x64, 0x3a, 0xfa, 0x45, 0xc2, 0x72, 0x15, 0xdb, 0xde, 0x81, 0x6d, 0xe5, - 0x29, 0x5b, 0xc4, 0xfe, 0xac, 0xe5, 0xb5, 0x37, 0x94, 0xb3, 0x53, 0x49, 0x83, 0x7f, 0xef, 0xf7, - 0x09, 0xac, 0xa7, 0x0e, 0x84, 0x51, 0x4c, 0x8e, 0x70, 0x7f, 0x9e, 0xe1, 0x6c, 0xfe, 0x1f, 0xc6, - 0x33, 0x99, 0x5d, 0x81, 0x5b, 0x57, 0x5c, 0xe6, 0x1b, 0x7c, 0xd2, 0x00, 0xda, 0x82, 0x65, 0x87, - 0xbd, 0xd4, 0xfc, 0x01, 0x6c, 0xaa, 0x3c, 0xe1, 0xf2, 0x05, 0x2e, 0xa9, 0xfa, 0x23, 0x58, 0xf3, - 0xfa, 0x38, 0x08, 0xa5, 0xda, 0x61, 0x69, 0x0c, 0x15, 0xdd, 0x2e, 0x83, 0x7e, 0xe9, 0x2f, 0xb3, - 0xdd, 0xfc, 0xb5, 0x02, 0xc5, 0xb6, 0x60, 0xfa, 0x09, 0x94, 0xae, 0x7c, 0x2a, 0x77, 0xe7, 0xbd, - 0x9c, 0x99, 0x28, 0x9a, 0xf5, 0x1b, 0xd1, 0xf2, 0xc4, 0x1e, 0xc1, 0x6a, 0x12, 0xc6, 0xdd, 0x6b, - 0x64, 0x53, 0xd0, 0xbc, 0xb3, 0x00, 0xcc, 0x3b, 0xbd, 0x83, 0xff, 0xff, 0x8a, 0xcb, 0x22, 0x51, - 0x46, 0x32, 0xef, 0xdd, 0x80, 0x94, 0x4f, 0x78, 0x05, 0xeb, 0xd9, 0x71, 0x5a, 0xd7, 0xe8, 0x14, - 0x6e, 0xee, 0x2f, 0xc6, 0xb3, 0x96, 0xad, 0xd6, 0xf9, 0xd8, 0xd2, 0x2e, 0xc6, 0x96, 0xf6, 0x73, - 0x6c, 0x69, 0x1f, 0x26, 0x56, 0xe1, 0x62, 0x62, 0x15, 0xbe, 0x4f, 0xac, 0xc2, 0xdb, 0x1a, 0xe3, - 0xf2, 0x74, 0xe0, 0x93, 0x2e, 0xf6, 0xd5, 0x1d, 0xa7, 0x7e, 0xea, 0x22, 0x78, 0xef, 0x9c, 0x25, - 0x37, 0xa6, 0x1c, 0x45, 0x54, 0xf8, 0x6b, 0xc9, 0x4d, 0xf5, 0xe0, 0x77, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xe7, 0x3b, 0xf1, 0xb1, 0x9d, 0x05, 0x00, 0x00, + // 588 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0x8e, 0x9b, 0xfe, 0xfa, 0x67, 0xfa, 0x53, 0xab, 0x5a, 0x91, 0x70, 0x5c, 0xe4, 0x46, 0x46, + 0x54, 0x91, 0x50, 0xd6, 0x4d, 0x40, 0xe5, 0xc2, 0x81, 0x06, 0x0e, 0x05, 0x29, 0x02, 0x5c, 0x09, + 0x24, 0x2e, 0xc1, 0x8e, 0xb7, 0xdb, 0x15, 0x89, 0xc7, 0xf2, 0x6e, 0xa2, 0xe6, 0x2d, 0x10, 0x0f, + 0xc0, 0x89, 0x47, 0xe0, 0x15, 0x90, 0x7a, 0xac, 0x38, 0x71, 0x42, 0x28, 0xb9, 0xf2, 0x10, 0x28, + 0xf6, 0xda, 0x85, 0x26, 0x4d, 0x7a, 0xe0, 0x94, 0xcd, 0x7c, 0xdf, 0x37, 0xf3, 0xcd, 0xee, 0x78, + 0x60, 0xa7, 0x83, 0xa2, 0x87, 0xc2, 0x61, 0x38, 0x70, 0x06, 0x75, 0x9f, 0x4a, 0xaf, 0xe1, 0xc8, + 0x33, 0x12, 0xc5, 0x28, 0x51, 0xd7, 0x53, 0x90, 0x30, 0x1c, 0x10, 0x05, 0x9a, 0x96, 0x12, 0xf8, + 0x9e, 0xa0, 0x4a, 0x51, 0x77, 0x3a, 0xc8, 0xc3, 0x54, 0x63, 0xde, 0x9e, 0x91, 0x70, 0xa2, 0x4f, + 0xd1, 0x12, 0x43, 0x86, 0xc9, 0xd1, 0x99, 0x9c, 0x54, 0xb4, 0x9c, 0x6a, 0xda, 0x29, 0xa0, 0x8a, + 0x2a, 0x88, 0x21, 0xb2, 0x2e, 0x75, 0x92, 0x7f, 0x7e, 0xff, 0xc4, 0xf1, 0xc2, 0x61, 0x0a, 0xd9, + 0x5f, 0x35, 0xd8, 0x6e, 0x09, 0x76, 0xdc, 0xf7, 0x7b, 0x5c, 0xbe, 0x8c, 0x31, 0x42, 0xe1, 0x75, + 0xf5, 0x7d, 0x58, 0xeb, 0x51, 0x21, 0x3c, 0x46, 0x85, 0xa1, 0x55, 0x8a, 0xd5, 0x8d, 0x46, 0x89, + 0xa4, 0x39, 0x48, 0x96, 0x83, 0x1c, 0x86, 0x43, 0x37, 0x67, 0xe9, 0x47, 0xb0, 0xc5, 0x43, 0x2e, + 0xb9, 0xd7, 0x6d, 0x07, 0x34, 0x42, 0xc1, 0xa5, 0xb1, 0x94, 0x08, 0xcb, 0x44, 0x59, 0x99, 0xf4, + 0xaa, 0x2e, 0xa0, 0x4e, 0x9e, 0x20, 0x0f, 0x9b, 0xcb, 0xe7, 0x3f, 0x76, 0x0b, 0xee, 0xa6, 0xd2, + 0x3d, 0x4d, 0x65, 0xfa, 0x03, 0x58, 0x8b, 0x12, 0x1f, 0x34, 0x36, 0x8a, 0x15, 0xad, 0xba, 0xde, + 0x34, 0xbe, 0x7d, 0xa9, 0x95, 0x54, 0x96, 0xc3, 0x20, 0x88, 0xa9, 0x10, 0xc7, 0x32, 0xe6, 0x21, + 0x73, 0x73, 0xa6, 0xfd, 0x08, 0xca, 0x53, 0x6d, 0xb8, 0x54, 0x44, 0x18, 0x0a, 0xaa, 0xef, 0xc2, + 0x46, 0xa4, 0x62, 0x6d, 0x1e, 0x18, 0x5a, 0x45, 0xab, 0x2e, 0xbb, 0x90, 0x85, 0x9e, 0x05, 0xf6, + 0x47, 0x0d, 0x56, 0x5b, 0x82, 0xbd, 0x46, 0xb9, 0x98, 0xac, 0x13, 0xf8, 0x6f, 0x80, 0x92, 0xc6, + 0xc6, 0xd2, 0x02, 0x77, 0x29, 0x4d, 0x3f, 0x80, 0x15, 0x8c, 0x24, 0xc7, 0x30, 0x69, 0x67, 0xb3, + 0x61, 0x91, 0xe9, 0x89, 0x20, 0x93, 0xd2, 0x2f, 0x12, 0x96, 0xab, 0xd8, 0xf6, 0x36, 0x6c, 0x29, + 0x4f, 0x59, 0x23, 0xf6, 0x67, 0x2d, 0x8f, 0xbd, 0xa1, 0x9c, 0x9d, 0x4a, 0x1a, 0xfc, 0x7b, 0xbf, + 0x8f, 0x61, 0x35, 0x75, 0x20, 0x8c, 0x62, 0xf2, 0x84, 0x7b, 0xb3, 0x0c, 0x67, 0xf5, 0xff, 0x30, + 0x9e, 0xc9, 0xec, 0x32, 0xdc, 0xba, 0xe2, 0x32, 0xef, 0xe0, 0x93, 0x06, 0xd0, 0x12, 0x2c, 0x7b, + 0xec, 0x85, 0xe6, 0x0f, 0x60, 0x5d, 0xcd, 0x13, 0x2e, 0x6e, 0xe0, 0x92, 0xaa, 0x3f, 0x84, 0x15, + 0xaf, 0x87, 0xfd, 0x50, 0xaa, 0x1e, 0x16, 0x8e, 0xa1, 0xa2, 0xdb, 0x25, 0xd0, 0x2f, 0xfd, 0x65, + 0xb6, 0x1b, 0xbf, 0x96, 0xa0, 0xd8, 0x12, 0x4c, 0x3f, 0x81, 0xcd, 0x2b, 0x9f, 0xca, 0xdd, 0x59, + 0x97, 0x33, 0x35, 0x8a, 0x66, 0xed, 0x46, 0xb4, 0x7c, 0x62, 0x8f, 0x60, 0x39, 0x19, 0xc6, 0x9d, + 0x6b, 0x64, 0x13, 0xd0, 0xbc, 0x33, 0x07, 0xcc, 0x33, 0xbd, 0x83, 0xff, 0xff, 0x1a, 0x97, 0x79, + 0xa2, 0x8c, 0x64, 0xde, 0xbb, 0x01, 0x29, 0xaf, 0xf0, 0x0a, 0x56, 0xb3, 0xe7, 0xb4, 0xae, 0xd1, + 0x29, 0xdc, 0xdc, 0x9b, 0x8f, 0x67, 0x29, 0x9b, 0xcf, 0xcf, 0x47, 0x96, 0x76, 0x31, 0xb2, 0xb4, + 0x9f, 0x23, 0x4b, 0xfb, 0x30, 0xb6, 0x0a, 0x17, 0x63, 0xab, 0xf0, 0x7d, 0x6c, 0x15, 0xde, 0xee, + 0x33, 0x2e, 0x4f, 0xfb, 0x3e, 0xe9, 0x60, 0x4f, 0xed, 0x38, 0xf5, 0x53, 0x13, 0xc1, 0x7b, 0xe7, + 0x2c, 0xd9, 0x98, 0x72, 0x18, 0x51, 0x91, 0xed, 0x4d, 0x7f, 0x25, 0xd9, 0x58, 0xf7, 0x7f, 0x07, + 0x00, 0x00, 0xff, 0xff, 0x86, 0xf2, 0x34, 0xac, 0xa5, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gov/types/vote.go b/x/gov/types/v1beta2/vote.go similarity index 99% rename from x/gov/types/vote.go rename to x/gov/types/v1beta2/vote.go index 4b83d3ac32..4873f5ec91 100644 --- a/x/gov/types/vote.go +++ b/x/gov/types/v1beta2/vote.go @@ -1,4 +1,4 @@ -package types +package v1beta2 import ( "fmt"