refactor: remove custom module & manager from app

app/app.go

@@ -94,9 +94,8 @@ import (
 	ibchost "github.com/cosmos/ibc-go/v5/modules/core/24-host"
 	ibckeeper "github.com/cosmos/ibc-go/v5/modules/core/keeper"
 
-	moduletypes "github.com/regen-network/regen-ledger/types/module"
-	"github.com/regen-network/regen-ledger/types/module/server"
-	data "github.com/regen-network/regen-ledger/x/data/module"
+	"github.com/regen-network/regen-ledger/x/data"
+	datamodule "github.com/regen-network/regen-ledger/x/data/module"
 	"github.com/regen-network/regen-ledger/x/ecocredit"
 	"github.com/regen-network/regen-ledger/x/ecocredit/basket"
 	ecocreditmodule "github.com/regen-network/regen-ledger/x/ecocredit/module"
@@ -142,7 +141,7 @@ var (
 			authzmodule.AppModuleBasic{},
 			groupmodule.AppModuleBasic{},
 			ecocreditmodule.Module{},
-			data.Module{},
+			datamodule.Module{},
 		}, setCustomModuleBasics()...)...,
 	)
 
@@ -216,13 +215,6 @@ type RegenApp struct {
 	// simulation manager
 	sm *module.SimulationManager
 
-	// server module manager
-	// NOTE: We will likely want to make this new manager compatible
-	// with module.Manager so that we can have existing cosmos-sdk modules
-	// use ADR 33 approach without the need for removing their keepers
-	// and a larger refactoring.
-	smm *server.Manager
-
 	// module configurator
 	configurator module.Configurator
 }
@@ -244,14 +236,13 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 	bApp.SetInterfaceRegistry(interfaceRegistry)
 
 	keys := sdk.NewKVStoreKeys(
-		append([]string{
-			authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey,
-			minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
-			govtypes.StoreKey, paramstypes.StoreKey, upgradetypes.StoreKey,
-			evidencetypes.StoreKey, capabilitytypes.StoreKey, feegrant.StoreKey,
-			authzkeeper.StoreKey,
-			ibchost.StoreKey, ibctransfertypes.StoreKey, group.StoreKey,
-		}, setCustomKVStoreKeys()...)...,
+		authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey,
+		minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
+		govtypes.StoreKey, paramstypes.StoreKey, upgradetypes.StoreKey,
+		evidencetypes.StoreKey, capabilitytypes.StoreKey, feegrant.StoreKey,
+		authzkeeper.StoreKey,
+		ibchost.StoreKey, ibctransfertypes.StoreKey, group.StoreKey,
+		ecocredit.ModuleName, data.ModuleName,
 	)
 
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -369,60 +360,51 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 	app.GroupKeeper = groupkeeper.NewKeeper(keys[group.StoreKey], appCodec, app.MsgServiceRouter(), app.AccountKeeper, groupConfig)
 
 	// register custom modules here
-	app.smm = setCustomModules(app, interfaceRegistry)
-	ecocreditModule := ecocreditmodule.NewModule(
+	ecocreditMod := ecocreditmodule.NewModule(
+		app.keys[ecocredit.ModuleName],
 		app.GetSubspace(ecocredit.DefaultParamspace),
 		app.AccountKeeper,
 		app.BankKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName),
 	)
-	dataModule := data.NewModule(app.AccountKeeper, app.BankKeeper)
-	newModules := []moduletypes.Module{ecocreditModule, dataModule}
-	err := app.smm.RegisterModules(newModules)
-	if err != nil {
-		panic(err)
-	}
-	err = app.smm.CompleteInitialization()
-	if err != nil {
-		panic(err)
-	}
-	app.smm.RegisterInvariants(&app.CrisisKeeper)
+	dataMod := datamodule.NewModule(app.keys[data.ModuleName], app.AccountKeeper, app.BankKeeper)
 
 	govConfig := govtypes.DefaultConfig()
 	app.GovKeeper = govkeeper.NewKeeper(
 		appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
 		&stakingKeeper, govRouter, app.MsgServiceRouter(), govConfig,
 	)
 
