chore(app): move initialization logic outside of the app and into kee…

…pers package (#975)
dymensionxyz · Jul 15, 2024 · 90104b6 · 90104b6
1 parent 1f3b48f
commit 90104b6
Show file tree

Hide file tree

Showing 18 changed files with 1,092 additions and 876 deletions.
diff --git a/app/app.go b/app/app.go
diff --git a/app/encoding.go b/app/encoding.go
@@ -5,6 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/std"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 
+	"github.com/dymensionxyz/dymension/v3/app/keepers"
 	"github.com/dymensionxyz/dymension/v3/app/params"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -37,8 +38,8 @@ func MakeEncodingConfig() params.EncodingConfig {
 	RegisterLegacyAminoCodec(encodingConfig.Amino)
 	RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
-	ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
-	ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	keepers.ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	keepers.ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	return encodingConfig
 }
 

diff --git a/app/export.go b/app/export.go
@@ -156,7 +156,7 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str
 
 	// Iterate through validators by power descending, reset bond heights, and
 	// update bond intra-tx counters.
-	store := ctx.KVStore(app.keys[stakingtypes.StoreKey])
+	store := ctx.KVStore(app.GetKey(stakingtypes.StoreKey))
 	iter := sdk.KVStoreReversePrefixIterator(store, stakingtypes.ValidatorsKey)
 	counter := int16(0)
 

diff --git a/app/genesis.go b/app/genesis.go
@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 
 	"github.com/cosmos/cosmos-sdk/codec"
+
+	"github.com/dymensionxyz/dymension/v3/app/keepers"
 )
 
 // The genesis state of the blockchain is represented here as a map of raw json
@@ -17,6 +19,6 @@ type GenesisState map[string]json.RawMessage
 
 // NewDefaultGenesisState generates the default state for the application.
 func NewDefaultGenesisState(cdc codec.JSONCodec) GenesisState {
-	defaultGenesisState := ModuleBasics.DefaultGenesis(cdc)
+	defaultGenesisState := keepers.ModuleBasics.DefaultGenesis(cdc)
 	return defaultGenesisState
 }