fix(pair configs): fix migration (astroport-fi#44)

* Fix CL pair type migration: * remove the old key * save with a new key
classic-terra · Apr 5, 2023 · e83a620 · e83a620
1 parent 0b00509
commit e83a620
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/factory/src/migration.rs b/contracts/factory/src/migration.rs
@@ -78,7 +78,7 @@ pub fn migrate_pair_configs(storage: &mut dyn Storage) -> Result<(), StdError> {
 
     for key in keys {
         let old_pair_configs = OLD_PAIR_CONFIGS.load(storage, key.clone())?;
-        let pair_type = match old_pair_configs.pair_type {
+        let pair_type = match old_pair_configs.pair_type.clone() {
             OldPairType::Xyk {} => PairType::Xyk {},
             OldPairType::Stable {} => PairType::Stable {},
             OldPairType::Concentrated {} => PairType::Custom("concentrated".to_string()),
@@ -87,14 +87,19 @@ pub fn migrate_pair_configs(storage: &mut dyn Storage) -> Result<(), StdError> {
 
         let pair_config = PairConfig {
             code_id: old_pair_configs.code_id,
-            pair_type,
+            pair_type: pair_type.clone(),
             total_fee_bps: old_pair_configs.total_fee_bps,
             maker_fee_bps: old_pair_configs.maker_fee_bps,
             is_disabled: old_pair_configs.is_disabled,
             is_generator_disabled: old_pair_configs.is_generator_disabled,
         };
 
-        PAIR_CONFIGS.save(storage, key, &pair_config)?;
+        if key != pair_type.to_string() {
+            PAIR_CONFIGS.remove(storage, key);
+            PAIR_CONFIGS.save(storage, pair_type.to_string(), &pair_config)?;
+        } else {
+            PAIR_CONFIGS.save(storage, key, &pair_config)?;
+        }
     }
 
     Ok(())