Simplify migrations dir

0xPolygon · Jul 26, 2024 · f3d27a8 · f3d27a8
1 parent 7e796ea
commit f3d27a8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/aggregator/db/migrations.go b/aggregator/db/migrations.go
@@ -16,7 +16,7 @@ const (
 )
 
 var (
-	//go:embed migrations/aggregator/*.sql
+	//go:embed migrations/*.sql
 	embedAggregatorMigrations embed.FS
 
 	// embedMigrations is a map of migrations with the name
@@ -60,7 +60,10 @@ func runMigrations(cfg Config, name string, direction migrate.MigrationDirection
 		return fmt.Errorf("migration not found with name: %v", name)
 	}
 
-	var migrations = &migrate.EmbedFileSystemMigrationSource{FileSystem: embedMigration, Root: "migrations/aggregator/"}
+	var migrations = &migrate.EmbedFileSystemMigrationSource{
+		FileSystem: embedMigration,
+		Root:       "migrations",
+	}
 	nMigrations, err := migrate.Exec(db, "postgres", migrations, direction)
 	if err != nil {
 		return err

diff --git a/aggregator/db/migrations/aggregator/0001.sql → aggregator/db/migrations/0001.sql b/aggregator/db/migrations/aggregator/0001.sql → aggregator/db/migrations/0001.sql
diff --git a/aggregator/db/migrations_test.go b/aggregator/db/migrations_test.go
@@ -9,8 +9,11 @@ import (
 
 func Test_checkMigrations(t *testing.T) {
 	embedMigration := embedMigrations[AggregatorMigrationName]
-	migrationSource := &migrate.EmbedFileSystemMigrationSource{FileSystem: embedMigration}
+	migrationSource := &migrate.EmbedFileSystemMigrationSource{
+		FileSystem: embedMigration,
+		Root:       "migrations",
+	}
 
-	_, err := migrationSource.FileSystem.ReadFile("migrations/aggregator/0001.sql")
+	_, err := migrationSource.FileSystem.ReadFile("migrations/0001.sql")
 	assert.NoError(t, err)
 }