-	app.setCustomKeepers(bApp, keys, appCodec, govRouter, homePath, appOpts)
+	// TODO(Tyler): not needed??
+	//app.setCustomKeepers(bApp, keys, appCodec, govRouter, homePath, appOpts)
 
 	skipGenesisInvariants := cast.ToBool(appOpts.Get(crisis.FlagSkipGenesisInvariants))
 
 	app.mm = module.NewManager(
-		append([]module.AppModule{
-			genutil.NewAppModule(
-				app.AccountKeeper, app.StakingKeeper, app.BaseApp.DeliverTx,
-				encodingConfig.TxConfig,
-			),
-			auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts),
-			vesting.NewAppModule(app.AccountKeeper, app.BankKeeper),
-			bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
-			capability.NewAppModule(appCodec, *app.CapabilityKeeper),
-			crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants),
-			gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
-			mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil),
-			slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
-			distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
-			staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
-			upgrade.NewAppModule(app.UpgradeKeeper),
-			evidence.NewAppModule(app.EvidenceKeeper),
-			feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
-			authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
-			ibc.NewAppModule(app.IBCKeeper),
-			params.NewAppModule(app.ParamsKeeper),
-			transferModule,
-			groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
-		}, app.setCustomModuleManager()...)...,
+		genutil.NewAppModule(
+			app.AccountKeeper, app.StakingKeeper, app.BaseApp.DeliverTx,
+			encodingConfig.TxConfig,
+		),
+		auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts),
+		vesting.NewAppModule(app.AccountKeeper, app.BankKeeper),
+		bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
+		capability.NewAppModule(appCodec, *app.CapabilityKeeper),
+		crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants),
+		gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
+		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil),
+		slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
+		distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
+		staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
+		upgrade.NewAppModule(app.UpgradeKeeper),
+		evidence.NewAppModule(app.EvidenceKeeper),
+		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
+		authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
+		ibc.NewAppModule(app.IBCKeeper),
+		params.NewAppModule(app.ParamsKeeper),
+		transferModule,
+		ecocreditMod,
+		dataMod,
+		groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that
@@ -449,6 +431,8 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 			paramstypes.ModuleName,
 			vestingtypes.ModuleName,
 			group.ModuleName,
+			ecocredit.ModuleName,
+			data.ModuleName,
 
 			// ibc modules
 			ibchost.ModuleName,
@@ -474,6 +458,8 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 			upgradetypes.ModuleName,
 			vestingtypes.ModuleName,
 			group.ModuleName,
+			ecocredit.ModuleName,
+			data.ModuleName,
 
 			// ibc modules
 			ibchost.ModuleName,
@@ -504,17 +490,19 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 			paramstypes.ModuleName,
 			upgradetypes.ModuleName,
 			group.ModuleName,
+			ecocredit.ModuleName,
+			data.ModuleName,
 
 			// ibc modules
 			ibctransfertypes.ModuleName,
 			ibchost.ModuleName,
 		}, setCustomOrderInitGenesis()...)...,
 	)
-
-	app.mm.RegisterInvariants(&app.CrisisKeeper)
-	app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino)
 	app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter())
 	app.mm.RegisterServices(app.configurator)
+	app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino)
+	app.mm.RegisterInvariants(&app.CrisisKeeper)
+
 	// create the simulation manager and define the order of the modules for deterministic simulations
 	//
 	// NOTE: this is not required apps that don't use the simulator for fuzz testing
@@ -535,8 +523,8 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 			authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 			ibc.NewAppModule(app.IBCKeeper),
 			transferModule,
-			ecocreditmodule.NewModule(app.GetSubspace(ecocredit.DefaultParamspace), app.AccountKeeper, app.BankKeeper, authtypes.NewModuleAddress(govtypes.ModuleName)),
-			data.NewModule(app.AccountKeeper, app.BankKeeper),
+			ecocreditmodule.NewModule(app.keys[ecocredit.ModuleName], app.GetSubspace(ecocredit.DefaultParamspace), app.AccountKeeper, app.BankKeeper, authtypes.NewModuleAddress(govtypes.ModuleName)),
+			datamodule.NewModule(app.keys[data.ModuleName], app.AccountKeeper, app.BankKeeper),
 		}, app.setCustomSimulationManager()...)...,
 	)
 	app.sm.RegisterStoreDecoders()
@@ -569,34 +557,31 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 	return app
 }
 
