Skip to content

Fix Qt test broken by #22219 #22992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 16, 2021
Merged

Fix Qt test broken by #22219 #22992

merged 1 commit into from
Sep 16, 2021

Conversation

ryanofsky
Copy link
Contributor

@ryanofsky ryanofsky commented Sep 16, 2021 •
edited
Loading

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 #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:

bitcoin/src/qt/test/addressbooktests.cpp

Lines 63 to 66 in 865ee1a

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());

bitcoin/src/qt/test/wallettests.cpp

Lines 141 to 144 in 865ee1a

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());

@ryanofsky ryanofsky mentioned this pull request Sep 16, 2021
Merged
@ryanofsky
Fix Qt test broken by bitcoin#22219
865ee1a 
It looks like this should have been caught by CI but perhaps there was a
conflict with a recently merged PR. Failure reported by fanquake <fanquake@gmail.com>
bitcoin#22219 (comment)
@ryanofsky
Copy link
Contributor Author

Updated f2c0afd -> 865ee1a (pr/sfix.1 -> pr/sfix.2, compare) just to make addressbooktests init more consistent with wallettests init, and to do more complete wallet initialization at the beginning of the test instead of partial initialization in the middle.

fanquake
fanquake approved these changes Sep 16, 2021
View reviewed changes
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 865ee1a - I'm merging this now to unbreak the build.

@fanquake fanquake merged commit 9424e78 into bitcoin:master Sep 16, 2021
@bitcoin bitcoin locked and limited conversation to collaborators Oct 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@fanquake fanquake fanquake approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ryanofsky @fanquake