Skip to content

Merge bitcoin/bitcoin#25112: util: Move error message formatting of NonFatalCheckError to cpp #132

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
Open
wants to merge 2 commits into
base: backport-0.25-batch-244
Choose a base branch
from
Open

Merge bitcoin/bitcoin#25112: util: Move error message formatting of NonFatalCheckError to cpp #132

wants to merge 2 commits into from

Conversation

DashCoreAutoGuix
Copy link
Owner

Backports bitcoin#25112

Original commit: 2222ec7

This change moves the error message formatting implementation of NonFatalCheckError from the header file to the .cpp file, allowing to strip down the header file.

Key changes:

  • Move NonFatalCheckError constructor implementation to check.cpp
  • Remove format_internal_error macro from header
  • Update template function to use direct constructor call
  • Clean up includes in header file

The CI file change (ci/test/06_script_b.sh) was omitted as Dash uses its own CI system.

Backported from Bitcoin Core v0.25

util: Move error message formatting of NonFatalCheckError to cpp
c6a4c8c 
This allows to strip down the header file

Backports bitcoin#25112: util: Move error message formatting of NonFatalCheckError to cpp
@coderabbitai coderabbitai
Copy link

coderabbitai bot commented Jun 18, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

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
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Add src/util/check.cpp to lint-tidy.sh configuration
8dae75a 
This completes the backport of bitcoin#25112 by adding the missing
CI configuration change that was in ci/test/06_script_b.sh in Bitcoin
but needs to be in ci/dash/lint-tidy.sh in Dash.
@DashCoreAutoGuix
Copy link
Owner Author

✅ Backport Verification - Issues Fixed

I found 1 issue and automatically applied a fix.

Original Bitcoin commit: 6863ad79a6 (Merge bitcoin#25112)
Changes pushed to branch: backport-0.25-batch-244-pr-25112
Fix commit: 8dae75af91

Issue Fixed:

  • Missing CI configuration change: Bitcoin added src/util/check.cpp to the tidy configuration in ci/test/06_script_b.sh. Since Dash doesn't have that file, I added it to the equivalent location in ci/dash/lint-tidy.sh.

Verification Summary:

  • ✅ All Bitcoin changes are now properly included
  • ✅ CI configuration has been updated correctly
  • ✅ All CI checks are passing
  • ✅ Change size ratio is appropriate (3 files changed, matching Bitcoin)

The backport is now complete and faithful to the original Bitcoin commit.

@DashCoreAutoGuix
Copy link
Owner Author

✅ Backport Verification Successful

No issues found! This backport is complete and faithful to the original Bitcoin change.

Original Bitcoin commit: 2222ec7
Backport PR: #132

Verification Details:

  • File operations match Bitcoin's intent
  • No missing changes detected
  • No scope creep or dependency explosions
  • Appropriate Dash CI adaptation

Change Analysis:

Bitcoin commit (2222ec7):

  • Files: 3 (ci/test/06_script_b.sh, src/util/check.cpp, src/util/check.h)
  • Stats: +22 -16 lines

Dash PR:

  • Files: 3 (ci/dash/lint-tidy.sh, src/util/check.cpp, src/util/check.h)
  • Stats: +22 -16 lines

Key Validation Points:

✅ Perfect size ratio: Changes are identical in scope (+22/-16 lines)
✅ Identical core changes: src/util/check.cpp and src/util/check.h are byte-for-byte identical to Bitcoin
✅ Proper CI adaptation: Bitcoin's ci/test/06_script_b.sh → Dash's ci/dash/lint-tidy.sh (correct)
✅ No dependency explosion: Clean refactoring that moves implementation from header to source
✅ Maintains Bitcoin intent: Strips down header file by moving NonFatalCheckError constructor to .cpp

This PR correctly moves error message formatting implementation from the header file to the source file, exactly as Bitcoin intended. The adaptation to Dash's CI system is appropriate and necessary.

This PR is ready for merge. ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@DashCoreAutoGuix