From 2f55b9d25549dd240a3e5710e7b491e5d7ef1eaf Mon Sep 17 00:00:00 2001 From: Jonathan Gimeno Date: Thu, 27 Feb 2020 15:56:07 +0100 Subject: [PATCH] change default and fix test --- server/start.go | 4 +++- server/start_test.go | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/start.go b/server/start.go index 4749edf633..68bd9e55ef 100644 --- a/server/start.go +++ b/server/start.go @@ -83,6 +83,8 @@ which accepts a path for the resulting pprof file. cmd.Flags().String(flagAddress, "tcp://0.0.0.0:26658", "Listen address") cmd.Flags().String(flagTraceStore, "", "Enable KVStore tracing to an output file") cmd.Flags().String(flagPruning, "syncable", "Pruning strategy: syncable, nothing, everything") + cmd.Flags().Int64(flagPruningKeepEvery, 0, "Define the state number that will be kept") + cmd.Flags().Int64(flagPruningSnapshotEvery, 0, "Defines the state that will be snapshot for pruning") cmd.Flags().String( FlagMinGasPrices, "", "Minimum gas prices to accept for transactions; Any fee in a tx must meet this minimum (e.g. 0.01photino;0.0001stake)", @@ -101,7 +103,7 @@ which accepts a path for the resulting pprof file. // checkPruningParams checks that the provided pruning params are correct func checkPruningParams() error { if !viper.IsSet(flagPruning) && !viper.IsSet(flagPruningKeepEvery) && !viper.IsSet(flagPruningSnapshotEvery) { - return errPruningOptionsRequired + return nil // Use default } if viper.IsSet(flagPruning) { diff --git a/server/start_test.go b/server/start_test.go index a61a31852b..169a6fb5ae 100644 --- a/server/start_test.go +++ b/server/start_test.go @@ -17,10 +17,10 @@ func TestPruningOptions(t *testing.T) { expectedErr error }{ { - name: "none set", + name: "none set, returns nil and will use default from flags", paramInit: func() {}, - returnsErr: true, - expectedErr: errPruningOptionsRequired, + returnsErr: false, + expectedErr: nil, }, { name: "only keep-every provided",