Skip to content

Commit 9424e78

Browse files
committed
Merge bitcoin/bitcoin#22992: Fix Qt test broken by #22219
865ee1a Fix Qt test broken by #22219 (Russell Yanofsky) Pull request description: It looks like this should have been caught by CI but there might have been a conflict with a recently merged PR like #19101. Failure was reported by fanquake bitcoin/bitcoin#22219 (comment) Fix avoids null WalletClient pointer dereference in address book test by adding MakeWalletClient call and making address book test initialization more consistent with wallet test initialization: https://github.com/bitcoin/bitcoin/blob/865ee1af201238f48671e3b79b8215f896db7a05/src/qt/test/addressbooktests.cpp#L63-L66 https://github.com/bitcoin/bitcoin/blob/865ee1af201238f48671e3b79b8215f896db7a05/src/qt/test/wallettests.cpp#L141-L144 ACKs for top commit: fanquake: ACK 865ee1a - I'm merging this now to unbreak the build. Tree-SHA512: 1f32b7fc79fa79fcf8600d23063896cbc7f8bbcff39d95747ecd546e754581f0f36ece3098ddecded175afccbb3709b4232da39a400dda23b7e550f361b515fb
2 parents 7709bf4 + 865ee1a commit 9424e78

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/qt/test/addressbooktests.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ void EditAddressAndSubmit(
6060
void TestAddAddressesToSendBook(interfaces::Node& node)
6161
{
6262
TestChain100Setup test;
63+
auto wallet_client = interfaces::MakeWalletClient(*test.m_node.chain, *Assert(test.m_node.args));
64+
test.m_node.wallet_client = wallet_client.get();
6365
node.setContext(&test.m_node);
6466
std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(node.context()->chain.get(), "", CreateMockWalletDatabase());
6567
wallet->SetupLegacyScriptPubKeyMan();

0 commit comments

Comments
 (0)