refactor: move deprecatedmigration pkg to under migration pkg (#3552)

rodrodros · web-flow · commit 8449d65a65c5 · 2026-04-16T11:28:45.000+01:00
* refactor: move deprecated migration pkg to under migration pkg

* fix: lint
diff --git a/cmd/juno/dbcmd.go b/cmd/juno/dbcmd.go
@@ -11,8 +11,8 @@ import (
 	"github.com/NethermindEth/juno/core/felt"
 	"github.com/NethermindEth/juno/db"
 	"github.com/NethermindEth/juno/db/pebblev2"
-	"github.com/NethermindEth/juno/deprecatedmigration" //nolint:staticcheck,nolintlint // deprecated package will be removed later
 	"github.com/NethermindEth/juno/migration"
+	"github.com/NethermindEth/juno/migration/deprecated" //nolint:staticcheck,nolintlint // deprecated package will be removed later
 	"github.com/NethermindEth/juno/utils"
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
@@ -109,7 +109,7 @@ func dbInfo(cmd *cobra.Command, args []string) error {
 		schemaVersion = uint64(metadata.CurrentVersion)
 	} else if errors.Is(err, db.ErrKeyNotFound) {
 		// Fall back to deprecated migration system
-		deprecatedMetadata, err := deprecatedmigration.SchemaMetadata(
+		deprecatedMetadata, err := deprecated.SchemaMetadata(
 			utils.NewNopZapLogger(),
 			database,
 		)
diff --git a/migration/deprecated/bucket_migrator.go b/migration/deprecated/bucket_migrator.go
@@ -1,4 +1,4 @@
-package deprecatedmigration
+package deprecated
 
 import (
 	"bytes"
diff --git a/migration/deprecated/bucket_migrator_test.go b/migration/deprecated/bucket_migrator_test.go
@@ -1,4 +1,4 @@
-package deprecatedmigration_test
+package deprecated_test
 
 import (
 	"bytes"
@@ -7,7 +7,7 @@ import (
 
 	"github.com/NethermindEth/juno/db"
 	"github.com/NethermindEth/juno/db/memory"
-	"github.com/NethermindEth/juno/deprecatedmigration"
+	"github.com/NethermindEth/juno/migration/deprecated"
 	"github.com/NethermindEth/juno/utils"
 	"github.com/stretchr/testify/require"
 )
@@ -16,7 +16,7 @@ func TestBucketMover(t *testing.T) {
 	beforeCalled := false
 	sourceBucket := db.Bucket(0)
 	destBucket := db.Bucket(1)
-	mover := deprecatedmigration.NewBucketMover(sourceBucket, destBucket).WithBefore(func() {
+	mover := deprecated.NewBucketMover(sourceBucket, destBucket).WithBefore(func() {
 		beforeCalled = true
 	}).WithBatchSize(2).WithKeyFilter(func(b []byte) (bool, error) {
 		return len(b) > 1, nil
@@ -39,7 +39,7 @@ func TestBucketMover(t *testing.T) {
 		err               error
 	)
 	_, err = mover.Migrate(t.Context(), testDB, &utils.Mainnet, nil)
-	require.ErrorIs(t, err, deprecatedmigration.ErrCallWithNewTransaction)
+	require.ErrorIs(t, err, deprecated.ErrCallWithNewTransaction)
 
 	intermediateState, err = mover.Migrate(t.Context(), testDB, &utils.Mainnet, nil)
 	require.NoError(t, err)
diff --git a/migration/deprecated/casmhashmetadata/committer.go b/migration/deprecated/casmhashmetadata/committer.go
diff --git a/migration/deprecated/casmhashmetadata/ingestors.go b/migration/deprecated/casmhashmetadata/ingestors.go
@@ -6,7 +6,7 @@ import (
 	"github.com/NethermindEth/juno/core"
 	"github.com/NethermindEth/juno/core/felt"
 	"github.com/NethermindEth/juno/db"
-	"github.com/NethermindEth/juno/deprecatedmigration/progresslogger"
+	"github.com/NethermindEth/juno/migration/deprecated/progresslogger"
 	"github.com/NethermindEth/juno/migration/pipeline"
 	"github.com/NethermindEth/juno/migration/semaphore"
 )
diff --git a/migration/deprecated/casmhashmetadata/migrator.go b/migration/deprecated/casmhashmetadata/migrator.go
@@ -14,7 +14,7 @@ import (
 	"github.com/NethermindEth/juno/db/typed"
 	"github.com/NethermindEth/juno/db/typed/key"
 	"github.com/NethermindEth/juno/db/typed/value"
-	deprecatedprogresslogger "github.com/NethermindEth/juno/deprecatedmigration/progresslogger"
+	deprecatedprogresslogger "github.com/NethermindEth/juno/migration/deprecated/progresslogger"
 	"github.com/NethermindEth/juno/migration/pipeline"
 	progresslogger "github.com/NethermindEth/juno/migration/progresslogger"
 	"github.com/NethermindEth/juno/migration/semaphore"
diff --git a/migration/deprecated/init_pkg_test.go b/migration/deprecated/init_pkg_test.go
@@ -1,4 +1,4 @@
-package deprecatedmigration
+package deprecated
 
 import (
 	_ "github.com/NethermindEth/juno/encoder/registry"
diff --git a/migration/deprecated/l1handlermapping/committer.go b/migration/deprecated/l1handlermapping/committer.go
diff --git a/migration/deprecated/l1handlermapping/ingestor.go b/migration/deprecated/l1handlermapping/ingestor.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/NethermindEth/juno/core"
 	"github.com/NethermindEth/juno/db"
-	"github.com/NethermindEth/juno/deprecatedmigration/progresslogger"
 	"github.com/NethermindEth/juno/migration/blocktransactions/txlayout"
+	"github.com/NethermindEth/juno/migration/deprecated/progresslogger"
 	"github.com/NethermindEth/juno/migration/pipeline"
 	"github.com/NethermindEth/juno/migration/semaphore"
 )
diff --git a/migration/deprecated/l1handlermapping/init_test.go b/migration/deprecated/l1handlermapping/init_test.go
diff --git a/migration/deprecated/l1handlermapping/migrator.go b/migration/deprecated/l1handlermapping/migrator.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/NethermindEth/juno/core"
 	"github.com/NethermindEth/juno/db"
-	deprecatedprogresslogger "github.com/NethermindEth/juno/deprecatedmigration/progresslogger"
+	deprecatedprogresslogger "github.com/NethermindEth/juno/migration/deprecated/progresslogger"
 	"github.com/NethermindEth/juno/migration/pipeline"
 	progresslogger "github.com/NethermindEth/juno/migration/progresslogger"
 	"github.com/NethermindEth/juno/migration/semaphore"
diff --git a/migration/deprecated/l1handlermapping/migrator_test.go b/migration/deprecated/l1handlermapping/migrator_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/NethermindEth/juno/core/felt"
 	"github.com/NethermindEth/juno/db"
 	"github.com/NethermindEth/juno/db/memory"
-	"github.com/NethermindEth/juno/deprecatedmigration/l1handlermapping"
 	"github.com/NethermindEth/juno/migration/blocktransactions/txlayout"
+	"github.com/NethermindEth/juno/migration/deprecated/l1handlermapping"
 	"github.com/NethermindEth/juno/utils"
 	"github.com/stretchr/testify/require"
 )
diff --git a/migration/deprecated/migration.go b/migration/deprecated/migration.go
@@ -1,8 +1,8 @@
-// Package deprecatedmigration contains the legacy migration system.
+// Package deprecated contains the legacy migration system.
 //
 // Deprecated: This package is deprecated and will be removed in a future version.
 // Use the migration package instead for new migrations.
-package deprecatedmigration
+package deprecated
 
 import (
 	"bytes"
@@ -24,10 +24,10 @@ import (
 	"github.com/NethermindEth/juno/db/typed"
 	"github.com/NethermindEth/juno/db/typed/key"
 	"github.com/NethermindEth/juno/db/typed/value"
-	"github.com/NethermindEth/juno/deprecatedmigration/casmhashmetadata"
-	"github.com/NethermindEth/juno/deprecatedmigration/l1handlermapping"
 	"github.com/NethermindEth/juno/encoder"
 	"github.com/NethermindEth/juno/migration/blocktransactions/txlayout"
+	"github.com/NethermindEth/juno/migration/deprecated/casmhashmetadata"
+	"github.com/NethermindEth/juno/migration/deprecated/l1handlermapping"
 	"github.com/NethermindEth/juno/starknet"
 	"github.com/NethermindEth/juno/utils"
 	"github.com/bits-and-blooms/bitset"
diff --git a/migration/deprecated/migration_pkg_test.go b/migration/deprecated/migration_pkg_test.go
@@ -1,4 +1,4 @@
-package deprecatedmigration
+package deprecated
 
 import (
 	"bytes"
diff --git a/migration/deprecated/migration_test.go b/migration/deprecated/migration_test.go
@@ -1,11 +1,11 @@
-package deprecatedmigration_test
+package deprecated_test
 
 import (
 	"context"
 	"testing"
 
 	"github.com/NethermindEth/juno/db/memory"
-	"github.com/NethermindEth/juno/deprecatedmigration"
+	"github.com/NethermindEth/juno/migration/deprecated"
 	"github.com/NethermindEth/juno/utils"
 	"github.com/stretchr/testify/require"
 )
@@ -18,7 +18,7 @@ func TestMigrateIfNeeded(t *testing.T) {
 	t.Run("Migration should not happen on cancelled ctx", func(t *testing.T) {
 		require.ErrorIs(
 			t,
-			deprecatedmigration.MigrateIfNeeded(
+			deprecated.MigrateIfNeeded(
 				ctx,
 				testDB,
 				&utils.Mainnet,
@@ -27,15 +27,15 @@ func TestMigrateIfNeeded(t *testing.T) {
 			ctx.Err())
 	})
 
-	meta, err := deprecatedmigration.SchemaMetadata(utils.NewNopZapLogger(), testDB)
+	meta, err := deprecated.SchemaMetadata(utils.NewNopZapLogger(), testDB)
 	require.NoError(t, err)
 	require.Equal(t, uint64(0), meta.Version)
 	require.Nil(t, meta.IntermediateState)
 
 	t.Run("Migration should happen on empty DB", func(t *testing.T) {
 		require.NoError(
 			t,
-			deprecatedmigration.MigrateIfNeeded(
+			deprecated.MigrateIfNeeded(
 				t.Context(),
 				testDB,
 				&utils.Mainnet,
@@ -44,22 +44,22 @@ func TestMigrateIfNeeded(t *testing.T) {
 		)
 	})
 
-	meta, err = deprecatedmigration.SchemaMetadata(utils.NewNopZapLogger(), testDB)
+	meta, err = deprecated.SchemaMetadata(utils.NewNopZapLogger(), testDB)
 	require.NoError(t, err)
 	require.NotEqual(t, uint64(0), meta.Version)
 	require.Nil(t, meta.IntermediateState)
 
 	t.Run("subsequent calls to MigrateIfNeeded should not change the DB version", func(t *testing.T) {
 		require.NoError(
 			t,
-			deprecatedmigration.MigrateIfNeeded(
+			deprecated.MigrateIfNeeded(
 				t.Context(),
 				testDB,
 				&utils.Mainnet,
 				utils.NewNopZapLogger(),
 			),
 		)
-		postVersion, postErr := deprecatedmigration.SchemaMetadata(utils.NewNopZapLogger(), testDB)
+		postVersion, postErr := deprecated.SchemaMetadata(utils.NewNopZapLogger(), testDB)
 		require.NoError(t, postErr)
 		require.Equal(t, meta, postVersion)
 	})
diff --git a/migration/deprecated/progresslogger/block_progress_tracker.go b/migration/deprecated/progresslogger/block_progress_tracker.go
diff --git a/migration/deprecated/state_test.go b/migration/deprecated/state_test.go
@@ -1,4 +1,4 @@
-package deprecatedmigration
+package deprecated
 
 import (
 	"errors"
diff --git a/node/migration.go b/node/migration.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/NethermindEth/juno/db"
-	"github.com/NethermindEth/juno/deprecatedmigration" //nolint:staticcheck,nolintlint,lll // ignore statick check package will be removed in future, nolinlint because main config does not check
 	"github.com/NethermindEth/juno/migration"
 	"github.com/NethermindEth/juno/migration/blocktransactions"
+	"github.com/NethermindEth/juno/migration/deprecated" //nolint:staticcheck,nolintlint,lll // ignore statick check package will be removed in future, nolinlint because main config does not check
 	"github.com/NethermindEth/juno/utils"
 )
 
@@ -35,7 +35,7 @@ func migrateIfNeeded(
 ) error {
 	migrateFn := func() error {
 		// Run deprecated migrations first
-		if err := deprecatedmigration.MigrateIfNeeded(
+		if err := deprecated.MigrateIfNeeded(
 			ctx,
 			db,
 			&config.Network,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package deprecatedmigration`
	`1`	`+package deprecated`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/NethermindEth/juno/core"`
`7`	`7`	`"github.com/NethermindEth/juno/core/felt"`
`8`	`8`	`"github.com/NethermindEth/juno/db"`
`9`		`- "github.com/NethermindEth/juno/deprecatedmigration/progresslogger"`
	`9`	`+ "github.com/NethermindEth/juno/migration/deprecated/progresslogger"`
`10`	`10`	`"github.com/NethermindEth/juno/migration/pipeline"`
`11`	`11`	`"github.com/NethermindEth/juno/migration/semaphore"`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/NethermindEth/juno/core"`
`7`	`7`	`"github.com/NethermindEth/juno/db"`
`8`		`- "github.com/NethermindEth/juno/deprecatedmigration/progresslogger"`
`9`	`8`	`"github.com/NethermindEth/juno/migration/blocktransactions/txlayout"`
	`9`	`+ "github.com/NethermindEth/juno/migration/deprecated/progresslogger"`
`10`	`10`	`"github.com/NethermindEth/juno/migration/pipeline"`
`11`	`11`	`"github.com/NethermindEth/juno/migration/semaphore"`
`12`	`12`	`)`