Skip to content

backport: Merge bitcoin#29041#7429

Closed
thepastaclaw wants to merge 1 commit into
dashpay:developfrom
thepastaclaw:takeover-7190-backport-29041
Closed

backport: Merge bitcoin#29041#7429
thepastaclaw wants to merge 1 commit into
dashpay:developfrom
thepastaclaw:takeover-7190-backport-29041

Conversation

@thepastaclaw

Copy link
Copy Markdown

backport: Merge bitcoin#29041

Issue being fixed or feature implemented

What was done?

How Has This Been Tested?

  • git diff --check upstream/develop...HEAD
  • COMMIT_RANGE=upstream/develop..HEAD test/lint/lint-whitespace.py
  • python3 -m py_compile test/functional/rpc_net.py
  • ./autogen.sh
  • ./configure --without-gui --disable-bench --disable-fuzz-binary
  • make -C src/dashbls -j4
  • make -C src/secp256k1 -j4
  • make -C src dashd -j4
  • test/functional/rpc_net.py
  • code-review dashpay/dash upstream/develop takeover-7190-backport-29041

Breaking Changes

  • None.

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

…oin#29030)

ea00f98 test: fix intermittent error in rpc_net.py (bitcoin#29030) (Sebastian Falbesoner)

Pull request description:

  Asserting for the debug log message "Added connection peer=" is insufficient for ensuring that this new connection will show up in a following getpeerinfo() call, as the debug message is written in the CNode ctor, which means it hasn't necessarily been added to CConnman.m_nodes at this point.

  Solve this by using the recently introduced `wait_for_new_peer` helper (see bitcoin#29006,  commit 00e0658), which is more robust.

  Fixes bitcoin#29030.

ACKs for top commit:
  maflcko:
    lgtm ACK ea00f98

Tree-SHA512: dda307949a466fb3b24408a8c213d307e0af2155f2e8b4e52c836a22397f9d218bf9d8c54ca55bae62a96d7566f27167db9311dd8801785c327234783af5ed00

@PastaPastaPasta PastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

utACK 5722f88; trivial

@PastaPastaPasta PastaPastaPasta marked this pull request as ready for review July 8, 2026 18:54
@thepastaclaw

thepastaclaw commented Jul 8, 2026

Copy link
Copy Markdown
Author

✅ Review complete (commit 5722f88)

@coderabbitai

coderabbitai Bot commented Jul 8, 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

Run ID: 56126cfb-0c60-4583-8080-199d748e06d8

📥 Commits

Reviewing files that changed from the base of the PR and between afe1ec5 and 5722f88.

📒 Files selected for processing (1)
  • test/functional/rpc_net.py

Walkthrough

This change modifies a single line in the functional test file test/functional/rpc_net.py. In test_getpeerinfo, the mechanism for waiting on a new peer connection is switched from an assert_debug_log context manager checking for a specific log entry to a wait_for_new_peer() context manager, applied before adding a p2p connection without sending a version.

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

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately identifies this as a backport merge of bitcoin#29041, which matches the change set.
Description check ✅ Passed The description clearly matches the backported rpc_net.py race fix and explains the scope and intent of the change.
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.
✨ 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.

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