-
Notifications
You must be signed in to change notification settings - Fork 35.6k
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
Ignore banlist.dat #22570
Ignore banlist.dat #22570
Conversation
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
fa08473
to
fa718ea
Compare
Concept ACK |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approach ACK
Just to confirm that my understanding is correct: if this is merged now in master
, it will be included in 23.0 but not in 22.1, right?
Yes, the pull request is to the |
fa81dae
to
fac51e9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK fac51e9
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK fac51e9
Further cleanup is possible: bitcoin/src/test/fuzz/banman.cpp Line 55 in 787296e
bitcoin/src/test/fuzz/banman.cpp Line 117 in 787296e
|
This also allows to remove the "dirty" argument, which can now be deduced from the return value of Read().
Leaving the incorrect indentation would be frustrating because: * Some editor may fix up the whitespace when editing a file, so before commiting the whitespace changes need to be undone. * It makes it harder to use clang-format-diff on a change. Can be trivially reviewed with --word-diff-regex=. --ignore-all-space
fac51e9
to
fa1eddb
Compare
re-ACK fa1eddb |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK fa1eddb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Light code review utACK fa1eddb
Not a big fan of the huge whitespace change in the last commit, but otherwise |
Release notes for 23.0 added in #22603 |
….dat) fa2c868 doc: Add release notes for 22570 (ignore banlist.dat) (MarcoFalke) Pull request description: Follow-up to bitcoin#22570 ACKs for top commit: tryphe: ACK fa2c868 vasild: ACK fa2c868 Zero-1729: ACK fa2c868 Tree-SHA512: 58eef340b6211bcdecf3826ac145afd476c397f110daa6783521c0c1e1be1ffbd2d24ad20c77921abbe5cdb8e644d3cd64e14e2819746cf0e5123fb7cc445d63
….dat) fa2c868 doc: Add release notes for 22570 (ignore banlist.dat) (MarcoFalke) Pull request description: Follow-up to bitcoin#22570 ACKs for top commit: tryphe: ACK fa2c868 vasild: ACK fa2c868 Zero-1729: ACK fa2c868 Tree-SHA512: 58eef340b6211bcdecf3826ac145afd476c397f110daa6783521c0c1e1be1ffbd2d24ad20c77921abbe5cdb8e644d3cd64e14e2819746cf0e5123fb7cc445d63
Looks like we can re-enable the disabled assert again due to the removal of the code here: #22657 |
6919c82 MOVEONLY: Expose BanMapToJson / BanMapFromJson (Russell Yanofsky) Pull request description: This PR is part of the [process separation project](https://github.com/bitcoin/bitcoin/projects/10). --- CSubNet serialization code that was removed in #22570 fa4e6af was needed by multiprocess code to share ban map between gui and node processes. Rather than adding it back, use suggestion from MarcoFalke #10102 (comment) to use JSON serialization. This requires making BanMapToJson / BanMapFromJson functions public. ACKs for top commit: promag: reACK 6919c82. Tree-SHA512: ce909a61b7869d16cf2e9f91b643dd9d2604efc5777703d3b77a4c40cb0ccdd20396ba87b1ec85aade142e12ff9ea4c95c7155840354873579565471779f5a33
The code to read
banlist.dat
should be removed eventually. The major release (22.x) can be used to translate abanlist.dat
into abanlist.json
. Thus, it is now possible to remove the reading code.