keeper fix the main migration version check

MixinNetwork · Aug 12, 2024 · ae02184 · ae02184
1 parent c741ebf
commit ae02184
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/cmd/keeper.go b/cmd/keeper.go
@@ -31,7 +31,7 @@ func mtgFixKeeper(ctx context.Context, path string) {
 	}
 	defer txn.Rollback()
 
-	key := "FIX:bd9f968e2bfae8a376a6eab9d18df047e82bdb85:1"
+	key := "FIX:bd9f968e2bfae8a376a6eab9d18df047e82bdb85:2"
 	row := txn.QueryRowContext(ctx, "SELECT value FROM properties WHERE key=?", key)
 	err = row.Scan(&key)
 	if err == sql.ErrNoRows {

diff --git a/keeper/migrate.go b/keeper/migrate.go
@@ -28,9 +28,15 @@ func (node *Node) getMigrateAsset(ctx context.Context, safe *store.Safe, assetId
 
 func (node *Node) Migrate(ctx context.Context) error {
 	logger.Printf("keeper.Migrate() ...")
-	err := node.store.MigrateDepositCreated(ctx)
+	err := node.store.FixRequest(ctx)
+	logger.Printf("keeper.FixRequest() => %v", err)
 	if err != nil {
-		return fmt.Errorf("store.MigrateDepositCreated() => %v", err)
+		return err
+	}
+	err = node.store.MigrateDepositCreated(ctx)
+	logger.Printf("keeper.MigrateDepositCreated() => %v", err)
+	if err != nil {
+		return err
 	}
 	if node.store.CheckFullyMigrated(ctx) {
 		logger.Printf("keeper.CheckFullyMigrated() DONE")
@@ -78,8 +84,6 @@ func (node *Node) Migrate(ctx context.Context) error {
 
 	err = node.store.Migrate(ctx, ss, es)
 	logger.Printf("keeper.Migrate() => %v", err)
-	err = node.store.Migrate2(ctx)
-	logger.Printf("keeper.Migrate2() => %v", err)
 	return err
 }
 

diff --git a/keeper/store/migrate.go b/keeper/store/migrate.go
@@ -91,7 +91,7 @@ func (s *SQLite3Store) CheckFullyMigrated(ctx context.Context) bool {
 	}
 	defer tx.Rollback()
 
-	key, val := "SCHEMA:VERSION:c12674b047a4eca95af046eff41c1e71c6655c7c", ""
+	key, val := "SCHEMA:VERSION:4fca1938ab13afa2f58bc3fabb4c653331b13476", ""
 	row := tx.QueryRowContext(ctx, "SELECT value FROM properties WHERE key=?", key)
 	err = row.Scan(&val)
 	if err == sql.ErrNoRows {
@@ -137,7 +137,7 @@ func (s *SQLite3Store) MigrateDepositCreated(ctx context.Context) error {
 }
 
 // FIXME remove this
-func (s *SQLite3Store) Migrate2(ctx context.Context) error {
+func (s *SQLite3Store) FixRequest(ctx context.Context) error {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
 
@@ -147,7 +147,7 @@ func (s *SQLite3Store) Migrate2(ctx context.Context) error {
 	}
 	defer tx.Rollback()
 
-	key, val := "SCHEMA:VERSION:bd9f968e2bfae8a376a6eab9d18df047e82bdb85:1", ""
+	key, val := "FIX:VERSION:bd9f968e2bfae8a376a6eab9d18df047e82bdb85:2", ""
 	row := tx.QueryRowContext(ctx, "SELECT value FROM properties WHERE key=?", key)
 	err = row.Scan(&val)
 	if err == nil || err != sql.ErrNoRows {