Skip to content

fix: repair coinjoin_inouts_tests build after isman moved out of LLMQContext - #7624

Merged
PastaPastaPasta merged 1 commit into
dashpay:developfrom
PastaPastaPasta:fix/coinjoin-inouts-tests-isman
Aug 20, 2026
Merged

fix: repair coinjoin_inouts_tests build after isman moved out of LLMQContext#7624
PastaPastaPasta merged 1 commit into
dashpay:developfrom
PastaPastaPasta:fix/coinjoin-inouts-tests-isman

Conversation

@PastaPastaPasta

Copy link
Copy Markdown
Member

Issue being fixed or feature implemented

develop does not compile since #7603 merged:

test/coinjoin_inouts_tests.cpp:354:60: error: no member named 'isman' in 'LLMQContext'
  354 |                                   *Assert(m_node.llmq_ctx->isman));
test/coinjoin_inouts_tests.cpp:406:60: error: no member named 'isman' in 'LLMQContext'
  406 |                                   *Assert(m_node.llmq_ctx->isman));
2 errors generated.

This is a semantic merge conflict, not a mistake in either branch. #7603 moved CInstantSendManager out of LLMQContext into NodeContext (refactor: move CInstantSendManager out of LLMQContext, then refactor: 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_collaterals and server_addentry_rejects_entries_once_the_session_finalized — landed on develop afterwards, spelled m_node.llmq_ctx->isman like 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:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

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.
@thepastaclaw

thepastaclaw commented Aug 20, 2026

Copy link
Copy Markdown

🕓 Ready for review — 1 ahead in queue (commit bb6e7a0)
Queue position: 2/3
ETA: start ~04:00 UTC · complete ~04:13 UTC (median 13m across 30 recent reviews; 2 slots)
Queued 23m ago · Last checked: 2026-08-20 04:00 UTC

@coderabbitai

coderabbitai Bot commented Aug 20, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dab3f7d6-05a7-4063-9551-c5236d8e9635

📥 Commits

Reviewing files that changed from the base of the PR and between 1ef87e8 and bb6e7a0.

📒 Files selected for processing (1)
  • src/test/coinjoin_inouts_tests.cpp

Included review availability: Your plan provides up to 4 included reviews per hour; 3 remain after this review.


Walkthrough

Both affected CoinJoin tests now pass m_node.isman directly to TestableCoinJoinServer instead of accessing m_node.llmq_ctx->isman.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to bb6e7

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

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title clearly identifies the build fix and the moved isman reference causing the test failure.
Description check ✅ Passed The description directly explains the compilation failure, the two changes, and the validation results.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@PastaPastaPasta PastaPastaPasta changed the title fix(test): use NodeContext::isman in coinjoin_inouts_tests fix: repair coinjoin_inouts_tests build after isman moved out of LLMQContext Aug 20, 2026
@PastaPastaPasta
PastaPastaPasta merged commit 956ec20 into dashpay:develop Aug 20, 2026
33 of 34 checks passed
@UdjinM6 UdjinM6 added this to the 24 milestone Aug 20, 2026
@PastaPastaPasta
PastaPastaPasta deleted the fix/coinjoin-inouts-tests-isman branch August 20, 2026 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants