From 2df36aa774de823eb73a9a114cf7307f45c4a7b3 Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Wed, 31 Jan 2024 14:12:15 -0700 Subject: [PATCH] move file locations --- tests/e2e/auth/vesting/suite.go | 30 +++-------- .../e2e/auth/vesting}/testdata/badjson | 0 .../e2e/auth/vesting}/testdata/badperiod.json | 2 +- .../e2e/auth/vesting}/testdata/periods1.json | 0 tests/e2e/gov/query.go | 50 +++++++++---------- x/bank/module.go | 2 - 6 files changed, 34 insertions(+), 50 deletions(-) rename {x/auth/vesting/client/testutil => tests/e2e/auth/vesting}/testdata/badjson (100%) rename {x/auth/vesting/client/testutil => tests/e2e/auth/vesting}/testdata/badperiod.json (98%) rename {x/auth/vesting/client/testutil => tests/e2e/auth/vesting}/testdata/periods1.json (100%) diff --git a/tests/e2e/auth/vesting/suite.go b/tests/e2e/auth/vesting/suite.go index bfb6b2d141ff..7afeb95604b0 100644 --- a/tests/e2e/auth/vesting/suite.go +++ b/tests/e2e/auth/vesting/suite.go @@ -13,20 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli" ) -const periods = `{ - "start_time": 1625204910, - "periods": [ - { - "coins": "10stake", - "length": 2592000 - }, - { - "coins": "10stake", - "length":2592000 - } - ] -}` - type E2ETestSuite struct { suite.Suite @@ -248,8 +234,8 @@ func (s *E2ETestSuite) TestNewMsgCreateClawbackVestingAccountCmd() { args: []string{ sdk.AccAddress("addr10______________").String(), fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address), - fmt.Sprintf("--%s=%s", cli.FlagLockup, periods), - fmt.Sprintf("--%s=%s", cli.FlagVesting, periods), + fmt.Sprintf("--%s=%s", cli.FlagLockup, "testdata/period1.json"), + fmt.Sprintf("--%s=%s", cli.FlagVesting, "testdata/period1.json"), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), @@ -263,7 +249,7 @@ func (s *E2ETestSuite) TestNewMsgCreateClawbackVestingAccountCmd() { args: []string{ sdk.AccAddress("addr11______________").String(), fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address), - fmt.Sprintf("--%s=%s", cli.FlagVesting, periods), + fmt.Sprintf("--%s=%s", cli.FlagVesting, "testdata/period1.json"), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), @@ -277,7 +263,7 @@ func (s *E2ETestSuite) TestNewMsgCreateClawbackVestingAccountCmd() { args: []string{ sdk.AccAddress("addr12______________").String(), fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address), - fmt.Sprintf("--%s=%s", cli.FlagLockup, periods), + fmt.Sprintf("--%s=%s", cli.FlagLockup, "testdata/period1.json"), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), @@ -291,8 +277,8 @@ func (s *E2ETestSuite) TestNewMsgCreateClawbackVestingAccountCmd() { args: []string{ sdk.AccAddress("addr10______________").String(), fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address), - fmt.Sprintf("--%s=%s", cli.FlagLockup, periods), - fmt.Sprintf("--%s=%s", cli.FlagVesting, periods), + fmt.Sprintf("--%s=%s", cli.FlagLockup, "testdata/period1.json"), + fmt.Sprintf("--%s=%s", cli.FlagVesting, "testdata/period1.json"), fmt.Sprintf("--%s=%s", cli.FlagMerge, "true"), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), @@ -389,8 +375,8 @@ func (s *E2ETestSuite) TestNewMsgClawbackCmd() { _, err := clitestutil.ExecTestCLICmd(val.ClientCtx, cli.NewMsgCreateClawbackVestingAccountCmd(), []string{ addr.String(), fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address), - fmt.Sprintf("--%s=%s", cli.FlagLockup, periods), - fmt.Sprintf("--%s=%s", cli.FlagVesting, periods), + fmt.Sprintf("--%s=%s", cli.FlagLockup, "testdata/period1.json"), + fmt.Sprintf("--%s=%s", cli.FlagVesting, "testdata/period1.json"), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), diff --git a/x/auth/vesting/client/testutil/testdata/badjson b/tests/e2e/auth/vesting/testdata/badjson similarity index 100% rename from x/auth/vesting/client/testutil/testdata/badjson rename to tests/e2e/auth/vesting/testdata/badjson diff --git a/x/auth/vesting/client/testutil/testdata/badperiod.json b/tests/e2e/auth/vesting/testdata/badperiod.json similarity index 98% rename from x/auth/vesting/client/testutil/testdata/badperiod.json rename to tests/e2e/auth/vesting/testdata/badperiod.json index e580e831438b..ae2735ab690d 100644 --- a/x/auth/vesting/client/testutil/testdata/badperiod.json +++ b/tests/e2e/auth/vesting/testdata/badperiod.json @@ -6,4 +6,4 @@ "length_seconds": -500 } ] -} +} \ No newline at end of file diff --git a/x/auth/vesting/client/testutil/testdata/periods1.json b/tests/e2e/auth/vesting/testdata/periods1.json similarity index 100% rename from x/auth/vesting/client/testutil/testdata/periods1.json rename to tests/e2e/auth/vesting/testdata/periods1.json diff --git a/tests/e2e/gov/query.go b/tests/e2e/gov/query.go index d6cd5dab9b06..8b8b1a8db518 100644 --- a/tests/e2e/gov/query.go +++ b/tests/e2e/gov/query.go @@ -30,34 +30,34 @@ func (s *E2ETestSuite) TestCmdParams() { []string{}, ` deposit_params: - max_deposit_period: 172800s - min_deposit: - - amount: "10000000" - denom: stake + max_deposit_period: 172800s + min_deposit: + - amount: "10000000" + denom: stake params: - burn_proposal_deposit_prevote: false - burn_vote_quorum: false - burn_vote_veto: true - expedited_min_deposit: - - amount: "50000000" - denom: stake - expedited_threshold: "0.667000000000000000" - expedited_voting_period: 86400s - max_deposit_period: 172800s - min_deposit: - - amount: "10000000" - denom: stake - min_initial_deposit_ratio: "0.000000000000000000" - quorum: "0.334000000000000000" - threshold: "0.500000000000000000" - veto_threshold: "0.334000000000000000" - voting_period: 172800s + burn_proposal_deposit_prevote: false + burn_vote_quorum: false + burn_vote_veto: true + expedited_min_deposit: + - amount: "50000000" + denom: stake + expedited_threshold: "0.667000000000000000" + expedited_voting_period: 86400s + max_deposit_period: 172800s + min_deposit: + - amount: "10000000" + denom: stake + min_initial_deposit_ratio: "0.000000000000000000" + quorum: "0.334000000000000000" + threshold: "0.500000000000000000" + veto_threshold: "0.334000000000000000" + voting_period: 172800s tally_params: - quorum: "0.334000000000000000" - threshold: "0.500000000000000000" - veto_threshold: "0.334000000000000000" + quorum: "0.334000000000000000" + threshold: "0.500000000000000000" + veto_threshold: "0.334000000000000000" voting_params: - voting_period: 172800s + voting_period: 172800s `, }, } diff --git a/x/bank/module.go b/x/bank/module.go index 45bc7cf37d46..45ff753f2545 100644 --- a/x/bank/module.go +++ b/x/bank/module.go @@ -40,8 +40,6 @@ var ( _ module.AppModuleSimulation = AppModule{} ) -// Random text to start CI - // AppModuleBasic defines the basic application module used by the bank module. type AppModuleBasic struct { cdc codec.Codec