fix: --max-msgs with generate-only should not throw error
#10842
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
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 |
|---|---|---|
| @@ -1,21 +1,19 @@ | ||
| package testutil | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/suite" | ||
| ) | ||
|
|
||
| func TestIntegrationTestSuite(t *testing.T) { | ||
| suite.Run(t, new(IntegrationTestSuite)) | ||
| } | ||
|
|
||
| func TestGRPCQueryTestSuite(t *testing.T) { | ||
| suite.Run(t, new(GRPCQueryTestSuite)) | ||
| } | ||
|
|
||
| func TestWithdrawAllSuite(t *testing.T) { | ||
| suite.Run(t, new(WithdrawAllTestSuite)) | ||
| } | ||
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,123 @@ | ||
| package testutil | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/client/flags" | ||
| "github.com/cosmos/cosmos-sdk/crypto/hd" | ||
| "github.com/cosmos/cosmos-sdk/crypto/keyring" | ||
| clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" | ||
| "github.com/cosmos/cosmos-sdk/testutil/network" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| banktestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil" | ||
| "github.com/cosmos/cosmos-sdk/x/distribution/client/cli" | ||
| stakingcli "github.com/cosmos/cosmos-sdk/x/staking/client/cli" | ||
| "github.com/stretchr/testify/suite" | ||
| ) | ||
|
|
||
| type WithdrawAllTestSuite struct { | ||
| suite.Suite | ||
|
|
||
| cfg network.Config | ||
| network *network.Network | ||
| } | ||
|
|
||
| func (s *WithdrawAllTestSuite) SetupSuite() { | ||
| cfg := network.DefaultConfig() | ||
| cfg.NumValidators = 2 | ||
| s.cfg = cfg | ||
|
|
||
| s.T().Log("setting up integration test suite") | ||
| network, err := network.New(s.T(), s.T().TempDir(), s.cfg) | ||
| s.Require().NoError(err) | ||
| s.network = network | ||
|
|
||
| _, err = s.network.WaitForHeight(1) | ||
| s.Require().NoError(err) | ||
| } | ||
|
|
||
| // TearDownSuite cleans up the curret test network after _each_ test. | ||
| func (s *WithdrawAllTestSuite) TearDownSuite() { | ||
| s.T().Log("tearing down integration test suite") | ||
| s.network.Cleanup() | ||
| } | ||
|
|
||
| // This test requires multiple validators, if I add this test to `IntegrationTestSuite` by increasing | ||
| // `NumValidators` the existing tests are leading to non-determnism so created new suite for this test. | ||
| func (s *WithdrawAllTestSuite) TestNewWithdrawAllRewardsGenerateOnly() { | ||
| require := s.Require() | ||
| val := s.network.Validators[0] | ||
| val1 := s.network.Validators[1] | ||
| clientCtx := val.ClientCtx | ||
|
|
||
| info, _, err := val.ClientCtx.Keyring.NewMnemonic("newAccount", keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, hd.Secp256k1) | ||
| require.NoError(err) | ||
|
|
||
| pubkey, err := info.GetPubKey() | ||
| require.NoError(err) | ||
|
|
||
| newAddr := sdk.AccAddress(pubkey.Address()) | ||
| _, err = banktestutil.MsgSendExec( | ||
| val.ClientCtx, | ||
| val.Address, | ||
| newAddr, | ||
| sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(2000))), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), | ||
| fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), | ||
| fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), | ||
| ) | ||
| require.NoError(err) | ||
|
|
||
| // delegate 500 tokens to validator1 | ||
| args := []string{ | ||
| val.ValAddress.String(), | ||
| sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(500)).String(), | ||
| fmt.Sprintf("--%s=%s", flags.FlagFrom, newAddr.String()), | ||
| fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), | ||
| fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), | ||
| fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), | ||
| } | ||
| cmd := stakingcli.NewDelegateCmd() | ||
| _, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args) | ||
| require.NoError(err) | ||
|
|
||
| // delegate 500 tokens to validator2 | ||
| args = []string{ | ||
| val1.ValAddress.String(), | ||
| sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(500)).String(), | ||
| fmt.Sprintf("--%s=%s", flags.FlagFrom, newAddr.String()), | ||
| fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), | ||
| fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), | ||
| fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), | ||
| } | ||
| _, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args) | ||
| require.NoError(err) | ||
|
|
||
| args = []string{ | ||
| fmt.Sprintf("--%s=%s", flags.FlagFrom, newAddr.String()), | ||
| fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), | ||
| fmt.Sprintf("--%s=true", flags.FlagGenerateOnly), | ||
| fmt.Sprintf("--%s=1", cli.FlagMaxMessagesPerTx), | ||
| fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), | ||
| fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), | ||
| } | ||
| cmd = cli.NewWithdrawAllRewardsCmd() | ||
| out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, args) | ||
| require.NoError(err) | ||
| // expect 2 transactions in the generated file when --max-msgs in a tx set 1. | ||
| s.Require().Equal(2, len(strings.Split(strings.Trim(out.String(), "\n"), "\n"))) | ||
|
|
||
| args = []string{ | ||
| fmt.Sprintf("--%s=%s", flags.FlagFrom, newAddr.String()), | ||
| fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), | ||
| fmt.Sprintf("--%s=true", flags.FlagGenerateOnly), | ||
| fmt.Sprintf("--%s=2", cli.FlagMaxMessagesPerTx), | ||
| fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), | ||
| fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), | ||
| } | ||
| cmd = cli.NewWithdrawAllRewardsCmd() | ||
| out, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args) | ||
| require.NoError(err) | ||
| // expect 1 transaction in the generated file when --max-msgs in a tx set 2, since there are only delegations. | ||
| s.Require().Equal(1, len(strings.Split(strings.Trim(out.String(), "\n"), "\n"))) | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added a new suite here, since there are few tests are failing if I change
NumValidators = 2in existing integration suite (seems like non-determinism) and couldn't test them on local machine since the tests are keep on throwing timeout error.