refactor: snapshot manager is created independently from snapshot-int… (cosmos#236) (cosmos#255)

(cherry picked from commit 0041954)

Co-authored-by: Roman <roman@osmosis.team>

Author: 2 people

baseapp/baseapp_test.go

@@ -2036,7 +2036,7 @@ func TestBaseApp_EndBlock(t *testing.T) {
 	require.Equal(t, cp.Block.MaxGas, res.ConsensusParamUpdates.Block.MaxGas)
 }
 
-func TestBaseApp_Init(t *testing.T) {
+func TestBaseApp_Init_PruningAndSnapshot(t *testing.T) {
 	db := memdb.NewDB()
 	name := t.Name()
 	logger := defaultLogger()
@@ -2045,10 +2045,11 @@ func TestBaseApp_Init(t *testing.T) {
 	require.NoError(t, err)
 
 	testCases := map[string]struct {
-		bapp             *BaseApp
-		expectedPruning  pruningtypes.PruningOptions
-		expectedSnapshot snapshottypes.SnapshotOptions
-		expectedErr      error
+		bapp                 *BaseApp
+		expectedPruning      pruningtypes.PruningOptions
+		expectedSnapshot     snapshottypes.SnapshotOptions
+		expectedErr          error
+		isSnapshotManagerNil bool
 	}{
 		"snapshot but no pruning": {
 			NewBaseApp(name, logger, db, nil,
@@ -2058,14 +2059,26 @@ func TestBaseApp_Init(t *testing.T) {
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			// if no pruning is set, the default is PruneNothing
 			nil,
+			false,
+		},
+		"nil snapshot store": {
+			NewBaseApp(name, logger, db, nil,
+				SetPruning(pruningtypes.NewPruningOptions(pruningtypes.PruningNothing)),
+				SetSnapshot(nil, snapshottypes.NewSnapshotOptions(1500, 2)),
+			),
+			pruningtypes.NewPruningOptions(pruningtypes.PruningNothing),
+			snapshottypes.SnapshotOptions{},
+			nil,
+			true,
 		},
 		"pruning everything only": {
 			NewBaseApp(name, logger, db, nil,
 				SetPruning(pruningtypes.NewPruningOptions(pruningtypes.PruningEverything)),
 			),
 			pruningtypes.NewPruningOptions(pruningtypes.PruningEverything),
-			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
+			snapshottypes.SnapshotOptions{},
 			nil,
+			true,
 		},
 		"pruning nothing only": {
 			NewBaseApp(name, logger, db, nil,
@@ -2074,6 +2087,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningNothing),
 			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
 			nil,
+			true,
 		},
 		"pruning default only": {
 			NewBaseApp(name, logger, db, nil,
@@ -2082,6 +2096,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningDefault),
 			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
 			nil,
+			true,
 		},
 		"pruning custom only": {
 			NewBaseApp(name, logger, db, nil,
@@ -2090,6 +2105,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 10),
 			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
 			nil,
+			true,
 		},
 		"pruning everything and snapshots": {
 			NewBaseApp(name, logger, db, nil,
@@ -2099,6 +2115,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningEverything),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			nil,
+			false,
 		},
 		"pruning nothing and snapshots": {
 			NewBaseApp(name, logger, db, nil,
@@ -2108,6 +2125,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningNothing),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			nil,
+			false,
 		},
 		"pruning default and snapshots": {
 			NewBaseApp(name, logger, db, nil,
@@ -2117,6 +2135,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningDefault),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			nil,
+			false,
 		},
 		"pruning custom and snapshots": {
 			NewBaseApp(name, logger, db, nil,
@@ -2126,6 +2145,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 10),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			nil,
+			false,
 		},
 		"error custom pruning 0 interval": {
 			NewBaseApp(name, logger, db, nil,
@@ -2135,6 +2155,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 0),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			pruningtypes.ErrPruningIntervalZero,
+			false,
 		},
 		"error custom pruning too small interval": {
 			NewBaseApp(name, logger, db, nil,
@@ -2144,24 +2165,27 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 9),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			pruningtypes.ErrPruningIntervalTooSmall,
+			false,
 		},
 		"error custom pruning too small keep recent": {
 			NewBaseApp(name, logger, db, nil,
-				SetPruning(pruningtypes.NewCustomPruningOptions(9, 10)),
+				SetPruning(pruningtypes.NewCustomPruningOptions(1, 10)),
 				SetSnapshot(snapshotStore, snapshottypes.NewSnapshotOptions(1500, 2)),
 			),
-			pruningtypes.NewCustomPruningOptions(9, 10),
+			pruningtypes.NewCustomPruningOptions(1, 10),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			pruningtypes.ErrPruningKeepRecentTooSmall,
+			false,
 		},
-		"snapshot zero interval - manager not set": {
+		"snapshot zero interval - manager is set": {
 			NewBaseApp(name, logger, db, nil,
 				SetPruning(pruningtypes.NewCustomPruningOptions(10, 10)),
 				SetSnapshot(snapshotStore, snapshottypes.NewSnapshotOptions(0, 2)),
 			),
 			pruningtypes.NewCustomPruningOptions(10, 10),
-			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
+			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 2),
 			nil,
+			false,
 		},
 		"snapshot zero keep recent - allowed": {
 			NewBaseApp(name, logger, db, nil,
@@ -2171,26 +2195,27 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 10),
 			snapshottypes.NewSnapshotOptions(1500, 0), // 0 snapshot-keep-recent means keep all
 			nil,
+			false,
 		},
 	}
 
-	for _, tc := range testCases {
+	for k, tc := range testCases {
 		// Init and validate
-		require.Equal(t, tc.expectedErr, tc.bapp.Init())
+		require.Equal(t, tc.expectedErr, tc.bapp.Init(), k)
 		if tc.expectedErr != nil {
 			continue
 		}
 
 		// Check that settings were set correctly
 		actualPruning := tc.bapp.store.GetPruning()
-		require.Equal(t, tc.expectedPruning, actualPruning)
+		require.Equal(t, tc.expectedPruning, actualPruning, k)
 
-		if tc.expectedSnapshot.Interval == snapshottypes.SnapshotIntervalOff {
-			require.Nil(t, tc.bapp.snapshotManager)
+		if tc.isSnapshotManagerNil {
+			require.Nil(t, tc.bapp.snapshotManager, k)
 			continue
 		}
 
-		require.Equal(t, tc.expectedSnapshot.Interval, tc.bapp.snapshotManager.GetInterval())
-		require.Equal(t, tc.expectedSnapshot.KeepRecent, tc.bapp.snapshotManager.GetKeepRecent())
+		require.Equal(t, tc.expectedSnapshot.Interval, tc.bapp.snapshotManager.GetInterval(), k)
+		require.Equal(t, tc.expectedSnapshot.KeepRecent, tc.bapp.snapshotManager.GetKeepRecent(), k)
 	}
 }

baseapp/options.go

@@ -209,7 +209,7 @@ func (app *BaseApp) SetSnapshot(snapshotStore *snapshots.Store, opts snapshottyp
 	if app.sealed {
 		panic("SetSnapshot() on sealed BaseApp")
 	}
-	if snapshotStore == nil || opts.Interval == snapshottypes.SnapshotIntervalOff {
+	if snapshotStore == nil {
 		app.snapshotManager = nil
 		return
 	}