Skip to content

Commit 7fd3d54

Browse files
julienrbrtPantani
andauthored
refactor: v0.50 store app wiring (#3672)
* refactor: v0.50 store app wiring * updates * updates --------- Co-authored-by: Danilo Pantani <danpantani@gmail.com>
1 parent c2b960e commit 7fd3d54

File tree

3 files changed

+26
-33
lines changed

3 files changed

+26
-33
lines changed

ignite/pkg/cosmosanalysis/cosmosanalysis.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ const (
2424
)
2525

2626
var AppImplementation = []string{
27-
"Name",
2827
"GetKey",
28+
"AppCodec",
2929
"TxConfig",
3030
"RegisterAPIRoutes",
3131
}

ignite/templates/app/files/app/app.go.plush

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ type App struct {
9191
txConfig client.TxConfig
9292
interfaceRegistry codectypes.InterfaceRegistry
9393

94-
// non depinject support modules store keys
95-
keys map[string]*storetypes.KVStoreKey
96-
memKeys map[string]*storetypes.MemoryStoreKey
97-
tkeys map[string]*storetypes.TransientStoreKey
98-
9994
// keepers
10095
AccountKeeper authkeeper.AccountKeeper
10196
BankKeeper bankkeeper.Keeper
@@ -233,8 +228,8 @@ func New(
233228
&app.FeeGrantKeeper,
234229
&app.GroupKeeper,
235230
&app.ConsensusParamsKeeper,
236-
// this line is used by starport scaffolding # stargate/app/keeperDefinition
237231
&app.CircuitBreakerKeeper,
232+
// this line is used by starport scaffolding # stargate/app/keeperDefinition
238233
); err != nil {
239234
panic(err)
240235
}
@@ -317,9 +312,6 @@ func New(
317312
return app
318313
}
319314

320-
// Name returns the name of the App
321-
func (app *App) Name() string { return app.BaseApp.Name() }
322-
323315
// LegacyAmino returns App's amino codec.
324316
//
325317
// 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 {
348340

349341
// GetKey returns the KVStoreKey for the provided store key.
350342
func (app *App) GetKey(storeKey string) *storetypes.KVStoreKey {
351-
if key, ok := app.keys[storeKey]; ok {
352-
return key
353-
}
354-
355343
sk := app.UnsafeFindStoreKey(storeKey)
356344
kvStoreKey, ok := sk.(*storetypes.KVStoreKey)
357345
if !ok {
@@ -360,6 +348,16 @@ func (app *App) GetKey(storeKey string) *storetypes.KVStoreKey {
360348
return kvStoreKey
361349
}
362350

351+
// GetMemKey returns the MemoryStoreKey for the provided store key.
352+
func (app *App) GetMemKey(storeKey string) *storetypes.MemoryStoreKey {
353+
key, ok := app.UnsafeFindStoreKey(storeKey).(*storetypes.MemoryStoreKey)
354+
if !ok {
355+
return nil
356+
}
357+
358+
return key
359+
}
360+
363361
// kvStoreKeys returns all the kv store keys registered inside App.
364362
func (app *App) kvStoreKeys() map[string]*storetypes.KVStoreKey {
365363
keys := make(map[string]*storetypes.KVStoreKey)
@@ -369,10 +367,6 @@ func (app *App) kvStoreKeys() map[string]*storetypes.KVStoreKey {
369367
}
370368
}
371369

372-
for _, kv := range app.keys {
373-
keys[kv.Name()] = kv
374-
}
375-
376370
return keys
377371
}
378372

ignite/templates/app/files/app/ibc.go.plush

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,18 @@ import (
3131

3232
func (app *App) registerIBCModules() {
3333
// set up non depinject support modules store keys
34-
app.keys = storetypes.NewKVStoreKeys(
35-
capabilitytypes.StoreKey,
36-
ibcexported.StoreKey,
37-
ibctransfertypes.StoreKey,
38-
ibcfeetypes.StoreKey,
39-
icahosttypes.StoreKey,
40-
icacontrollertypes.StoreKey,
41-
)
42-
app.MountKVStores(app.keys)
43-
app.tkeys = storetypes.NewTransientStoreKeys(paramstypes.TStoreKey)
44-
app.MountTransientStores(app.tkeys)
45-
app.memKeys = storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
46-
app.MountMemoryStores(app.memKeys)
34+
if err := app.RegisterStores(
35+
storetypes.NewKVStoreKey(capabilitytypes.StoreKey),
36+
storetypes.NewKVStoreKey(ibcexported.StoreKey),
37+
storetypes.NewKVStoreKey(ibctransfertypes.StoreKey),
38+
storetypes.NewKVStoreKey(ibcfeetypes.StoreKey),
39+
storetypes.NewKVStoreKey(icahosttypes.StoreKey),
40+
storetypes.NewKVStoreKey(icacontrollertypes.StoreKey),
41+
storetypes.NewMemoryStoreKey(capabilitytypes.MemStoreKey),
42+
storetypes.NewTransientStoreKey(paramstypes.TStoreKey),
43+
); err != nil {
44+
panic(err)
45+
}
4746

4847
// set params subspaces
4948
for _, m := range []string{ibctransfertypes.ModuleName, ibcexported.ModuleName, icahosttypes.SubModuleName, icacontrollertypes.SubModuleName} {
@@ -53,8 +52,8 @@ func (app *App) registerIBCModules() {
5352
// add capability keeper and ScopeToModule for ibc module
5453
app.CapabilityKeeper = capabilitykeeper.NewKeeper(
5554
app.AppCodec(),
56-
app.keys[capabilitytypes.StoreKey],
57-
app.memKeys[capabilitytypes.MemStoreKey],
55+
app.GetKey(capabilitytypes.StoreKey),
56+
app.GetMemKey(capabilitytypes.MemStoreKey),
5857
)
5958

6059
// add capability keeper and ScopeToModule for ibc module

0 commit comments

Comments
 (0)