From f0a046094e4c4b5f3af0e453492077f4911e0132 Mon Sep 17 00:00:00 2001 From: David Gumberg Date: Thu, 22 May 2025 17:38:18 -0700 Subject: [PATCH] scripted-diff: refactor: CWallet::LoadWallet->PopulateWalletFromDB There are too many functions in CWallet with names like "Load" and "Create", disambiguate what CWallet::LoadWallet does by renaming it to PopulateWalletFromDB. -BEGIN VERIFY SCRIPT- sed -i 's|\bLoadWallet()|PopulateWalletFromDB()|g' $(git grep -l 'LoadWallet()' -- ':(exclude)src/wallet/walletdb.cpp') -END VERIFY SCRIPT- --- src/qt/test/addressbooktests.cpp | 2 +- src/qt/test/wallettests.cpp | 2 +- src/wallet/dump.cpp | 2 +- src/wallet/test/wallet_tests.cpp | 2 +- src/wallet/test/walletload_tests.cpp | 4 ++-- src/wallet/wallet.cpp | 4 ++-- src/wallet/wallet.h | 2 +- src/wallet/wallettool.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp index d2ac1306ae4..f0f2c5940b4 100644 --- a/src/qt/test/addressbooktests.cpp +++ b/src/qt/test/addressbooktests.cpp @@ -77,7 +77,7 @@ 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->LoadWallet(); + 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 5e65dcca318..c5e6e116769 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -192,7 +192,7 @@ 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->LoadWallet(); + 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 6b193ad72f3..ee800a043c9 100644 --- a/src/wallet/dump.cpp +++ b/src/wallet/dump.cpp @@ -199,7 +199,7 @@ bool CreateFromDump(const ArgsManager& args, const std::string& name, const fs:: std::shared_ptr wallet(new CWallet(/*chain=*/nullptr, name, std::move(database)), WalletToolReleaseWallet); { LOCK(wallet->cs_wallet); - DBErrors load_wallet_ret = wallet->LoadWallet(); + DBErrors load_wallet_ret = wallet->PopulateWalletFromDB(); if (load_wallet_ret != DBErrors::LOAD_OK) { error = strprintf(_("Error creating %s"), name); return false; diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index bcff25931a3..16fc8576f84 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -306,7 +306,7 @@ void TestLoadWallet(const std::string& name, DatabaseFormat format, std::functio std::vector warnings; auto database{MakeWalletDatabase(name, options, status, error)}; auto wallet{std::make_shared(chain.get(), "", std::move(database))}; - BOOST_CHECK_EQUAL(wallet->LoadWallet(), DBErrors::LOAD_OK); + BOOST_CHECK_EQUAL(wallet->PopulateWalletFromDB(), DBErrors::LOAD_OK); WITH_LOCK(wallet->cs_wallet, f(wallet)); } diff --git a/src/wallet/test/walletload_tests.cpp b/src/wallet/test/walletload_tests.cpp index 0c69849d0b6..ed33613fa2b 100644 --- a/src/wallet/test/walletload_tests.cpp +++ b/src/wallet/test/walletload_tests.cpp @@ -52,7 +52,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_load_descriptors, TestingSetup) { // Now try to load the wallet and verify the error. const std::shared_ptr wallet(new CWallet(m_node.chain.get(), "", std::move(database))); - BOOST_CHECK_EQUAL(wallet->LoadWallet(), DBErrors::UNKNOWN_DESCRIPTOR); + BOOST_CHECK_EQUAL(wallet->PopulateWalletFromDB(), DBErrors::UNKNOWN_DESCRIPTOR); } // Test 2 @@ -78,7 +78,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_load_descriptors, TestingSetup) { // Now try to load the wallet and verify the error. const std::shared_ptr wallet(new CWallet(m_node.chain.get(), "", std::move(database))); - BOOST_CHECK_EQUAL(wallet->LoadWallet(), DBErrors::CORRUPT); + BOOST_CHECK_EQUAL(wallet->PopulateWalletFromDB(), DBErrors::CORRUPT); BOOST_CHECK(found); // The error must be logged } } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d08d6782c1b..4a464cdf7d6 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2290,7 +2290,7 @@ void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::ve } } -DBErrors CWallet::LoadWallet() +DBErrors CWallet::PopulateWalletFromDB() { LOCK(cs_wallet); @@ -2855,7 +2855,7 @@ std::shared_ptr CWallet::Create(WalletContext& context, const std::stri // Load wallet bool rescan_required = false; - DBErrors nLoadWalletRet = walletInstance->LoadWallet(); + DBErrors nLoadWalletRet = walletInstance->PopulateWalletFromDB(); if (nLoadWalletRet != DBErrors::LOAD_OK) { if (nLoadWalletRet == DBErrors::CORRUPT) { error = strprintf(_("Error loading %s: Wallet corrupted"), walletFile); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index b341ac6da2d..e135b9d60b6 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -797,7 +797,7 @@ public: bool IsFromMe(const CTransaction& tx) const; CAmount GetDebit(const CTransaction& tx) const; - DBErrors LoadWallet(); + DBErrors PopulateWalletFromDB(); /** Erases the provided transactions from the wallet. */ util::Result RemoveTxs(std::vector& txs_to_remove) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp index af32986ce65..b7012bd087f 100644 --- a/src/wallet/wallettool.cpp +++ b/src/wallet/wallettool.cpp @@ -54,7 +54,7 @@ static std::shared_ptr MakeWallet(const std::string& name, const fs::pa std::shared_ptr wallet_instance{new CWallet(/*chain=*/nullptr, name, std::move(database)), WalletToolReleaseWallet}; DBErrors load_wallet_ret; try { - load_wallet_ret = wallet_instance->LoadWallet(); + load_wallet_ret = wallet_instance->PopulateWalletFromDB(); } catch (const std::runtime_error&) { tfm::format(std::cerr, "Error loading %s. Is wallet being used by another process?\n", name); return nullptr;