Skip to content
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.

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

28950 followups #29722

Merged
merged 2 commits into from Mar 26, 2024
Merged

28950 followups #29722

merged 2 commits into from Mar 26, 2024

Conversation

instagibbs
Copy link
Member

Follow-ups to #28950

@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 25, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK glozow, stickies-v

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@glozow
Copy link
Member

glozow commented Mar 25, 2024

LGTM. Did you want to take #28950 (comment)?

@instagibbs
Copy link
Member Author

@glozow punting on that one, thanks

@DrahtBot
Copy link
Contributor

🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the
documentation.

Possibly this is due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.

Leave a comment here, if you need help tracking down a confusing failure.

Debug: https://github.com/bitcoin/bitcoin/runs/23054231617

@fanquake
Copy link
Member

test/txpackage_tests.cpp:821:103: error: argument name 'client_maxfeerate' in comment does not match parameter name 'client_max_feerate' [bugprone-argument-comment,-warnings-as-errors]
  821 |                                                           package_rich_parent, /*test_accept=*/false, /*client_maxfeerate=*/{});
      |                                                                                                       ^~~~~~~~~~~~~~~~~~~~~~
      |                                                                                                       /*client_max_feerate=*/

Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

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

Approach ACK cc2a4a6. First commit should probably be a scripted-diff though, and I think the last 2 commits make more sense when squashed?

LGTM. Did you want to take #28950 (comment)?

I think that's fine to leave as is, as per #28950 (comment)

@instagibbs instagibbs force-pushed the 2024-03-maxfee-followup branch 3 times, most recently from a270bac to e32fde0 Compare March 25, 2024 15:34
-BEGIN VERIFY SCRIPT-
git grep -l 'max_sane_feerate' | xargs sed -i 's/max_sane_feerate/client_maxfeerate/g'
-END VERIFY SCRIPT-
@instagibbs
Copy link
Member Author

First commit should probably be a scripted-diff though, and I think the last 2 commits make more sense when squashed?

both done, thanks

Copy link
Member

@glozow glozow left a comment

Choose a reason for hiding this comment

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

utACK 7b29119

Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

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

ACK 7b29119

@glozow glozow merged commit 19b968f into bitcoin:master Mar 26, 2024
16 checks passed
@glozow glozow mentioned this pull request Mar 26, 2024
53 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants