From 0d1a7293b7c098efdcf411750409be830533766d Mon Sep 17 00:00:00 2001
From: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>
Date: Thu, 25 Jun 2020 09:57:41 -0400
Subject: [PATCH] cmd/simd: Use server.GetPruningOptionsFromFlags (#6508)

---
 simapp/cmd/simd/main.go | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/simapp/cmd/simd/main.go b/simapp/cmd/simd/main.go
index 15190e9f30c3..7e999194901b 100644
--- a/simapp/cmd/simd/main.go
+++ b/simapp/cmd/simd/main.go
@@ -18,7 +18,6 @@ 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"
@@ -84,17 +83,9 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer) server.Applicati
 		skipUpgradeHeights[int64(h)] = true
 	}
 
-	pruningStr := viper.GetString(server.FlagPruning)
-	pruningOpts := storetypes.NewPruningOptionsFromString(pruningStr)
-
-	// If 'custom' strategy is provided, we construct the options from individual
-	// flags. We assume the values have been verified already.
-	if pruningStr == storetypes.PruningOptionCustom {
-		pruningOpts = storetypes.NewPruningOptions(
-			viper.GetUint64(server.FlagPruningKeepRecent),
-			viper.GetUint64(server.FlagPruningKeepEvery),
-			viper.GetUint64(server.FlagPruningInterval),
-		)
+	pruningOpts, err := server.GetPruningOptionsFromFlags()
+	if err != nil {
+		panic(err)
 	}
 
 	// TODO: Make sure custom pruning works.