test(gov): Remove simapp references from module tests and simulatio…

…ns (cosmos#13043)

## Description

0 occurences of "simapp" in x/gov.

closes: cosmos#12752

- [x] Move some x/gov module tests (those in x/gov root folder) to tests/integration, as they rely on a new module x/distribution
- [x] convert rest of x/gov module tests to use depinject
- [x] remove simapp references from x/gov/simulations
- [x] 0 occurences of "simapp" in x/gov



---

### 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/main/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/main/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/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)

simapp/params/weights.go

@@ -4,9 +4,6 @@ package params
 const (
  DefaultWeightMsgSend int = 100
  DefaultWeightMsgMultiSend int = 10
- DefaultWeightMsgDeposit int = 100
- DefaultWeightMsgVote int = 67
- DefaultWeightMsgVoteWeighted int = 33
  DefaultWeightMsgCreateValidator int = 100
  DefaultWeightMsgEditValidator int = 5
  DefaultWeightMsgDelegate int = 100

tests/integration/gov/common_test.go

@@ -0,0 +1,29 @@
+package gov_test
+
+import (
+ "testing"
+
+ "cosmossdk.io/math"
+ sdk "github.com/cosmos/cosmos-sdk/types"
+ authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+ "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"
+ stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+ "github.com/stretchr/testify/require"
+)
+
+var (
+ valTokens = sdk.TokensFromConsensusPower(42, sdk.DefaultPowerReduction)
+ TestProposal = v1beta1.NewTextProposal("Test", "description")
+ TestDescription = stakingtypes.NewDescription("T", "E", "S", "T", "Z")
+ TestCommissionRates = stakingtypes.NewCommissionRates(math.LegacyZeroDec(), math.LegacyZeroDec(), math.LegacyZeroDec())
+)
+
+// mkTestLegacyContent creates a MsgExecLegacyContent for testing purposes.
+func mkTestLegacyContent(t *testing.T) *v1.MsgExecLegacyContent {
+ msgContent, err := v1.NewLegacyContent(TestProposal, authtypes.NewModuleAddress(types.ModuleName).String())
+ require.NoError(t, err)
+
+ return msgContent
+}

tests/integration/gov/genesis_test.go

@@ -0,0 +1,159 @@
+package gov_test
+
+import (
+ "encoding/json"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+ abci "github.com/tendermint/tendermint/abci/types"
+ tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+
+ "github.com/cosmos/cosmos-sdk/codec"
+ "github.com/cosmos/cosmos-sdk/runtime"
+ "github.com/cosmos/cosmos-sdk/testutil/configurator"
+ simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
+ sdk "github.com/cosmos/cosmos-sdk/types"
+ _ "github.com/cosmos/cosmos-sdk/x/auth"
+ authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+ authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+ _ "github.com/cosmos/cosmos-sdk/x/bank"
+ bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+ banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+ _ "github.com/cosmos/cosmos-sdk/x/distribution"
+ distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
+ distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+ "github.com/cosmos/cosmos-sdk/x/gov"
+ "github.com/cosmos/cosmos-sdk/x/gov/keeper"
+ "github.com/cosmos/cosmos-sdk/x/gov/types"
+ v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
+ _ "github.com/cosmos/cosmos-sdk/x/params"
+ _ "github.com/cosmos/cosmos-sdk/x/staking"
+ stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+ stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+)
+
+type suite struct {
+ cdc codec.Codec
+ app *runtime.App
+ AccountKeeper authkeeper.AccountKeeper
+ BankKeeper bankkeeper.Keeper
+ DistrKeeper distrkeeper.Keeper
+ GovKeeper *keeper.Keeper
+ StakingKeeper *stakingkeeper.Keeper
+ appBuilder *runtime.AppBuilder
+}
+
+var appConfig = configurator.NewAppConfig(
+ configurator.ParamsModule(),
+ configurator.AuthModule(),
+ configurator.StakingModule(),
+ configurator.BankModule(),
+ configurator.GovModule(),
+ configurator.DistributionModule(),
+ configurator.MintModule(),
+)
+
+func TestImportExportQueues(t *testing.T) {
+ var err error
+
+ s1 := suite{}
+ s1.app, err = simtestutil.SetupWithConfiguration(
+ appConfig,
+ simtestutil.DefaultStartUpConfig(),
+ &s1.AccountKeeper, &s1.BankKeeper, &s1.DistrKeeper, &s1.GovKeeper, &s1.StakingKeeper, &s1.cdc, &s1.appBuilder,
+ )
+ require.NoError(t, err)
+
+ ctx := s1.app.BaseApp.NewContext(false, tmproto.Header{})
+ addrs := simtestutil.AddTestAddrs(s1.BankKeeper, s1.StakingKeeper, ctx, 1, valTokens)
+
+ header := tmproto.Header{Height: s1.app.LastBlockHeight() + 1}
+ s1.app.BeginBlock(abci.RequestBeginBlock{Header: header})
+
+ ctx = s1.app.BaseApp.NewContext(false, tmproto.Header{})
+ // Create two proposals, put the second into the voting period
+ proposal1, err := s1.GovKeeper.SubmitProposal(ctx, []sdk.Msg{mkTestLegacyContent(t)}, "")
+ require.NoError(t, err)
+ proposalID1 := proposal1.Id
+
+ proposal2, err := s1.GovKeeper.SubmitProposal(ctx, []sdk.Msg{mkTestLegacyContent(t)}, "")
+ require.NoError(t, err)
+ proposalID2 := proposal2.Id
+
+ votingStarted, err := s1.GovKeeper.AddDeposit(ctx, proposalID2, addrs[0], s1.GovKeeper.GetParams(ctx).MinDeposit)
+ require.NoError(t, err)
+ require.True(t, votingStarted)
+
+ proposal1, ok := s1.GovKeeper.GetProposal(ctx, proposalID1)
+ require.True(t, ok)
+ proposal2, ok = s1.GovKeeper.GetProposal(ctx, proposalID2)
+ require.True(t, ok)
+ require.True(t, proposal1.Status == v1.StatusDepositPeriod)
+ require.True(t, proposal2.Status == v1.StatusVotingPeriod)
+
+ authGenState := s1.AccountKeeper.ExportGenesis(ctx)
+ bankGenState := s1.BankKeeper.ExportGenesis(ctx)
+ stakingGenState := s1.StakingKeeper.ExportGenesis(ctx)
+ distributionGenState := s1.DistrKeeper.ExportGenesis(ctx)
+
+ // export the state and import it into a new app
+ govGenState := gov.ExportGenesis(ctx, s1.GovKeeper)
+ genesisState := s1.appBuilder.DefaultGenesis()
+
+ genesisState[authtypes.ModuleName] = s1.cdc.MustMarshalJSON(authGenState)
+ genesisState[banktypes.ModuleName] = s1.cdc.MustMarshalJSON(bankGenState)
+ genesisState[types.ModuleName] = s1.cdc.MustMarshalJSON(govGenState)
+ genesisState[stakingtypes.ModuleName] = s1.cdc.MustMarshalJSON(stakingGenState)
+ genesisState[distributiontypes.ModuleName] = s1.cdc.MustMarshalJSON(distributionGenState)
+
+ stateBytes, err := json.MarshalIndent(genesisState, "", " ")
+ require.NoError(t, err)
+
+ s2 := suite{}
+ s2.app, err = simtestutil.SetupWithConfiguration(
+ appConfig,
+ simtestutil.DefaultStartUpConfig(),
+ &s2.AccountKeeper, &s2.BankKeeper, &s2.DistrKeeper, &s2.GovKeeper, &s2.StakingKeeper, &s2.cdc, &s2.appBuilder,
+ )
+ require.NoError(t, err)
+
+ s2.app.InitChain(
+ abci.RequestInitChain{
+ Validators: []abci.ValidatorUpdate{},
+ ConsensusParams: simtestutil.DefaultConsensusParams,
+ AppStateBytes: stateBytes,
+ },
+ )
+
+ s2.app.Commit()
+ s2.app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: s2.app.LastBlockHeight() + 1}})
+
+ header = tmproto.Header{Height: s2.app.LastBlockHeight() + 1}
+ s2.app.BeginBlock(abci.RequestBeginBlock{Header: header})
+
+ ctx2 := s2.app.BaseApp.NewContext(false, tmproto.Header{})
+
+ // Jump the time forward past the DepositPeriod and VotingPeriod
+ ctx2 = ctx2.WithBlockTime(ctx2.BlockHeader().Time.Add(*s2.GovKeeper.GetParams(ctx2).MaxDepositPeriod).Add(*s2.GovKeeper.GetParams(ctx2).VotingPeriod))
+
+ // Make sure that they are still in the DepositPeriod and VotingPeriod respectively
+ proposal1, ok = s2.GovKeeper.GetProposal(ctx2, proposalID1)
+ require.True(t, ok)
+ proposal2, ok = s2.GovKeeper.GetProposal(ctx2, proposalID2)
+ require.True(t, ok)
+ require.True(t, proposal1.Status == v1.StatusDepositPeriod)
+ require.True(t, proposal2.Status == v1.StatusVotingPeriod)
+
+ macc := s2.GovKeeper.GetGovernanceAccount(ctx2)
+ require.Equal(t, sdk.Coins(s2.GovKeeper.GetParams(ctx2).MinDeposit), s2.BankKeeper.GetAllBalances(ctx2, macc.GetAddress()))
+
+ // Run the endblocker. Check to make sure that proposal1 is removed from state, and proposal2 is finished VotingPeriod.
+ gov.EndBlocker(ctx2, s2.GovKeeper)
+
+ proposal1, ok = s2.GovKeeper.GetProposal(ctx2, proposalID1)
+ require.False(t, ok)
+
+ proposal2, ok = s2.GovKeeper.GetProposal(ctx2, proposalID2)
+ require.True(t, ok)
+ require.True(t, proposal2.Status == v1.StatusRejected)
+}

