move file locations

osmosis-labs · Jan 31, 2024 · 2df36aa · 2df36aa
1 parent 1ff7d68
commit 2df36aa
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 50 deletions.
diff --git 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/.../vesting/client/testutil/testdata/badjson → tests/e2e/auth/vesting/testdata/badjson b/.../vesting/client/testutil/testdata/badjson → tests/e2e/auth/vesting/testdata/badjson
diff --git a/...g/client/testutil/testdata/badperiod.json → .../e2e/auth/vesting/testdata/badperiod.json b/...g/client/testutil/testdata/badperiod.json → .../e2e/auth/vesting/testdata/badperiod.json
@@ -6,4 +6,4 @@
             "length_seconds": -500
         }
     ]
-}
+}
diff --git a/...ng/client/testutil/testdata/periods1.json → ...s/e2e/auth/vesting/testdata/periods1.json b/...ng/client/testutil/testdata/periods1.json → ...s/e2e/auth/vesting/testdata/periods1.json
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ @@
                 "length_seconds": -500
             }
         ]
-    }
+    }