From 0972785fd723b9b3c84844bf999d6e08e163ef9d Mon Sep 17 00:00:00 2001 From: David Gumberg Date: Thu, 15 Jan 2026 17:50:05 -0800 Subject: [PATCH] wallet: Delete unnecessary PopulateWalletFromDB() calls --- src/qt/test/addressbooktests.cpp | 1 - src/qt/test/wallettests.cpp | 1 - src/wallet/dump.cpp | 7 ------- 3 files changed, 9 deletions(-) diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp index f0f2c5940b4..58b8a6d2ea2 100644 --- a/src/qt/test/addressbooktests.cpp +++ b/src/qt/test/addressbooktests.cpp @@ -77,7 +77,6 @@ void TestAddAddressesToSendBook(interfaces::Node& node) test.m_node.wallet_loader = wallet_loader.get(); node.setContext(&test.m_node); const std::shared_ptr wallet = std::make_shared(node.context()->chain.get(), "", CreateMockableWalletDatabase()); - wallet->PopulateWalletFromDB(); wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS); { LOCK(wallet->cs_wallet); diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index c5e6e116769..227117618ee 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -192,7 +192,6 @@ void SyncUpWallet(const std::shared_ptr& wallet, interfaces::Node& node std::shared_ptr SetupDescriptorsWallet(interfaces::Node& node, TestChain100Setup& test, bool watch_only = false) { std::shared_ptr wallet = std::make_shared(node.context()->chain.get(), "", CreateMockableWalletDatabase()); - wallet->PopulateWalletFromDB(); LOCK(wallet->cs_wallet); wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS); if (watch_only) { diff --git a/src/wallet/dump.cpp b/src/wallet/dump.cpp index ee800a043c9..ba71c559ea1 100644 --- a/src/wallet/dump.cpp +++ b/src/wallet/dump.cpp @@ -198,13 +198,6 @@ bool CreateFromDump(const ArgsManager& args, const std::string& name, const fs:: bool ret = true; std::shared_ptr wallet(new CWallet(/*chain=*/nullptr, name, std::move(database)), WalletToolReleaseWallet); { - LOCK(wallet->cs_wallet); - DBErrors load_wallet_ret = wallet->PopulateWalletFromDB(); - if (load_wallet_ret != DBErrors::LOAD_OK) { - error = strprintf(_("Error creating %s"), name); - return false; - } - // Get the database handle WalletDatabase& db = wallet->GetDatabase(); std::unique_ptr batch = db.MakeBatch();