Refactor fix

Author: MissingNO57

app/upgrade_cudos.go

@@ -164,7 +164,12 @@ func LoadCudosGenesis(app *App, manifest *UpgradeManifest) (*map[string]interfac
 }
 
 func ProcessSourceNetworkGenesis(logger log.Logger, cudosCfg *CudosMergeConfig, genesisData *GenesisData, manifest *UpgradeManifest) error {
-	err := genesisUpgradeWithdrawIBCChannelsBalances(genesisData, cudosCfg, manifest)
+	err := writeInitialBalancesToManifest(genesisData, manifest)
+	if err != nil {
+		return fmt.Errorf("cudos merge: failed to write initial balances to manifest: %w", err)
+	}
+
+	err = genesisUpgradeWithdrawIBCChannelsBalances(genesisData, cudosCfg, manifest)
 	if err != nil {
 		return fmt.Errorf("cudos merge: failed to withdraw IBC channels balances: %w", err)
 	}
@@ -194,6 +199,11 @@ func ProcessSourceNetworkGenesis(logger log.Logger, cudosCfg *CudosMergeConfig,
 		return fmt.Errorf("cudos merge: failed to move funds: %w", err)
 	}
 
+	err = writeMovedBalancesToManifest(genesisData, manifest)
+	if err != nil {
+		return fmt.Errorf("cudos merge: failed to write moved balances to manifest")
+	}
+
 	return nil
 }
 
@@ -294,12 +304,7 @@ func CudosMergeUpgradeHandler(app *App, ctx sdk.Context, cudosCfg *CudosMergeCon
 		return fmt.Errorf("cudos merge: cudos path not set")
 	}
 
-	err := writeInitialBalancesToManifest(genesisData, manifest)
-	if err != nil {
-		return fmt.Errorf("cudos merge: failed to write initial balances to manifest: %w", err)
-	}
-
-	err = ProcessSourceNetworkGenesis(app.Logger(), cudosCfg, genesisData, manifest)
+	err := ProcessSourceNetworkGenesis(app.Logger(), cudosCfg, genesisData, manifest)
 	if err != nil {
 		return err
 	}
@@ -314,11 +319,6 @@ func CudosMergeUpgradeHandler(app *App, ctx sdk.Context, cudosCfg *CudosMergeCon
 		return fmt.Errorf("cudos merge: failed process delegations: %w", err)
 	}
 
-	err = writeMovedBalancesToManifest(genesisData, manifest)
-	if err != nil {
-		return fmt.Errorf("cudos merge: failed to write moved balances to manifest")
-	}
-
 	err = verifySupply(app, ctx, cudosCfg, manifest)
 	if err != nil {
 		return fmt.Errorf("cudos merge: failed to verify supply: %w", err)