From 51c35f4dcee865da0158e6e327fc4afc52037b58 Mon Sep 17 00:00:00 2001
From: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>
Date: Thu, 25 Jun 2020 12:41:44 -0400
Subject: [PATCH] store/types: Fix pruning opts validation (#6511)

* store/types: Fix pruning opts validation

* store/types: Add case
---
 store/types/pruning.go      |  7 +++++--
 store/types/pruning_test.go | 29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 store/types/pruning_test.go

diff --git a/store/types/pruning.go b/store/types/pruning.go
index 88783925a7..8aa7059a18 100644
--- a/store/types/pruning.go
+++ b/store/types/pruning.go
@@ -47,12 +47,15 @@ func NewPruningOptions(keepRecent, keepEvery, interval uint64) PruningOptions {
 }
 
 func (po PruningOptions) Validate() error {
-	if po.KeepRecent == 0 && po.KeepEvery == 0 && po.Interval == 0 { // prune everything
+	if po.KeepEvery == 0 && po.Interval == 0 {
 		return fmt.Errorf("invalid 'Interval' when pruning everything: %d", po.Interval)
 	}
-	if po.KeepRecent == 0 && po.KeepEvery == 1 && po.Interval != 0 { // prune nothing
+	if po.KeepEvery == 1 && po.Interval != 0 { // prune nothing
 		return fmt.Errorf("invalid 'Interval' when pruning nothing: %d", po.Interval)
 	}
+	if po.KeepEvery > 1 && po.Interval == 0 {
+		return fmt.Errorf("invalid 'Interval' when pruning: %d", po.Interval)
+	}
 
 	return nil
 }
diff --git a/store/types/pruning_test.go b/store/types/pruning_test.go
new file mode 100644
index 0000000000..2b88905ee8
--- /dev/null
+++ b/store/types/pruning_test.go
@@ -0,0 +1,29 @@
+package types
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestPruningOptions_Validate(t *testing.T) {
+	testCases := []struct {
+		keepRecent uint64
+		keepEvery  uint64
+		interval   uint64
+		expectErr  bool
+	}{
+		{100, 500, 10, false}, // default
+		{0, 0, 10, false},     // everything
+		{0, 1, 0, false},      // nothing
+		{0, 10, 10, false},
+		{100, 0, 0, true}, // invalid interval
+		{0, 1, 5, true},   // invalid interval
+	}
+
+	for _, tc := range testCases {
+		po := NewPruningOptions(tc.keepRecent, tc.keepEvery, tc.interval)
+		err := po.Validate()
+		require.Equal(t, tc.expectErr, err != nil, "options: %v, err: %s", po, err)
+	}
+}