mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet: Use CWallet::LoadExisting() for loading existing wallets.

Browse Source
This commit is contained in:
David Gumberg committed 2026-01-22 13:24:06 -08:00
1 parent ae66e01164
commit 70dbc79b09
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/wallet/load.cpp
+1 -1
View File
@@ -147,7 +147,7 @@ bool LoadWallets(WalletContext& context)
} }
} }
chain.initMessage(_("Loading wallet…")); chain.initMessage(_("Loading wallet…"));
std::shared_ptr<CWallet> pwallet = database ? CWallet::Create(context, name, std::move(database), options.create_flags, error, warnings) : nullptr; std::shared_ptr<CWallet> pwallet = database ? CWallet::LoadExisting(context, name, std::move(database), error, warnings) : nullptr;
if (!warnings.empty()) chain.initWarning(Join(warnings, Untranslated("\n"))); if (!warnings.empty()) chain.initWarning(Join(warnings, Untranslated("\n")));
if (!pwallet) { if (!pwallet) {
chain.initError(error); chain.initError(error);
src/wallet/wallet.cpp
+2 -2
View File
@@ -282,7 +282,7 @@ std::shared_ptr<CWallet> LoadWalletInternal(WalletContext& context, const std::s
} }
context.chain->initMessage(_("Loading wallet…")); context.chain->initMessage(_("Loading wallet…"));
std::shared_ptr<CWallet> wallet = CWallet::Create(context, name, std::move(database), options.create_flags, error, warnings); std::shared_ptr<CWallet> wallet = CWallet::LoadExisting(context, name, std::move(database), error, warnings);
if (!wallet) { if (!wallet) {
error = Untranslated("Wallet loading failed.") + Untranslated(" ") + error; error = Untranslated("Wallet loading failed.") + Untranslated(" ") + error;
status = DatabaseStatus::FAILED_LOAD; status = DatabaseStatus::FAILED_LOAD;
@@ -4252,7 +4252,7 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& walle
} }
// Make the local wallet // Make the local wallet
std::shared_ptr<CWallet> local_wallet = CWallet::Create(empty_context, wallet_name, std::move(database), options.create_flags, error, warnings); std::shared_ptr<CWallet> local_wallet = CWallet::LoadExisting(empty_context, wallet_name, std::move(database), error, warnings);
if (!local_wallet) { if (!local_wallet) {
return util::Error{Untranslated("Wallet loading failed.") + Untranslated(" ") + error}; return util::Error{Untranslated("Wallet loading failed.") + Untranslated(" ") + error};
} }