refactor: v0.50 store app wiring (#3672)

* refactor: v0.50 store app wiring * updates * updates --------- Co-authored-by: Danilo Pantani <[email protected]>
ignite · Sep 29, 2023 · 7fd3d54 · 7fd3d54
1 parent c2b960e
commit 7fd3d54
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 33 deletions.
diff --git a/ignite/pkg/cosmosanalysis/cosmosanalysis.go b/ignite/pkg/cosmosanalysis/cosmosanalysis.go
@@ -24,8 +24,8 @@ const (
 )
 
 var AppImplementation = []string{
-	"Name",
 	"GetKey",
+	"AppCodec",
 	"TxConfig",
 	"RegisterAPIRoutes",
 }

diff --git a/ignite/templates/app/files/app/app.go.plush b/ignite/templates/app/files/app/app.go.plush
@@ -91,11 +91,6 @@ type App struct {
 	txConfig          client.TxConfig
 	interfaceRegistry codectypes.InterfaceRegistry
 
-	// non depinject support modules store keys
-	keys    map[string]*storetypes.KVStoreKey
-	memKeys map[string]*storetypes.MemoryStoreKey
-	tkeys   map[string]*storetypes.TransientStoreKey
-
 	// keepers
 	AccountKeeper         authkeeper.AccountKeeper
 	BankKeeper            bankkeeper.Keeper
@@ -233,8 +228,8 @@ func New(
 		&app.FeeGrantKeeper,
 		&app.GroupKeeper,
 		&app.ConsensusParamsKeeper,
-		// this line is used by starport scaffolding # stargate/app/keeperDefinition
 		&app.CircuitBreakerKeeper,
+		// this line is used by starport scaffolding # stargate/app/keeperDefinition
 	); err != nil {
 		panic(err)
 	}
@@ -317,9 +312,6 @@ func New(
 	return app
 }
 
-// Name returns the name of the App
-func (app *App) Name() string { return app.BaseApp.Name() }
-
 // LegacyAmino returns App's amino codec.
 //
 // NOTE: This is solely to be used for testing purposes as it may be desirable
@@ -348,10 +340,6 @@ func (app *App) TxConfig() client.TxConfig {
 
 // GetKey returns the KVStoreKey for the provided store key.
 func (app *App) GetKey(storeKey string) *storetypes.KVStoreKey {
-	if key, ok := app.keys[storeKey]; ok {
-		return key
-	}
-
 	sk := app.UnsafeFindStoreKey(storeKey)
 	kvStoreKey, ok := sk.(*storetypes.KVStoreKey)
 	if !ok {
@@ -360,6 +348,16 @@ func (app *App) GetKey(storeKey string) *storetypes.KVStoreKey {
 	return kvStoreKey
 }
 
+// GetMemKey returns the MemoryStoreKey for the provided store key.
+func (app *App) GetMemKey(storeKey string) *storetypes.MemoryStoreKey {
+	key, ok := app.UnsafeFindStoreKey(storeKey).(*storetypes.MemoryStoreKey)
+	if !ok {
+		return nil
+	}
+
+	return key
+}
+
 // kvStoreKeys returns all the kv store keys registered inside App.
 func (app *App) kvStoreKeys() map[string]*storetypes.KVStoreKey {
 	keys := make(map[string]*storetypes.KVStoreKey)
@@ -369,10 +367,6 @@ func (app *App) kvStoreKeys() map[string]*storetypes.KVStoreKey {
 		}
 	}
 
-	for _, kv := range app.keys {
-		keys[kv.Name()] = kv
-	}
-
 	return keys
 }
 

diff --git a/ignite/templates/app/files/app/ibc.go.plush b/ignite/templates/app/files/app/ibc.go.plush
@@ -31,19 +31,18 @@ import (
 
 func (app *App) registerIBCModules() {
 	// set up non depinject support modules store keys
-	app.keys = storetypes.NewKVStoreKeys(
-		capabilitytypes.StoreKey,
-		ibcexported.StoreKey,
-		ibctransfertypes.StoreKey,
-		ibcfeetypes.StoreKey,
-		icahosttypes.StoreKey,
-		icacontrollertypes.StoreKey,
-	)
-	app.MountKVStores(app.keys)
-	app.tkeys = storetypes.NewTransientStoreKeys(paramstypes.TStoreKey)
-	app.MountTransientStores(app.tkeys)
-	app.memKeys = storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
-	app.MountMemoryStores(app.memKeys)
+	if err := app.RegisterStores(
+		storetypes.NewKVStoreKey(capabilitytypes.StoreKey),
+		storetypes.NewKVStoreKey(ibcexported.StoreKey),
+		storetypes.NewKVStoreKey(ibctransfertypes.StoreKey),
+		storetypes.NewKVStoreKey(ibcfeetypes.StoreKey),
+		storetypes.NewKVStoreKey(icahosttypes.StoreKey),
+		storetypes.NewKVStoreKey(icacontrollertypes.StoreKey),
+		storetypes.NewMemoryStoreKey(capabilitytypes.MemStoreKey),
+		storetypes.NewTransientStoreKey(paramstypes.TStoreKey),
+	); err != nil {
+		panic(err)
+	}
 
 	// set params subspaces
 	for _, m := range []string{ibctransfertypes.ModuleName, ibcexported.ModuleName, icahosttypes.SubModuleName, icacontrollertypes.SubModuleName} {
@@ -53,8 +52,8 @@ func (app *App) registerIBCModules() {
 	// add capability keeper and ScopeToModule for ibc module
 	app.CapabilityKeeper = capabilitykeeper.NewKeeper(
 		app.AppCodec(),
-		app.keys[capabilitytypes.StoreKey],
-		app.memKeys[capabilitytypes.MemStoreKey],
+		app.GetKey(capabilitytypes.StoreKey),
+		app.GetMemKey(capabilitytypes.MemStoreKey),
 	)
 
 	// add capability keeper and ScopeToModule for ibc module