From 163db7b7a99ce26c0a6aeef561aca1a2e94b6ca6 Mon Sep 17 00:00:00 2001 From: blushi Date: Wed, 10 Nov 2021 11:39:05 +0100 Subject: [PATCH 1/2] Fix authz cli tests --- x/authz/client/testutil/tx.go | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/x/authz/client/testutil/tx.go b/x/authz/client/testutil/tx.go index dad4da9cdfa1..5ef3bb34d682 100644 --- a/x/authz/client/testutil/tx.go +++ b/x/authz/client/testutil/tx.go @@ -14,9 +14,12 @@ import ( clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" + auth "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/authz/client/cli" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil" bank "github.com/cosmos/cosmos-sdk/x/bank/types" + govcli "github.com/cosmos/cosmos-sdk/x/gov/client/cli" + govtestutil "github.com/cosmos/cosmos-sdk/x/gov/client/testutil" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingcli "github.com/cosmos/cosmos-sdk/x/staking/client/cli" ) @@ -50,6 +53,14 @@ func (s *IntegrationTestSuite) SetupSuite() { _, err = s.network.WaitForHeight(1) s.Require().NoError(err) + // create a proposal with deposit + govAcc, err := s.cfg.AccountRetriever.GetAccount(val.ClientCtx, auth.NewModuleAddress(govtypes.ModuleName)) + s.Require().NoError(err) + proposal := []sdk.Msg{govtypes.NewMsgSignal("test_title", "test_description", govAcc.GetAddress())} + _, err = govtestutil.MsgSubmitProposal(s.T(), val.ClientCtx, val.Address.String(), proposal, + fmt.Sprintf("--%s=%s", govcli.FlagDeposit, sdk.NewCoin(s.cfg.BondDenom, govtypes.DefaultMinDepositTokens).String())) + s.Require().NoError(err) + // Create new account in the keyring. s.grantee[1] = s.createAccount("grantee2") // Send some funds to the new account. @@ -497,15 +508,10 @@ func (s *IntegrationTestSuite) TestExecAuthorizationWithExpiration() { }, ) s.Require().NoError(err) - // msg vote - tokens := sdk.NewCoins( - sdk.NewCoin("stake", sdk.NewInt(50)), - ) - // msg undelegate - undelegateTx := fmt.Sprintf(`{"body":{"messages":[{"@type":"/cosmos.staking.v1beta1.MsgUndelegate","delegator_address":"%s","validator_address":"%s","amount":{"denom":"%s","amount":"%s"}}],"memo":"","timeout_height":"0","extension_options":[],"non_critical_extension_options":[]},"auth_info":{"signer_infos":[],"fee":{"amount":[],"gas_limit":"250000","payer":"","granter":""}},"signatures":[]}`, val.Address.String(), val.ValAddress.String(), - tokens.GetDenomByIndex(0), tokens[0].Amount) - execMsg := testutil.WriteToNewTempFile(s.T(), undelegateTx) + // msg vote + voteTx := fmt.Sprintf(`{"body":{"messages":[{"@type":"/cosmos.gov.v1.MsgVote","proposal_id":"1","voter":"%s","option":"VOTE_OPTION_YES"}],"memo":"","timeout_height":"0","extension_options":[],"non_critical_extension_options":[]},"auth_info":{"signer_infos":[],"fee":{"amount":[],"gas_limit":"200000","payer":"","granter":""}},"signatures":[]}`, val.Address.String()) + execMsg := testutil.WriteToNewTempFile(s.T(), voteTx) // waiting for authorization to expires time.Sleep(12 * time.Second) @@ -517,7 +523,7 @@ func (s *IntegrationTestSuite) TestExecAuthorizationWithExpiration() { execMsg.Name(), fmt.Sprintf("--%s=%s", flags.FlagFrom, grantee.String()), 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()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(11))).String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), }) s.Require().NoError(err) @@ -544,15 +550,9 @@ func (s *IntegrationTestSuite) TestNewExecGenericAuthorized() { ) s.Require().NoError(err) - tokens := sdk.NewCoins( - sdk.NewCoin("stake", sdk.NewInt(50)), - ) - - // msg undelegate - undelegateTx := fmt.Sprintf(`{"body":{"messages":[{"@type":"/cosmos.staking.v1beta1.MsgUndelegate","delegator_address":"%s","validator_address":"%s","amount":{"denom":"%s","amount":"%s"}}],"memo":"","timeout_height":"0","extension_options":[],"non_critical_extension_options":[]},"auth_info":{"signer_infos":[],"fee":{"amount":[],"gas_limit":"250000","payer":"","granter":""}},"signatures":[]}`, val.Address.String(), val.ValAddress.String(), - tokens.GetDenomByIndex(0), tokens[0].Amount) - - execMsg := testutil.WriteToNewTempFile(s.T(), undelegateTx) + // msg vote + voteTx := fmt.Sprintf(`{"body":{"messages":[{"@type":"/cosmos.gov.v1.MsgVote","proposal_id":"1","voter":"%s","option":"VOTE_OPTION_YES"}],"memo":"","timeout_height":"0","extension_options":[],"non_critical_extension_options":[]},"auth_info":{"signer_infos":[],"fee":{"amount":[],"gas_limit":"200000","payer":"","granter":""}},"signatures":[]}`, val.Address.String()) + execMsg := testutil.WriteToNewTempFile(s.T(), voteTx) testCases := []struct { name string From 02dd544e440050a6c430900a668749c08e5ed408 Mon Sep 17 00:00:00 2001 From: blushi Date: Wed, 10 Nov 2021 11:41:02 +0100 Subject: [PATCH 2/2] Fix typo --- x/authz/client/testutil/tx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/authz/client/testutil/tx.go b/x/authz/client/testutil/tx.go index 5ef3bb34d682..f63e912af4c0 100644 --- a/x/authz/client/testutil/tx.go +++ b/x/authz/client/testutil/tx.go @@ -523,7 +523,7 @@ func (s *IntegrationTestSuite) TestExecAuthorizationWithExpiration() { execMsg.Name(), fmt.Sprintf("--%s=%s", flags.FlagFrom, grantee.String()), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(11))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), }) s.Require().NoError(err)