address previousHeight == 0 guard and nits

cosmos · Apr 8, 2022 · d43a785 · d43a785
1 parent 42adba1
commit d43a785
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/pruning/manager.go b/pruning/manager.go
@@ -64,7 +64,7 @@ func (m *Manager) ResetPruningHeights() {
 // HandleHeight determines if pruneHeight height needs to be kept for pruning at the right interval prescribed by
 // the pruning strategy. Returns true if the given height was kept to be pruned at the next call to Prune(), false otherwise
 func (m *Manager) HandleHeight(previousHeight int64) int64 {
-	if m.opts.GetPruningStrategy() == types.PruningNothing {
+	if m.opts.GetPruningStrategy() == types.PruningNothing || previousHeight == 0 {
 		return 0
 	}
 

diff --git a/server/start.go b/server/start.go
@@ -25,7 +25,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
-
 	pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types"
 	"github.com/cosmos/cosmos-sdk/server/api"
 	"github.com/cosmos/cosmos-sdk/server/config"

diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go
@@ -943,8 +943,7 @@ func (rs *Store) RollbackToVersion(target int64) int64 {
 	for ; current > target; current-- {
 		rs.pruningManager.HandleHeight(current)
 	}
-	err := rs.pruneStores()
-	if err != nil {
+	if err := rs.pruneStores(); err != nil {
 		panic(err)
 	}