testutil/configurator/configurator.go

@@ -9,6 +9,7 @@ import (
  feegrantmodulev1 "cosmossdk.io/api/cosmos/feegrant/module/v1"
  genutilmodulev1 "cosmossdk.io/api/cosmos/genutil/module/v1"
  govmodulev1 "cosmossdk.io/api/cosmos/gov/module/v1"
+ mintmodulev1 "cosmossdk.io/api/cosmos/mint/module/v1"
  paramsmodulev1 "cosmossdk.io/api/cosmos/params/module/v1"
  slashingmodulev1 "cosmossdk.io/api/cosmos/slashing/module/v1"
  stakingmodulev1 "cosmossdk.io/api/cosmos/staking/module/v1"
@@ -197,6 +198,21 @@ func GovModule() ModuleOption {
  }
 }
 
+func MintModule() ModuleOption {
+ return func(config *appConfig) {
+ config.moduleConfigs["mint"] = &appv1alpha1.ModuleConfig{
+ Name: "mint",
+ Config: appconfig.WrapAny(&mintmodulev1.Module{}),
+ GolangBindings: []*appv1alpha1.GolangBinding{
+ {
+ InterfaceType: "github.com/cosmos/cosmos-sdk/x/mint/types/types.StakingKeeper",
+ Implementation: "github.com/cosmos/cosmos-sdk/x/staking/keeper/*keeper.Keeper",
+ },
+ },
+ }
+ }
+}
+
 func OmitInitGenesis() ModuleOption {
  return func(config *appConfig) {
  config.setInitGenesis = false

testutil/sims/weights.go

@@ -8,9 +8,6 @@ const (
  DefaultWeightMsgWithdrawDelegationReward int = 50
  DefaultWeightMsgWithdrawValidatorCommission int = 50
  DefaultWeightMsgFundCommunityPool int = 50
- DefaultWeightMsgDeposit int = 100
- DefaultWeightMsgVote int = 67
- DefaultWeightMsgVoteWeighted int = 33
  DefaultWeightMsgUnjail int = 100
  DefaultWeightMsgCreateValidator int = 100
  DefaultWeightMsgEditValidator int = 5

x/auth/client/testutil/suite.go

@@ -1566,10 +1566,7 @@ func (s *IntegrationTestSuite) TestSignWithMultiSignersAminoJSON() {
  require.Equal(sdk.NewCoins(val0Coin, val1Coin), queryRes.Balances)
 }
 
-// TODO to re-enable in #12274
 func (s *IntegrationTestSuite) TestAuxSigner() {
- s.T().Skip()
-
  require := s.Require()
  val := s.network.Validators[0]
  val0Coin := sdk.NewCoin(fmt.Sprintf("%stoken", val.Moniker), sdk.NewInt(10))

x/feegrant/client/testutil/suite.go

@@ -713,8 +713,6 @@ func (s *IntegrationTestSuite) TestNewCmdRevokeFeegrant() {
 }
 
 func (s *IntegrationTestSuite) TestTxWithFeeGrant() {
- s.T().Skip() // TODO to re-enable in #12274
-
  val := s.network.Validators[0]
  clientCtx := val.ClientCtx
  granter := val.Address
@@ -804,8 +802,6 @@ func (s *IntegrationTestSuite) TestTxWithFeeGrant() {
 }
 
 func (s *IntegrationTestSuite) TestFilteredFeeAllowance() {
- s.T().Skip() // TODO to re-enable in #12274
-
  val := s.network.Validators[0]
 
  granter := val.Address