From 159ab4f8e8e37894c6d40c0c95c9dd36938212ee Mon Sep 17 00:00:00 2001 From: Matt Kocubinski Date: Tue, 26 Jul 2022 17:00:54 -0500 Subject: [PATCH] refactor: move module cli tests up to simapp (#12718) ## Description Ref: #11899 Moves CLI test runners up to simapp while keeping test specification in the module, breaking the dependency from `x/module -> simapp` brought on by the current iteration of CLI / integration / network-backed tests. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [x] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [x] reviewed "Files changed" and left comments if necessary - [x] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) --- .../e2e}/auth/client/testutil/cli_test.go | 3 ++- .../auth/vesting/client/testutil/cli_test.go | 3 ++- .../e2e/authz}/client/testutil/cli_test.go | 7 +++--- .../e2e/bank/client/testutil}/cli_test.go | 7 +++--- .../client/grpc/tmservice/service_test.go | 0 .../e2e/crisis/client/testsuite}/cli_test.go | 9 ++++--- .../distribution/client/testutil/cli_test.go | 8 +++--- .../e2e}/evidence/client/testutil/cli_test.go | 3 ++- .../e2e}/feegrant/client/testutil/cli_test.go | 3 ++- .../e2e/genutil}/client/testutil/cli_test.go | 7 +++--- .../e2e}/gov/client/testutil/cli_test.go | 5 ++-- .../e2e}/group/client/testutil/cli_test.go | 3 ++- .../e2e}/mint/client/testutil/cli_test.go | 3 ++- .../e2e}/nft/client/testutil/cli_test.go | 3 ++- .../e2e}/params/client/testutil/cli_test.go | 3 ++- .../e2e}/server/export_test.go | 0 .../e2e}/slashing/client/testutil/cli_test.go | 3 ++- .../e2e}/staking/client/testutil/cli_test.go | 3 ++- tests/e2e/upgrade/client/testutil/cli_test.go | 25 +++++++++++++++++++ x/genutil/client/testutil/suite.go | 4 +-- x/upgrade/client/testutil/cli_test.go | 16 ------------ x/upgrade/client/testutil/suite.go | 18 +++++-------- 22 files changed, 78 insertions(+), 58 deletions(-) rename {x => tests/e2e}/auth/client/testutil/cli_test.go (77%) rename {x => tests/e2e}/auth/vesting/client/testutil/cli_test.go (76%) rename {x/genutil => tests/e2e/authz}/client/testutil/cli_test.go (75%) rename {x/crisis/client/testsuite => tests/e2e/bank/client/testutil}/cli_test.go (75%) rename {simapp/integration => tests/e2e}/client/grpc/tmservice/service_test.go (100%) rename {x/bank/client/testutil => tests/e2e/crisis/client/testsuite}/cli_test.go (71%) rename {x => tests/e2e}/distribution/client/testutil/cli_test.go (50%) rename {x => tests/e2e}/evidence/client/testutil/cli_test.go (77%) rename {x => tests/e2e}/feegrant/client/testutil/cli_test.go (75%) rename {x/authz => tests/e2e/genutil}/client/testutil/cli_test.go (75%) rename {x => tests/e2e}/gov/client/testutil/cli_test.go (84%) rename {x => tests/e2e}/group/client/testutil/cli_test.go (76%) rename {x => tests/e2e}/mint/client/testutil/cli_test.go (76%) rename {x => tests/e2e}/nft/client/testutil/cli_test.go (76%) rename {x => tests/e2e}/params/client/testutil/cli_test.go (76%) rename {simapp/integration => tests/e2e}/server/export_test.go (100%) rename {x => tests/e2e}/slashing/client/testutil/cli_test.go (75%) rename {x => tests/e2e}/staking/client/testutil/cli_test.go (75%) create mode 100644 tests/e2e/upgrade/client/testutil/cli_test.go delete mode 100644 x/upgrade/client/testutil/cli_test.go diff --git a/x/auth/client/testutil/cli_test.go b/tests/e2e/auth/client/testutil/cli_test.go similarity index 77% rename from x/auth/client/testutil/cli_test.go rename to tests/e2e/auth/client/testutil/cli_test.go index e3365013ec..6078b9119b 100644 --- a/x/auth/client/testutil/cli_test.go +++ b/tests/e2e/auth/client/testutil/cli_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/testutil/network" + testutil2 "github.com/cosmos/cosmos-sdk/x/auth/client/testutil" "github.com/cosmos/cosmos-sdk/x/auth/testutil" "github.com/stretchr/testify/require" @@ -17,5 +18,5 @@ func TestIntegrationTestSuite(t *testing.T) { cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig) require.NoError(t, err) cfg.NumValidators = 2 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, testutil2.NewIntegrationTestSuite(cfg)) } diff --git a/x/auth/vesting/client/testutil/cli_test.go b/tests/e2e/auth/vesting/client/testutil/cli_test.go similarity index 76% rename from x/auth/vesting/client/testutil/cli_test.go rename to tests/e2e/auth/vesting/client/testutil/cli_test.go index 8c93153aad..2851649038 100644 --- a/x/auth/vesting/client/testutil/cli_test.go +++ b/tests/e2e/auth/vesting/client/testutil/cli_test.go @@ -10,6 +10,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/testutil/network" + testutil2 "github.com/cosmos/cosmos-sdk/x/auth/vesting/client/testutil" "github.com/cosmos/cosmos-sdk/x/auth/vesting/testutil" ) @@ -17,5 +18,5 @@ func TestIntegrationTestSuite(t *testing.T) { cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig) require.NoError(t, err) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, testutil2.NewIntegrationTestSuite(cfg)) } diff --git a/x/genutil/client/testutil/cli_test.go b/tests/e2e/authz/client/testutil/cli_test.go similarity index 75% rename from x/genutil/client/testutil/cli_test.go rename to tests/e2e/authz/client/testutil/cli_test.go index 26677c392c..b01d117e3e 100644 --- a/x/genutil/client/testutil/cli_test.go +++ b/tests/e2e/authz/client/testutil/cli_test.go @@ -6,14 +6,15 @@ package testutil import ( "testing" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/network" - - "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/x/authz/client/testutil" ) func TestIntegrationTestSuite(t *testing.T) { cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, testutil.NewIntegrationTestSuite(cfg)) } diff --git a/x/crisis/client/testsuite/cli_test.go b/tests/e2e/bank/client/testutil/cli_test.go similarity index 75% rename from x/crisis/client/testsuite/cli_test.go rename to tests/e2e/bank/client/testutil/cli_test.go index 4bd59d02e5..7d5bbbf189 100644 --- a/x/crisis/client/testsuite/cli_test.go +++ b/tests/e2e/bank/client/testutil/cli_test.go @@ -6,14 +6,15 @@ package testutil import ( "testing" - "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/network" + "github.com/cosmos/cosmos-sdk/x/bank/client/testutil" + + "github.com/stretchr/testify/suite" ) func TestIntegrationTestSuite(t *testing.T) { cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, testutil.NewIntegrationTestSuite(cfg)) } diff --git a/simapp/integration/client/grpc/tmservice/service_test.go b/tests/e2e/client/grpc/tmservice/service_test.go similarity index 100% rename from simapp/integration/client/grpc/tmservice/service_test.go rename to tests/e2e/client/grpc/tmservice/service_test.go diff --git a/x/bank/client/testutil/cli_test.go b/tests/e2e/crisis/client/testsuite/cli_test.go similarity index 71% rename from x/bank/client/testutil/cli_test.go rename to tests/e2e/crisis/client/testsuite/cli_test.go index 26677c392c..dcbcc51749 100644 --- a/x/bank/client/testutil/cli_test.go +++ b/tests/e2e/crisis/client/testsuite/cli_test.go @@ -1,19 +1,20 @@ //go:build norace // +build norace -package testutil +package testsuite import ( "testing" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/network" - - "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/x/crisis/client/testsuite" ) func TestIntegrationTestSuite(t *testing.T) { cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, testutil.NewIntegrationTestSuite(cfg)) } diff --git a/x/distribution/client/testutil/cli_test.go b/tests/e2e/distribution/client/testutil/cli_test.go similarity index 50% rename from x/distribution/client/testutil/cli_test.go rename to tests/e2e/distribution/client/testutil/cli_test.go index d7ab22d415..eb0b664ce4 100644 --- a/x/distribution/client/testutil/cli_test.go +++ b/tests/e2e/distribution/client/testutil/cli_test.go @@ -4,16 +4,18 @@ import ( "testing" "github.com/stretchr/testify/suite" + + "github.com/cosmos/cosmos-sdk/x/distribution/client/testutil" ) func TestIntegrationTestSuite(t *testing.T) { - suite.Run(t, new(IntegrationTestSuite)) + suite.Run(t, new(testutil.IntegrationTestSuite)) } func TestGRPCQueryTestSuite(t *testing.T) { - suite.Run(t, new(GRPCQueryTestSuite)) + suite.Run(t, new(testutil.GRPCQueryTestSuite)) } func TestWithdrawAllSuite(t *testing.T) { - suite.Run(t, new(WithdrawAllTestSuite)) + suite.Run(t, new(testutil.WithdrawAllTestSuite)) } diff --git a/x/evidence/client/testutil/cli_test.go b/tests/e2e/evidence/client/testutil/cli_test.go similarity index 77% rename from x/evidence/client/testutil/cli_test.go rename to tests/e2e/evidence/client/testutil/cli_test.go index 8d2b027830..ee638f222a 100644 --- a/x/evidence/client/testutil/cli_test.go +++ b/tests/e2e/evidence/client/testutil/cli_test.go @@ -10,6 +10,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/testutil/network" + testutil2 "github.com/cosmos/cosmos-sdk/x/evidence/client/testutil" "github.com/cosmos/cosmos-sdk/x/evidence/testutil" ) @@ -17,5 +18,5 @@ func TestIntegrationTestSuite(t *testing.T) { cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig) require.NoError(t, err) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, testutil2.NewIntegrationTestSuite(cfg)) } diff --git a/x/feegrant/client/testutil/cli_test.go b/tests/e2e/feegrant/client/testutil/cli_test.go similarity index 75% rename from x/feegrant/client/testutil/cli_test.go rename to tests/e2e/feegrant/client/testutil/cli_test.go index 0293e30e16..22b697d3c6 100644 --- a/x/feegrant/client/testutil/cli_test.go +++ b/tests/e2e/feegrant/client/testutil/cli_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/testutil/network" + clienttestutil "github.com/cosmos/cosmos-sdk/x/feegrant/client/testutil" "github.com/cosmos/cosmos-sdk/x/feegrant/testutil" "github.com/stretchr/testify/require" @@ -17,5 +18,5 @@ func TestIntegrationTestSuite(t *testing.T) { cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig) require.NoError(t, err) cfg.NumValidators = 3 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, clienttestutil.NewIntegrationTestSuite(cfg)) } diff --git a/x/authz/client/testutil/cli_test.go b/tests/e2e/genutil/client/testutil/cli_test.go similarity index 75% rename from x/authz/client/testutil/cli_test.go rename to tests/e2e/genutil/client/testutil/cli_test.go index 4bd59d02e5..fa008da1de 100644 --- a/x/authz/client/testutil/cli_test.go +++ b/tests/e2e/genutil/client/testutil/cli_test.go @@ -6,14 +6,15 @@ package testutil import ( "testing" - "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/network" + "github.com/cosmos/cosmos-sdk/x/genutil/client/testutil" + + "github.com/stretchr/testify/suite" ) func TestIntegrationTestSuite(t *testing.T) { cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, testutil.NewIntegrationTestSuite(cfg)) } diff --git a/x/gov/client/testutil/cli_test.go b/tests/e2e/gov/client/testutil/cli_test.go similarity index 84% rename from x/gov/client/testutil/cli_test.go rename to tests/e2e/gov/client/testutil/cli_test.go index 13d394e30e..943b8f2f8e 100644 --- a/x/gov/client/testutil/cli_test.go +++ b/tests/e2e/gov/client/testutil/cli_test.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/gov/client/testutil" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/stretchr/testify/require" @@ -16,7 +17,7 @@ import ( func TestIntegrationTestSuite(t *testing.T) { cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, testutil.NewIntegrationTestSuite(cfg)) dp := v1.NewDepositParams(sdk.NewCoins(sdk.NewCoin(cfg.BondDenom, v1.DefaultMinDepositTokens)), time.Duration(15)*time.Second) vp := v1.NewVotingParams(time.Duration(5) * time.Second) @@ -26,5 +27,5 @@ func TestIntegrationTestSuite(t *testing.T) { bz, err := cfg.Codec.MarshalJSON(genesisState) require.NoError(t, err) cfg.GenesisState["gov"] = bz - suite.Run(t, NewDepositTestSuite(cfg)) + suite.Run(t, testutil.NewDepositTestSuite(cfg)) } diff --git a/x/group/client/testutil/cli_test.go b/tests/e2e/group/client/testutil/cli_test.go similarity index 76% rename from x/group/client/testutil/cli_test.go rename to tests/e2e/group/client/testutil/cli_test.go index be88858caf..5778b1bb7f 100644 --- a/x/group/client/testutil/cli_test.go +++ b/tests/e2e/group/client/testutil/cli_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/testutil/network" + clienttestutil "github.com/cosmos/cosmos-sdk/x/group/client/testutil" "github.com/cosmos/cosmos-sdk/x/group/testutil" "github.com/stretchr/testify/require" @@ -17,5 +18,5 @@ func TestIntegrationTestSuite(t *testing.T) { cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig) require.NoError(t, err) cfg.NumValidators = 2 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, clienttestutil.NewIntegrationTestSuite(cfg)) } diff --git a/x/mint/client/testutil/cli_test.go b/tests/e2e/mint/client/testutil/cli_test.go similarity index 76% rename from x/mint/client/testutil/cli_test.go rename to tests/e2e/mint/client/testutil/cli_test.go index 11fb6ff11e..ed4a8f7ef0 100644 --- a/x/mint/client/testutil/cli_test.go +++ b/tests/e2e/mint/client/testutil/cli_test.go @@ -10,6 +10,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/testutil/network" + clienttestutil "github.com/cosmos/cosmos-sdk/x/mint/client/testutil" "github.com/cosmos/cosmos-sdk/x/mint/testutil" ) @@ -17,5 +18,5 @@ func TestIntegrationTestSuite(t *testing.T) { cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig) require.NoError(t, err) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, clienttestutil.NewIntegrationTestSuite(cfg)) } diff --git a/x/nft/client/testutil/cli_test.go b/tests/e2e/nft/client/testutil/cli_test.go similarity index 76% rename from x/nft/client/testutil/cli_test.go rename to tests/e2e/nft/client/testutil/cli_test.go index 98344ce91c..2aef33ab9c 100644 --- a/x/nft/client/testutil/cli_test.go +++ b/tests/e2e/nft/client/testutil/cli_test.go @@ -10,6 +10,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/testutil/network" + clienttestutil "github.com/cosmos/cosmos-sdk/x/nft/client/testutil" "github.com/cosmos/cosmos-sdk/x/nft/testutil" ) @@ -17,5 +18,5 @@ func TestIntegrationTestSuite(t *testing.T) { cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig) require.NoError(t, err) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, clienttestutil.NewIntegrationTestSuite(cfg)) } diff --git a/x/params/client/testutil/cli_test.go b/tests/e2e/params/client/testutil/cli_test.go similarity index 76% rename from x/params/client/testutil/cli_test.go rename to tests/e2e/params/client/testutil/cli_test.go index 58b3a48b45..a31730e165 100644 --- a/x/params/client/testutil/cli_test.go +++ b/tests/e2e/params/client/testutil/cli_test.go @@ -10,6 +10,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/testutil/network" + clienttestutil "github.com/cosmos/cosmos-sdk/x/params/client/testutil" "github.com/cosmos/cosmos-sdk/x/params/testutil" ) @@ -17,5 +18,5 @@ func TestIntegrationTestSuite(t *testing.T) { cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig) require.NoError(t, err) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, clienttestutil.NewIntegrationTestSuite(cfg)) } diff --git a/simapp/integration/server/export_test.go b/tests/e2e/server/export_test.go similarity index 100% rename from simapp/integration/server/export_test.go rename to tests/e2e/server/export_test.go diff --git a/x/slashing/client/testutil/cli_test.go b/tests/e2e/slashing/client/testutil/cli_test.go similarity index 75% rename from x/slashing/client/testutil/cli_test.go rename to tests/e2e/slashing/client/testutil/cli_test.go index 64cd56ab94..ae3939f776 100644 --- a/x/slashing/client/testutil/cli_test.go +++ b/tests/e2e/slashing/client/testutil/cli_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/testutil/network" + clienttestutil "github.com/cosmos/cosmos-sdk/x/slashing/client/testutil" "github.com/cosmos/cosmos-sdk/x/slashing/testutil" "github.com/stretchr/testify/require" @@ -17,5 +18,5 @@ func TestIntegrationTestSuite(t *testing.T) { cfg, err := network.DefaultConfigWithAppConfig(testutil.AppConfig) require.NoError(t, err) cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, clienttestutil.NewIntegrationTestSuite(cfg)) } diff --git a/x/staking/client/testutil/cli_test.go b/tests/e2e/staking/client/testutil/cli_test.go similarity index 75% rename from x/staking/client/testutil/cli_test.go rename to tests/e2e/staking/client/testutil/cli_test.go index b944e1f898..398097d2d8 100644 --- a/x/staking/client/testutil/cli_test.go +++ b/tests/e2e/staking/client/testutil/cli_test.go @@ -8,6 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/network" + "github.com/cosmos/cosmos-sdk/x/staking/client/testutil" "github.com/stretchr/testify/suite" ) @@ -15,5 +16,5 @@ import ( func TestIntegrationTestSuite(t *testing.T) { cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) cfg.NumValidators = 2 - suite.Run(t, NewIntegrationTestSuite(cfg)) + suite.Run(t, testutil.NewIntegrationTestSuite(cfg)) } diff --git a/tests/e2e/upgrade/client/testutil/cli_test.go b/tests/e2e/upgrade/client/testutil/cli_test.go new file mode 100644 index 0000000000..b8d5eed13d --- /dev/null +++ b/tests/e2e/upgrade/client/testutil/cli_test.go @@ -0,0 +1,25 @@ +package testutil + +import ( + "testing" + + "github.com/stretchr/testify/suite" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + + "github.com/cosmos/cosmos-sdk/simapp" + "github.com/cosmos/cosmos-sdk/testutil/network" + "github.com/cosmos/cosmos-sdk/x/upgrade/client/testutil" +) + +func TestIntegrationTestSuite(t *testing.T) { + cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) + cfg.NumValidators = 1 + + app := simapp.Setup(t, false) + ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + + app.UpgradeKeeper.SetVersionSetter(app.BaseApp) + app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap()) + + suite.Run(t, testutil.NewIntegrationTestSuite(cfg, app.UpgradeKeeper, ctx)) +} diff --git a/x/genutil/client/testutil/suite.go b/x/genutil/client/testutil/suite.go index 755d20154e..e09937176f 100644 --- a/x/genutil/client/testutil/suite.go +++ b/x/genutil/client/testutil/suite.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/cosmos-sdk/simapp" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" stakingcli "github.com/cosmos/cosmos-sdk/x/staking/client/cli" @@ -106,7 +106,7 @@ func (s *IntegrationTestSuite) TestGenTxCmd() { s.Run(tc.name, func() { cmd := cli.GenTxCmd( - simapp.ModuleBasics, + module.NewBasicManager(), val.ClientCtx.TxConfig, banktypes.GenesisBalancesIterator{}, val.ClientCtx.HomeDir) diff --git a/x/upgrade/client/testutil/cli_test.go b/x/upgrade/client/testutil/cli_test.go deleted file mode 100644 index 039ec3ee2f..0000000000 --- a/x/upgrade/client/testutil/cli_test.go +++ /dev/null @@ -1,16 +0,0 @@ -package testutil - -import ( - "testing" - - "github.com/stretchr/testify/suite" - - "github.com/cosmos/cosmos-sdk/simapp" - "github.com/cosmos/cosmos-sdk/testutil/network" -) - -func TestIntegrationTestSuite(t *testing.T) { - cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) - cfg.NumValidators = 1 - suite.Run(t, NewIntegrationTestSuite(cfg)) -} diff --git a/x/upgrade/client/testutil/suite.go b/x/upgrade/client/testutil/suite.go index 9e5eca3b23..37b356f4aa 100644 --- a/x/upgrade/client/testutil/suite.go +++ b/x/upgrade/client/testutil/suite.go @@ -4,9 +4,7 @@ import ( "fmt" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/simapp" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" @@ -15,8 +13,12 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) -func NewIntegrationTestSuite(cfg network.Config) *IntegrationTestSuite { - return &IntegrationTestSuite{cfg: cfg} +func NewIntegrationTestSuite(cfg network.Config, keeper keeper.Keeper, ctx sdk.Context) *IntegrationTestSuite { + return &IntegrationTestSuite{ + cfg: cfg, + upgradeKeeper: keeper, + ctx: ctx, + } } type IntegrationTestSuite struct { @@ -31,14 +33,6 @@ type IntegrationTestSuite struct { func (s *IntegrationTestSuite) SetupSuite() { s.T().Log("setting up integration test suite") - app := simapp.Setup(s.T(), false) - s.upgradeKeeper = app.UpgradeKeeper - - s.ctx = app.BaseApp.NewContext(false, tmproto.Header{}) - - s.upgradeKeeper.SetVersionSetter(app.BaseApp) - s.upgradeKeeper.SetModuleVersionMap(s.ctx, app.ModuleManager.GetVersionMap()) - var err error s.network, err = network.New(s.T(), s.T().TempDir(), s.cfg) s.Require().NoError(err)