make wallet migration recursive

mintlayer · Jan 10, 2024 · 4697182 · 4697182
1 parent 572cbb9
commit 4697182
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/wallet/src/wallet/mod.rs b/wallet/src/wallet/mod.rs
@@ -367,12 +367,9 @@ impl<B: storage::Backend> Wallet<B> {
             WALLET_VERSION_UNINITIALIZED => return Err(WalletError::WalletNotInitialized),
             WALLET_VERSION_V1 => {
                 Self::migration_v2(db, chain_config.clone())?;
-                Self::migration_v3(db, chain_config)?;
-                Self::migration_v4(db)?;
             }
             WALLET_VERSION_V2 => {
-                Self::migration_v3(db, chain_config)?;
-                Self::migration_v4(db)?;
+                Self::migration_v3(db, chain_config.clone())?;
             }
             WALLET_VERSION_V3 => {
                 Self::migration_v4(db)?;
@@ -383,7 +380,7 @@ impl<B: storage::Backend> Wallet<B> {
             }
         }
 
-        Ok(())
+        Self::check_and_migrate_db(db, chain_config)
     }
 
     fn validate_chain_info(

diff --git a/wallet/wallet-controller/src/lib.rs b/wallet/wallet-controller/src/lib.rs
@@ -348,11 +348,11 @@ impl<T: NodeInterface + Clone + Send + Sync + 'static, W: WalletEvents> Controll
         self.wallet.lock_wallet().map_err(ControllerError::WalletError)
     }
 
-    /// Locks the wallet by making the encrypted private keys inaccessible.
+    /// Sets the lookahead size for key generation
     ///
     /// # Returns
     ///
-    /// This method returns an error if the wallet is not encrypted.
+    /// This method returns an error if you try to set lookahead size to 0
     pub fn set_lookahead_size(&mut self, lookahead_size: u32) -> Result<(), ControllerError<T>> {
         utils::ensure!(lookahead_size > 0, ControllerError::InvalidLookaheadSize);