+// TODO(Tyler): is below needed?
+
 // MakeCodecs constructs the *std.Codec and *codec.LegacyAmino instances used by
 // Regenapp. It is useful for tests and clients who do not want to construct the
 // full Regenapp
-func MakeCodecs() (codec.Codec, *codec.LegacyAmino) {
-	config := MakeEncodingConfig()
-	return config.Codec, config.Amino
-}
+//func MakeCodecs() (codec.Codec, *codec.LegacyAmino) {
+//	cfg := MakeEncodingConfig()
+//	return cfg.Codec, cfg.Amino
+//}
 
 // Name returns the name of the App
 func (app *RegenApp) Name() string { return app.BaseApp.Name() }
 
 // BeginBlocker application updates every begin block
 func (app *RegenApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
 	resp := app.mm.BeginBlock(ctx, req)
-	events := app.smm.BeginBlock(ctx, req)
-	resp.Events = append(resp.Events, events...)
 	return resp
 }
 
 // EndBlocker application updates every end block
 func (app *RegenApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
 	resp := app.mm.EndBlock(ctx, req)
-	events, vals := app.smm.EndBlock(ctx, req)
-	if len(resp.ValidatorUpdates) > 0 && len(vals) > 0 {
+	if len(resp.ValidatorUpdates) > 0 { // TODO(tyler): is this still needed?
 		panic("validator EndBlock updates already set by the SDK Module Manager")
 	}
-	resp.ValidatorUpdates = vals
-	resp.Events = append(resp.Events, events...)
 	return resp
 }
 
@@ -607,8 +592,7 @@ func (app *RegenApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abc
 		panic(err)
 	}
 	app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
-	res := app.mm.InitGenesis(ctx, app.appCodec, genesisState)
-	return app.smm.InitGenesis(ctx, genesisState, res.Validators)
+	return app.mm.InitGenesis(ctx, app.appCodec, genesisState)
 }
 
 // LoadHeight loads a particular height

app/export.go

@@ -37,14 +37,17 @@ func (app *RegenApp) ExportAppStateAndValidators(
 		genState[name] = v
 	}
 
-	// Export genesis state from new modules (that use ADR 33 approach)
-	// if they are not already part of genState
-	for name, v := range app.smm.ExportGenesis(ctx) {
-		if _, ok := genState[name]; ok {
-			return servertypes.ExportedApp{}, fmt.Errorf("genesis state already exported for %s module", name)
-		}
-		genState[name] = v
-	}
+	// TODO(Tyler): do we need below??
+
+	//// Export genesis state from new modules (that use ADR 33 approach)
+	//// if they are not already part of genState
+	//for name, v := range app.mm.ExportGenesis(ctx)
+	//for name, v := range app.smm.ExportGenesis(ctx) {
+	//	if _, ok := genState[name]; ok {
+	//		return servertypes.ExportedApp{}, fmt.Errorf("genesis state already exported for %s module", name)
+	//	}
+	//	genState[name] = v
+	//}
 
 	appState, err := json.MarshalIndent(genState, "", "  ")
 	if err != nil {

app/stable_appconfig.go

@@ -6,7 +6,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/codec/types"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -21,8 +20,6 @@ import (
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-
-	"github.com/regen-network/regen-ledger/types/module/server"
 )
 
 func setCustomModuleBasics() []module.AppModuleBasic {
@@ -36,11 +33,6 @@ func setCustomModuleBasics() []module.AppModuleBasic {
 	}
 }
 
-// setCustomModules registers new modules with the server module manager.
-// It does nothing here and returns an empty manager since we're not using experimental mode.
-func setCustomModules(app *RegenApp, interfaceRegistry types.InterfaceRegistry) *server.Manager {
-	return server.NewManager(app.BaseApp, codec.NewProtoCodec(interfaceRegistry))
-}
 func setCustomKVStoreKeys() []string {
 	return []string{}
 }

app/utils.go

@@ -31,5 +31,7 @@ func SimulationOperations(app *RegenApp, cdc codec.Codec, config simulation.Conf
 
 	simState.ParamChanges = app.SimulationManager().GenerateParamChanges(config.Seed)
 	simState.Contents = app.SimulationManager().GetProposalContents(simState)
-	return app.smm.WeightedOperations(simState, app.sm.Modules)
+	// TODO(Tyler): how to fix?
+	// return app.smm.WeightedOperations(simState, app.sm.Modules)
+	return nil
 }