remove unused unit tests and fix others

ignite · Oct 5, 2023 · 513c86e · 513c86e
1 parent 591d05c
commit 513c86e
Show file tree

Hide file tree

Showing 4 changed files with 345 additions and 32 deletions.
diff --git a/ignite/pkg/cosmosanalysis/app/app_test.go b/ignite/pkg/cosmosanalysis/app/app_test.go
@@ -487,27 +487,7 @@ func Test_mergeImports(t *testing.T) {
 			},
 		},
 		{
-			name: "test three keeper import",
-			blankImports: []string{
-				"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts",
-				"cosmossdk.io/x/feegrant/module",
-			},
-			discovered: []string{
-				"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/keeper",
-				"github.com/cosmos/cosmos-sdk/x/bank/keeper",
-				"cosmossdk.io/x/feegrant/types",
-				"cosmossdk.io/x/feegrant",
-				"cosmossdk.io/x/foo",
-			},
-			want: []string{
-				"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts",
-				"github.com/cosmos/cosmos-sdk/x/bank/keeper",
-				"cosmossdk.io/x/feegrant/module",
-				"cosmossdk.io/x/foo",
-			},
-		},
-		{
-			name: "test three keeper import",
+			name: "test keeper imports",
 			blankImports: []string{
 				"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts",
 				"cosmossdk.io/x/feegrant/module",
@@ -533,11 +513,11 @@ func Test_mergeImports(t *testing.T) {
 				"github.com/cosmos/ibc-go/modules/capability",
 			},
 			discovered: []string{
-				"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts",
+				"github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts",
 				"github.com/cosmos/ibc-go/modules/capability",
 			},
 			want: []string{
-				"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts",
+				"github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts",
 				"github.com/cosmos/ibc-go/modules/capability",
 			},
 		},

diff --git a/ignite/pkg/cosmosanalysis/module/testdata/planet/app/app.go b/ignite/pkg/cosmosanalysis/module/testdata/planet/app/app.go
@@ -4,16 +4,25 @@ import (
 	"cosmossdk.io/client/v2/autocli"
 	"github.com/cosmos/cosmos-sdk/api/tendermint/abci"
 	"github.com/cosmos/cosmos-sdk/client"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
+	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+	"github.com/gogo/protobuf/codec"
 	app "github.com/ignite/cli/ignite/pkg/cosmosanalysis/app/testdata/modules/registration_not_in_app_go"
-
-	"github.com/tendermint/planet/x/mars"
+	fookeeper "github.com/tendermint/planet/x/foo/keeper"
+	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 type Foo struct {
-	FooKeeper foo.keeper
+	AuthKeeper    authkeeper.Keeper
+	BankKeeper    bankkeeper.Keeper
+	StakingKeeper stakingkeeper.Keeper
+	GovKeeper     govkeeper.Keeper
+	FooKeeper     fookeeper.Keeper
 }
 
 var ModuleBasics = module.NewBasicManager(mars.AppModuleBasic{})
@@ -25,6 +34,7 @@ func (Foo) RegisterTxService()                              {}
 func (Foo) RegisterTendermintService()                      {}
 func (Foo) InterfaceRegistry() codectypes.InterfaceRegistry { return nil }
 func (Foo) TxConfig() client.TxConfig                       { return nil }
+func (Foo) AppCodec() codec.Codec                           { return app.appCodec }
 func (Foo) AutoCliOpts() autocli.AppOptions                 { return autocli.AppOptions{} }
 func (Foo) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
 	return app.mm.BeginBlock(ctx, req)

diff --git a/ignite/pkg/cosmosanalysis/module/testdata/planet_v2/app/app.go b/ignite/pkg/cosmosanalysis/module/testdata/planet_v2/app/app.go
@@ -4,19 +4,28 @@ import (
 	"cosmossdk.io/client/v2/autocli"
 	"github.com/cosmos/cosmos-sdk/api/tendermint/abci"
 	"github.com/cosmos/cosmos-sdk/client"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
+	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+	"github.com/gogo/protobuf/codec"
 	app "github.com/ignite/cli/ignite/pkg/cosmosanalysis/app/testdata/modules/registration_not_in_app_go"
-
-	"github.com/tendermint/planet/x/mars"
+	fookeeper "github.com/tendermint/planet/x/foo/keeper"
+	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 type Foo struct {
-	FooKeeper foo.keeper
+	AuthKeeper    authkeeper.Keeper
+	BankKeeper    bankkeeper.Keeper
+	StakingKeeper stakingkeeper.Keeper
+	GovKeeper     govkeeper.Keeper
+	FooKeeper     fookeeper.Keeper
 }
 
-var ModuleBasics = module.NewBasicManager(mars.AppModuleBasic{})
+var ModuleBasics = module.NewBasicManager(foo.AppModuleBasic{})
 
 func (Foo) Name() string                                    { return app.BaseApp.Name() }
 func (Foo) GetKey(storeKey string) *storetypes.KVStoreKey   { return nil }
@@ -25,6 +34,7 @@ func (Foo) TxConfig() client.TxConfig                       { return nil }
 func (Foo) RegisterTxService()                              {}
 func (Foo) RegisterTendermintService()                      {}
 func (Foo) InterfaceRegistry() codectypes.InterfaceRegistry { return nil }
+func (Foo) AppCodec() codec.Codec                           { return app.appCodec }
 func (Foo) AutoCliOpts() autocli.AppOptions                 { return autocli.AppOptions{} }
 func (Foo) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
 	return app.mm.BeginBlock(ctx, req)