Skip to content

Commit 9212ef4

Browse files
committed
Revert "wallet, refactor: Add wallet::NotifyWalletLoaded() function"
This reverts commit 099ad41.
1 parent 7c8dc95 commit 9212ef4

2 files changed

Lines changed: 6 additions & 10 deletions

File tree

src/wallet/wallet.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,6 @@ std::unique_ptr<interfaces::Handler> HandleLoadWallet(WalletContext& context, Lo
177177
return interfaces::MakeHandler([&context, it] { LOCK(context.wallets_mutex); context.wallet_load_fns.erase(it); });
178178
}
179179

180-
void NotifyWalletLoaded(WalletContext& context, const std::shared_ptr<CWallet>& wallet)
181-
{
182-
LOCK(context.wallets_mutex);
183-
for (auto& load_wallet : context.wallet_load_fns) {
184-
load_wallet(interfaces::MakeWallet(context, wallet));
185-
}
186-
}
187-
188180
static Mutex g_loading_wallet_mutex;
189181
static Mutex g_wallet_release_mutex;
190182
static std::condition_variable g_wallet_release_cv;
@@ -3141,7 +3133,12 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
31413133
return nullptr;
31423134
}
31433135

3144-
NotifyWalletLoaded(context, walletInstance);
3136+
{
3137+
LOCK(context.wallets_mutex);
3138+
for (auto& load_wallet : context.wallet_load_fns) {
3139+
load_wallet(interfaces::MakeWallet(context, walletInstance));
3140+
}
3141+
}
31453142

31463143
{
31473144
LOCK(walletInstance->cs_wallet);

src/wallet/wallet.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ std::shared_ptr<CWallet> LoadWallet(WalletContext& context, const std::string& n
7070
std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string& name, std::optional<bool> load_on_start, DatabaseOptions& options, DatabaseStatus& status, bilingual_str& error, std::vector<bilingual_str>& warnings);
7171
std::shared_ptr<CWallet> RestoreWallet(WalletContext& context, const fs::path& backup_file, const std::string& wallet_name, std::optional<bool> load_on_start, DatabaseStatus& status, bilingual_str& error, std::vector<bilingual_str>& warnings);
7272
std::unique_ptr<interfaces::Handler> HandleLoadWallet(WalletContext& context, LoadWalletFn load_wallet);
73-
void NotifyWalletLoaded(WalletContext& context, const std::shared_ptr<CWallet>& wallet);
7473
std::unique_ptr<WalletDatabase> MakeWalletDatabase(const std::string& name, const DatabaseOptions& options, DatabaseStatus& status, bilingual_str& error);
7574

7675
//! -paytxfee default

0 commit comments

Comments
 (0)