Followups from #28970:
opportunistic 1p1c followups #30012
pull glozow wants to merge 6 commits into bitcoin:master from glozow:2024-05-1p1c-followups changing 7 files +27 −43-
glozow commented at 12:43 PM on May 1, 2024: member
-
[refactor] make MempoolAcceptResult::m_replaced_transactions non-optional 8496f69e1c
-
9a762efc7a
[txpackages] use std::lexicographical_compare instead of sorting hex strings
No behavior change, but getting the hex string is more expensive than necessary.
-
[doc] remove redundant PackageToValidate comment c2ada05307
-
[refactor] have ProcessPackageResult take a PackageToValidate 2b482dc1f3
- glozow added the label Refactoring on May 1, 2024
-
DrahtBot commented at 12:43 PM on May 1, 2024: contributor
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
Code Coverage
For detailed information about the code coverage, see the test coverage report.
<!--021abf342d371248e50ceaed478a90ca-->
Reviews
See the guideline for information on the review process.
Type Reviewers ACK instagibbs If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
<!--174a7506f384e20aa4161008e828411d-->
Conflicts
Reviewers, this pull request conflicts with the following ones:
- #29641 (scripted-diff: Use LogInfo/LogDebug over LogPrintf/LogPrint by maflcko)
- #28984 (Cluster size 2 package rbf by instagibbs)
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.
-
Process every MempoolAcceptResult regardless of PackageValidationResult 6119f76ef7
- instagibbs approved
-
instagibbs commented at 7:31 PM on May 1, 2024: member
ACK 6119f76ef72c1adc55c1a384c20f8ba9e1a01206
-
fanquake commented at 4:09 AM on May 2, 2024: member
Can this also address:
txorphanage.cpp:281:21: error: loop variable 'child_iter' creates a copy from type '__gnu_debug::_Safe_iterator<std::_Rb_tree_iterator<std::pair<const transaction_identifier<false>, TxOrphanage::OrphanTx>>, std::map<transaction_identifier<false>, TxOrphanage::OrphanTx>> const' [-Werror,-Wrange-loop-construct] 281 | for (const auto child_iter : iters) { | ^ txorphanage.cpp:281:10: note: use reference type '__gnu_debug::_Safe_iterator<std::_Rb_tree_iterator<std::pair<const transaction_identifier<false>, TxOrphanage::OrphanTx>>, std::map<transaction_identifier<false>, TxOrphanage::OrphanTx>> const &' to prevent copying 281 | for (const auto child_iter : iters) { | ^~~~~~~~~~~~~~~~~~~~~~~ | & txorphanage.cpp:313:21: error: loop variable 'child_iter' creates a copy from type '__gnu_debug::_Safe_iterator<std::_Rb_tree_iterator<std::pair<const transaction_identifier<false>, TxOrphanage::OrphanTx>>, std::map<transaction_identifier<false>, TxOrphanage::OrphanTx>> const' [-Werror,-Wrange-loop-construct] 313 | for (const auto child_iter : iters) { | ^ txorphanage.cpp:313:10: note: use reference type '__gnu_debug::_Safe_iterator<std::_Rb_tree_iterator<std::pair<const transaction_identifier<false>, TxOrphanage::OrphanTx>>, std::map<transaction_identifier<false>, TxOrphanage::OrphanTx>> const &' to prevent copying 313 | for (const auto child_iter : iters) { | ^~~~~~~~~~~~~~~~~~~~~~~ | & -
[refactor] use reference in for loop through iters 7f6fb73c82
-
glozow commented at 10:27 AM on May 2, 2024: member
Can this also address:
Added. I made a copy instead of reference because it's a pointer.
-
instagibbs commented at 1:28 PM on May 2, 2024: member
reACK https://github.com/bitcoin/bitcoin/pull/30012/commits/7f6fb73c82fdff2afe5edefcc335ba6707d5627d
just the non-pointer copying added
- fanquake merged this on May 3, 2024
- fanquake closed this on May 3, 2024
- glozow deleted the branch on May 9, 2024
- Fabcien referenced this in commit be7fbc1fd1 on Jul 19, 2024
- roqqit referenced this in commit c6d1bfae72 on Aug 1, 2024
- bitcoin locked this on May 9, 2025
