Don't handle ErrInvalidSchema in a special way

spacemeshos · Mar 13, 2024 · 4386273 · 4386273
1 parent 03f1ef8
commit 4386273
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/cmd/merge-nodes/internal/merge_action.go b/cmd/merge-nodes/internal/merge_action.go
@@ -30,9 +30,6 @@ func MergeDBs(ctx context.Context, dbLog *zap.Logger, from, to string) error {
 	var err error
 	dstDB, err = openDB(dbLog, to)
 	switch {
-	case errors.Is(err, ErrInvalidSchema):
-		dbLog.Error("target database has an invalid schema version - aborting merge")
-		return err
 	case errors.Is(err, fs.ErrNotExist):
 		// target database does not exist, create it
 		dbLog.Info("target database does not exist, creating it", zap.String("path", to))
@@ -51,7 +48,7 @@ func MergeDBs(ctx context.Context, dbLog *zap.Logger, from, to string) error {
 		}
 		defer dstDB.Close()
 	case err != nil:
-		return err
+		return fmt.Errorf("open target database: %w", err)
 	default:
 		defer dstDB.Close()
 		// target database exists, check if there is at least one key in the target key directory
@@ -64,12 +61,8 @@ func MergeDBs(ctx context.Context, dbLog *zap.Logger, from, to string) error {
 
 	// Open the source database
 	srcDB, err := openDB(dbLog, from)
-	switch {
-	case errors.Is(err, ErrInvalidSchema):
-		dbLog.Error("source database has an invalid schema version - aborting merge")
-		return err
-	case err != nil:
-		return err
+	if err != nil {
+		return fmt.Errorf("open source database: %w", err)
 	}
 	if err := srcDB.Close(); err != nil {
 		return fmt.Errorf("close source database: %w", err)

diff --git a/cmd/merge-nodes/internal/merge_action_test.go b/cmd/merge-nodes/internal/merge_action_test.go
@@ -24,8 +24,6 @@ import (
 )
 
 func Test_MergeDBs_InvalidTargetScheme(t *testing.T) {
-	observer, observedLogs := observer.New(zapcore.WarnLevel)
-	logger := zap.New(observer)
 	tmpDst := t.TempDir()
 
 	migrations, err := sql.LocalMigrations()
@@ -37,11 +35,9 @@ func Test_MergeDBs_InvalidTargetScheme(t *testing.T) {
 	require.NoError(t, err)
 	require.NoError(t, db.Close())
 
-	err = MergeDBs(context.Background(), logger, "", tmpDst)
+	err = MergeDBs(context.Background(), zaptest.NewLogger(t), "", tmpDst)
 	require.ErrorIs(t, err, ErrInvalidSchema)
-
-	require.Equal(t, 1, observedLogs.Len(), "Expected a warning log")
-	require.Equal(t, observedLogs.All()[0].Message, "target database has an invalid schema version - aborting merge")
+	require.ErrorContains(t, err, "target database")
 }
 
 func Test_MergeDBs_TargetIsSupervised(t *testing.T) {
@@ -79,8 +75,6 @@ func Test_MergeDBs_InvalidSourcePath(t *testing.T) {
 }
 
 func Test_MergeDBs_InvalidSourceScheme(t *testing.T) {
-	observer, observedLogs := observer.New(zapcore.WarnLevel)
-	logger := zap.New(observer)
 	tmpDst := t.TempDir()
 
 	migrations, err := sql.LocalMigrations()
@@ -97,10 +91,9 @@ func Test_MergeDBs_InvalidSourceScheme(t *testing.T) {
 	require.NoError(t, err)
 	require.NoError(t, db.Close())
 
-	err = MergeDBs(context.Background(), logger, tmpSrc, tmpDst)
+	err = MergeDBs(context.Background(), zaptest.NewLogger(t), tmpSrc, tmpDst)
 	require.ErrorIs(t, err, ErrInvalidSchema)
-
-	require.Equal(t, 1, observedLogs.Len(), "Expected a warning log")
+	require.ErrorContains(t, err, "source database")
 }
 
 func Test_MergeDBs_SourceIsSupervised(t *testing.T) {