Skip to content

Commit 7c8dc95

Browse files
committed
Revert "wallet: Postpone NotifyWalletLoaded() for encrypted wallets"
This reverts commit 6194056.
1 parent d3eeb19 commit 7c8dc95

3 files changed

Lines changed: 2 additions & 7 deletions

File tree

src/wallet/load.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ bool LoadWallets(WalletContext& context)
127127
chain.initError(error);
128128
return false;
129129
}
130-
131-
NotifyWalletLoaded(context, pwallet);
132130
AddWallet(context, pwallet);
133131
}
134132
return true;

src/wallet/test/wallet_tests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ static const std::shared_ptr<CWallet> TestLoadWallet(WalletContext& context)
5555
std::vector<bilingual_str> warnings;
5656
auto database = MakeWalletDatabase("", options, status, error);
5757
auto wallet = CWallet::Create(context, "", std::move(database), options.create_flags, error, warnings);
58-
NotifyWalletLoaded(context, wallet);
5958
if (context.chain) {
6059
wallet->postInitProcess();
6160
}

src/wallet/wallet.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,6 @@ std::shared_ptr<CWallet> LoadWalletInternal(WalletContext& context, const std::s
250250
status = DatabaseStatus::FAILED_LOAD;
251251
return nullptr;
252252
}
253-
254-
NotifyWalletLoaded(context, wallet);
255253
AddWallet(context, wallet);
256254
wallet->postInitProcess();
257255

@@ -368,8 +366,6 @@ std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string&
368366
wallet->Lock();
369367
}
370368
}
371-
372-
NotifyWalletLoaded(context, wallet);
373369
AddWallet(context, wallet);
374370
wallet->postInitProcess();
375371

@@ -3145,6 +3141,8 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
31453141
return nullptr;
31463142
}
31473143

3144+
NotifyWalletLoaded(context, walletInstance);
3145+
31483146
{
31493147
LOCK(walletInstance->cs_wallet);
31503148
walletInstance->SetBroadcastTransactions(args.GetBoolArg("-walletbroadcast", DEFAULT_WALLETBROADCAST));

0 commit comments

Comments
 (0)