-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into facu/distr-mocks
- Loading branch information
Showing
26 changed files
with
578 additions
and
271 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| --- | ||
| name: Epic | ||
| about: Create an epic/user | ||
|
|
||
| --- | ||
|
|
||
| <!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺ | ||
| v ✰ Thanks for opening an issue! ✰ | ||
| v Before smashing the submit button please review the template. | ||
| v Word of caution: poorly thought-out proposals may be rejected | ||
| v without deliberation | ||
| ☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > --> | ||
|
|
||
| ## Summary | ||
|
|
||
| <!-- Short, concise description of the proposed feature/changes to the repository | ||
| What are the user needs? | ||
| How could this solution fix the user facing problem? --> | ||
|
|
||
| ## Problem Definition | ||
|
|
||
| <!-- Why do we need this feature? | ||
| What problems may be addressed by introducing this feature? | ||
| What benefits does the SDK stand to gain by including this feature? | ||
| Are there any disadvantages of including this feature? --> | ||
|
|
||
| ## Work Breakdown | ||
|
|
||
| <!-- Break the work into many bullet points that will later be turned into issues that can be assigned to developers to work on | ||
| This work may been to be broken up into phases of work in order to better organize when and how things get done. --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.