From f1a02250262628373ffec6cf30208fc8f2dc093a Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Mon, 22 Jun 2020 16:31:33 -0400 Subject: [PATCH] Merge PR #6475: Pruning Refactor --- cmd/simd/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/simd/main.go b/cmd/simd/main.go index 9590650d00ba..c0b0beeec52a 100644 --- a/cmd/simd/main.go +++ b/cmd/simd/main.go @@ -18,6 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/store" + storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" @@ -83,10 +84,11 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer) server.Applicati skipUpgradeHeights[int64(h)] = true } + // TODO: Make sure custom pruning works. return simapp.NewSimApp( logger, db, traceStore, true, skipUpgradeHeights, viper.GetString(flags.FlagHome), invCheckPeriod, - baseapp.SetPruning(store.NewPruningOptionsFromString(viper.GetString("pruning"))), + baseapp.SetPruning(storetypes.NewPruningOptionsFromString(viper.GetString(server.FlagPruning))), baseapp.SetMinGasPrices(viper.GetString(server.FlagMinGasPrices)), baseapp.SetHaltHeight(viper.GetUint64(server.FlagHaltHeight)), baseapp.SetHaltTime(viper.GetUint64(server.FlagHaltTime)),