fix: repair coinjoin_inouts_tests build after isman moved out of LLMQContext - #7624
Conversation
PR dashpay#7603 moved CInstantSendManager out of LLMQContext into NodeContext and updated every call site that existed when that branch was cut. Two CoinJoin server test cases landed on develop afterwards, so the merge kept their m_node.llmq_ctx->isman spelling while the member itself was gone - the trees do not overlap textually, so neither the merge nor a rebase flags it, and develop no longer compiles.
|
🕓 Ready for review — 1 ahead in queue (commit bb6e7a0) |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
Included review availability: Your plan provides up to 4 included reviews per hour; 3 remain after this review. WalkthroughBoth affected CoinJoin tests now pass Estimated code review effort: 1 (Trivial) | ~2 minutes Merge Risk: ⚪ Minimal · up to This test-only change updates two references to the current NodeContext location and does not alter product behavior; the reported full build and targeted tests pass, so no actionable merge-blocking risk remains. Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Issue being fixed or feature implemented
developdoes not compile since #7603 merged:This is a semantic merge conflict, not a mistake in either branch. #7603 moved
CInstantSendManagerout ofLLMQContextintoNodeContext(refactor: move CInstantSendManager out of LLMQContext, thenrefactor: drop the isman reference member from LLMQContext) and updated every call site that existed when that branch was cut. Two CoinJoin server test cases —server_addentry_binds_entries_to_accepted_collateralsandserver_addentry_rejects_entries_once_the_session_finalized— landed ondevelopafterwards, spelledm_node.llmq_ctx->ismanlike the five call sites around them.The two sides never touch the same lines, so git had nothing to flag. I confirmed the same two references also survive a conflict-free rebase of #7603 onto
develop, so neither merge strategy would have caught this; only a build does.What was done?
Rewrote the two surviving references to
m_node.isman, matching the five sites in the same file that #7603 already converted.How Has This Been Tested?
macOS (arm64), depends build, autotools:
make -j— clean build of the full tree, no errors../src/test/test_dash --run_test=coinjoin_inouts_tests— 49 test cases, no errors detected.grep -rn 'llmq_ctx->isman\|llmq_ctx\.isman' src/— no remaining references anywhere in the tree.Breaking Changes
None. Test-only change; no behavior change.
Checklist: