Move goose migration ver check for evmChainID migration in helper func

smartcontractkit · Sep 18, 2023 · e0c111d · e0c111d
1 parent ccbdc3c
commit e0c111d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/core/cmd/shell.go b/core/cmd/shell.go
@@ -134,16 +134,10 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 	initGlobals(cfg.Prometheus())
 
 	// TODO TO BE REMOVED IN v2.7.0
-	migrationVer, err := migrate.Current(db.DB, appLggr)
+	err = evmChainIDMigration(cfg, db.DB, appLggr)
 	if err != nil {
 		return nil, err
 	}
-	if migrationVer == 194 {
-		err = evmChainIDMigration(cfg, db.DB)
-		if err != nil {
-			return nil, err
-		}
-	}
 
 	err = handleNodeVersioning(db, appLggr, cfg.RootDir(), cfg.Database(), cfg.WebServer().HTTPPort())
 	if err != nil {
@@ -308,7 +302,15 @@ func takeBackupIfVersionUpgrade(dbUrl url.URL, rootDir string, cfg periodicbacku
 }
 
 // evmChainIDMigration TODO TO BE REMOVED IN v2.7.0. This is a helper function for evmChainID 0195 migration in v2.6.0 only, so that we don't have to inject evmChainID into goose.
-func evmChainIDMigration(generalConfig chainlink.GeneralConfig, db *sql.DB) error {
+func evmChainIDMigration(generalConfig chainlink.GeneralConfig, db *sql.DB, lggr logger.Logger) error {
+	migrationVer, err := migrate.Current(db, lggr)
+	if err != nil {
+		return err
+	}
+	if migrationVer != 194 {
+		return nil
+	}
+
 	if generalConfig.EVMEnabled() {
 		if generalConfig.EVMConfigs() == nil {
 			return errors.New("evm configs are missing")

diff --git a/core/cmd/shell_local.go b/core/cmd/shell_local.go
@@ -852,7 +852,7 @@ func (s *Shell) MigrateDatabase(_ *cli.Context) error {
 	}()
 
 	// TODO TO BE REMOVED IN v2.7.0
-	err = evmChainIDMigration(s.Config, db)
+	err = evmChainIDMigration(s.Config, db, s.Logger)
 	if err != nil {
 		return err
 	}