wallet: remove MigrateLegacyToDescriptor overload

furszy · Jan 18, 2023 · 456780b · 456780b
1 parent 8d957e3
commit 456780b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
@@ -750,14 +750,7 @@ static RPCHelpMan migratewallet()
             wallet_pass = request.params[1].isNull() ? "" : request.params[1].get_str().c_str();
 
             WalletContext& context = EnsureWalletContext(request.context);
-            std::shared_ptr<CWallet> wallet = GetWallet(context, wallet_name);
-            util::Result<MigrationResult> res;
-            if (wallet) {
-                res = MigrateLegacyToDescriptor(std::move(wallet), wallet_pass, context);
-            } else {
-                res = MigrateLegacyToDescriptor(wallet_name, wallet_pass, context);
-            }
-
+            util::Result<MigrationResult> res = MigrateLegacyToDescriptor(wallet_name, wallet_pass, context);
             if (!res) {
                 throw JSONRPCError(RPC_WALLET_ERROR, util::ErrorString(res).original);
             }

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4110,7 +4110,7 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
     return true;
 }
 
-util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet>&& wallet, SecureString passphrase, WalletContext& context)
+static util::Result<bool> UnloadWalletForMigration(std::shared_ptr<CWallet>& wallet, WalletContext& context)
 {
     std::vector<bilingual_str> warnings;
     std::string wallet_name = wallet->GetName();
@@ -4121,7 +4121,7 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet>
     }
     UnloadWallet(std::move(wallet));
 
-    return MigrateLegacyToDescriptor(wallet_name, passphrase, context);
+    return true;
 }
 
 util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, SecureString passphrase, WalletContext& context)
@@ -4130,6 +4130,12 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& walle
     bilingual_str error;
     std::vector<bilingual_str> warnings;
 
+    // If it's loaded, unload wallet during the migration process
+    if (auto wallet = GetWallet(context, wallet_name)) {
+        auto res_unload = UnloadWalletForMigration(wallet, context);
+        if (!res_unload) return util::Error{util::ErrorString(res_unload)};
+    }
+
     // Load the wallet but only in the context of this function.
     // No signals should be connected nor should anything else be aware of this wallet
     WalletContext empty_context;

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1006,7 +1006,6 @@ struct MigrationResult {
 };
 
 //! Do all steps to migrate a legacy wallet to a descriptor wallet
-util::Result<MigrationResult> MigrateLegacyToDescriptor(std::shared_ptr<CWallet>&& wallet, SecureString passphrase, WalletContext& context);
 util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, SecureString passphrase, WalletContext& context);
 } // namespace wallet