diff options
| author | fanquake <fanquake@gmail.com> | 2021-09-16 12:09:33 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-09-16 12:09:52 +0800 |
| commit | 9424e78f34da991de488c2f7c2409a4196f2819a (patch) | |
| tree | 68f6aa0d5985e581b3178bb2daf00bca22ae5cd5 | |
| parent | 7709bf46ce2cfe891ed82073ec58c404159f696f (diff) | |
| parent | 865ee1af201238f48671e3b79b8215f896db7a05 (diff) | |
| download | bitcoin-9424e78f34da991de488c2f7c2409a4196f2819a.tar.xz | |
Merge bitcoin/bitcoin#22992: Fix Qt test broken by #22219
865ee1af201238f48671e3b79b8215f896db7a05 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 https://github.com/bitcoin/bitcoin/pull/22219#issuecomment-920496509
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 865ee1af201238f48671e3b79b8215f896db7a05 - I'm merging this now to unbreak the build.
Tree-SHA512: 1f32b7fc79fa79fcf8600d23063896cbc7f8bbcff39d95747ecd546e754581f0f36ece3098ddecded175afccbb3709b4232da39a400dda23b7e550f361b515fb
| -rw-r--r-- | src/qt/test/addressbooktests.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp index f4d561286e..0de781661a 100644 --- a/src/qt/test/addressbooktests.cpp +++ b/src/qt/test/addressbooktests.cpp @@ -60,6 +60,8 @@ void EditAddressAndSubmit( void TestAddAddressesToSendBook(interfaces::Node& node) { TestChain100Setup test; + auto wallet_client = interfaces::MakeWalletClient(*test.m_node.chain, *Assert(test.m_node.args)); + test.m_node.wallet_client = wallet_client.get(); node.setContext(&test.m_node); std::shared_ptr<CWallet> wallet = std::make_shared<CWallet>(node.context()->chain.get(), "", CreateMockWalletDatabase()); wallet->SetupLegacyScriptPubKeyMan(); |