From d4ca3c90530da5ff0611999998514f76550946fa Mon Sep 17 00:00:00 2001 From: Reece Williams Date: Fri, 9 Feb 2024 16:15:52 -0600 Subject: [PATCH] simpler --- app/app.go | 4 +--- x/globalfee/genesis_test.go | 2 +- x/globalfee/module.go | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/app.go b/app/app.go index 3fda1a7..e476cae 100644 --- a/app/app.go +++ b/app/app.go @@ -618,8 +618,6 @@ func NewApp( // we prefer to be more strict in what arguments the modules expect. skipGenesisInvariants := cast.ToBool(appOpts.Get(crisis.FlagSkipGenesisInvariants)) - bondDenom := app.GetChainBondDenom() - // NOTE: Any module instantiated in the module manager that is later modified // must be passed by reference here. app.ModuleManager = module.NewManager( @@ -653,7 +651,7 @@ func NewApp( ibcfee.NewAppModule(app.IBCFeeKeeper), ica.NewAppModule(&app.ICAControllerKeeper, &app.ICAHostKeeper), ibctm.NewAppModule(), - globalfee.NewAppModule(appCodec, app.GlobalFeeKeeper, bondDenom), + globalfee.NewAppModule(appCodec, app.GlobalFeeKeeper), // sdk crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them ) diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go index bc88f8e..a112086 100644 --- a/x/globalfee/genesis_test.go +++ b/x/globalfee/genesis_test.go @@ -98,7 +98,7 @@ func TestInitExportGenesis(t *testing.T) { for name, spec := range specs { t.Run(name, func(t *testing.T) { ctx, encCfg, keeper := setupTestStore(t) - m := NewAppModule(encCfg.Codec, keeper, "stake") + m := NewAppModule(encCfg.Codec, keeper) m.InitGenesis(ctx, encCfg.Codec, []byte(spec.src)) gotJSON := m.ExportGenesis(ctx, encCfg.Codec) var got types.GenesisState diff --git a/x/globalfee/module.go b/x/globalfee/module.go index 5041e6c..47931f1 100644 --- a/x/globalfee/module.go +++ b/x/globalfee/module.go @@ -110,12 +110,10 @@ func (AppModule) IsOnePerModuleType() { func NewAppModule( cdc codec.Codec, keeper keeper.Keeper, - debondDenom string, ) *AppModule { return &AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc}, keeper: keeper, - bondDenom: debondDenom, } }