From 9dee0eb224e689ed4ed13c54ebcaa93c3aaf2cab Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Mon, 22 Apr 2024 19:36:18 +0200 Subject: [PATCH] app: remove skipUpgradeHeights from NewRegenApp args --- app/app.go | 4 +++- app/client/cli/root.go | 12 ++++-------- app/testsuite/helpers.go | 20 +++++++++----------- app/testsuite/network_config.go | 5 ++--- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/app/app.go b/app/app.go index 023f6a9d08..a9af993ca9 100644 --- a/app/app.go +++ b/app/app.go @@ -281,7 +281,7 @@ type RegenApp struct { } // NewRegenApp returns a reference to an initialized RegenApp. -func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool, +func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, invCheckPeriod uint, appOpts servertypes.AppOptions, baseAppOptions ...func(*baseapp.BaseApp)) *RegenApp { @@ -415,6 +415,8 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest groupConfig, ) + // get skipUpgradeHeights from the app options + skipUpgradeHeights := map[int64]bool{} for _, h := range cast.ToIntSlice(appOpts.Get(server.FlagUnsafeSkipUpgrades)) { skipUpgradeHeights[int64(h)] = true } diff --git a/app/client/cli/root.go b/app/client/cli/root.go index 82961cd74f..86b83bd21d 100644 --- a/app/client/cli/root.go +++ b/app/client/cli/root.go @@ -41,7 +41,7 @@ import ( // main function. func NewRootCmd() *cobra.Command { // we "pre"-instantiate the application for getting the injected/configured encoding configuration - tempApp := app.NewRegenApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, nil, 1, simtestutil.NewAppOptionsWithFlagHome(app.DefaultNodeHome)) + tempApp := app.NewRegenApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, 1, simtestutil.NewAppOptionsWithFlagHome(app.DefaultNodeHome)) encodingConfig := testutil.TestEncodingConfig{ InterfaceRegistry: tempApp.InterfaceRegistry(), Codec: tempApp.AppCodec(), @@ -231,14 +231,10 @@ func txCommand() *cobra.Command { } func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts servertypes.AppOptions) servertypes.Application { - skipUpgradeHeights := make(map[int64]bool) - for _, h := range cast.ToIntSlice(appOpts.Get(server.FlagUnsafeSkipUpgrades)) { - skipUpgradeHeights[int64(h)] = true - } baseappOptions := server.DefaultBaseappOptions(appOpts) return app.NewRegenApp( - logger, db, traceStore, true, skipUpgradeHeights, + logger, db, traceStore, true, cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), appOpts, baseappOptions..., @@ -275,13 +271,13 @@ func appExport( appOpts = viperAppOpts if height != -1 { - regenApp = app.NewRegenApp(logger, db, traceStore, false, map[int64]bool{}, 1, appOpts) + regenApp = app.NewRegenApp(logger, db, traceStore, false, 1, appOpts) if err := regenApp.LoadHeight(height); err != nil { return servertypes.ExportedApp{}, err } } else { - regenApp = app.NewRegenApp(logger, db, traceStore, true, map[int64]bool{}, 1, appOpts) + regenApp = app.NewRegenApp(logger, db, traceStore, true, 1, appOpts) } return regenApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) diff --git a/app/testsuite/helpers.go b/app/testsuite/helpers.go index f5993f141b..407d1f4885 100644 --- a/app/testsuite/helpers.go +++ b/app/testsuite/helpers.go @@ -49,20 +49,18 @@ var DefaultConsensusParams = &tmproto.ConsensusParams{ // SetupOptions defines arguments that are passed into `Simapp` constructor. type SetupOptions struct { - Logger log.Logger - DB *dbm.MemDB - InvCheckPeriod uint - SkipUpgradeHeights map[int64]bool - AppOpts types.AppOptions + Logger log.Logger + DB *dbm.MemDB + InvCheckPeriod uint + AppOpts types.AppOptions } func DefaultOptions() SetupOptions { return SetupOptions{ - Logger: log.NewNopLogger(), - DB: dbm.NewMemDB(), - InvCheckPeriod: 5, - SkipUpgradeHeights: map[int64]bool{}, - AppOpts: EmptyAppOptions{}, + Logger: log.NewNopLogger(), + DB: dbm.NewMemDB(), + InvCheckPeriod: 5, + AppOpts: EmptyAppOptions{}, } } @@ -85,7 +83,7 @@ func NewAppWithCustomOptions(t *testing.T, isCheckTx bool, options SetupOptions) Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000000000000))), } - regenApp := app.NewRegenApp(options.Logger, options.DB, nil, true, options.SkipUpgradeHeights, options.InvCheckPeriod, options.AppOpts) + regenApp := app.NewRegenApp(options.Logger, options.DB, nil, true, options.InvCheckPeriod, options.AppOpts) genesisState := app.NewDefaultGenesisState(regenApp.AppCodec()) genesisState = genesisStateWithValSet(t, regenApp, genesisState, valSet, []authtypes.GenesisAccount{acc}, balance) diff --git a/app/testsuite/network_config.go b/app/testsuite/network_config.go index 138fc694fa..1489bc8c6b 100644 --- a/app/testsuite/network_config.go +++ b/app/testsuite/network_config.go @@ -25,15 +25,14 @@ func NewTestNetworkFixture() network.TestFixture { } defer os.RemoveAll(dir) - a := app.NewRegenApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, map[int64]bool{}, 0, + a := app.NewRegenApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, 0, simtestutil.NewAppOptionsWithFlagHome(dir)) appCtr := func(val network.ValidatorI) servertypes.Application { cfg := val.GetAppConfig() - skipUpgrades := map[int64]bool{} return app.NewRegenApp( - val.GetCtx().Logger, dbm.NewMemDB(), nil, true, skipUpgrades, 0, + val.GetCtx().Logger, dbm.NewMemDB(), nil, true, 0, simtestutil.NewAppOptionsWithFlagHome(val.GetCtx().Config.RootDir), baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(cfg.Pruning)), baseapp.SetMinGasPrices(cfg.MinGasPrices),