refactor: Simply include CTxMemPool::Options in CTxMemPool directly rather than duplicating definition #29086

pull luke-jr wants to merge 1 commits into bitcoin:master from luke-jr:refactor_mempoolopts changing 11 files +66 −92

luke-jr commented at 3:33 AM on December 15, 2023: member

Instead of duplicating mempool options two places, just include the Options struct directly on the CTxMemPool
DrahtBot commented at 3:34 AM on December 15, 2023: contributor


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 kristapsk, jonatack, achow101

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



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #29954 (RPC: Return permitbaremultisig and maxdatacarriersize in getmempoolinfo by kristapsk)
- #29942 (Remove redundant -datacarrier option by vostrnad)
- #29680 (wallet: fix unrelated parent conflict doesn't cause child tx to be marked as conflict by Eunovo)
- #29520 (add -limitdummyscriptdatasize option by Retropex)
- #29325 (consensus: Store transaction nVersion as uint32_t by achow101)
- #29309 (Add a -permitbarepubkey option by vostrnad)
- #29060 (Policy: Report reason inputs are non standard by ismaelsadeeq)
- #28984 (Cluster size 2 package rbf by instagibbs)
- #28830 ([refactor] Check CTxMemPool options in ctor by TheCharlatan)
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.
DrahtBot added the label Refactoring on Dec 15, 2023
glozow commented at 10:31 AM on December 18, 2023: member

Looking at the conflicts with kernel, v3, cluster mempool, etc., is this the kind of mempool refactor we should defer for now?
DrahtBot added the label Needs rebase on Dec 18, 2023
maflcko commented at 2:04 PM on March 16, 2024: member

Closing for now due to inactivity. Leave a comment below to have it re-opened.
maflcko closed this on Mar 16, 2024
luke-jr commented at 2:26 PM on May 6, 2024: member

reopen please
fanquake reopened this on May 6, 2024
refactor: Simply include CTxMemPool::Options in CTxMemPool directly rather than duplicating definition cc67d33fda
luke-jr force-pushed on May 6, 2024
DrahtBot removed the label Needs rebase on May 6, 2024
DrahtBot added the label CI failed on May 6, 2024
DrahtBot removed the label CI failed on May 7, 2024
luke-jr commented at 2:16 AM on May 7, 2024: member

Rebased
kristapsk approved
kristapsk commented at 6:53 PM on May 7, 2024: contributor

cr utACK cc67d33fdac45357b593b1faff3d1735e5fe91ba
jonatack commented at 6:02 PM on May 10, 2024: member

Nice cleanup.

ACK cc67d33fdac45357b593b1faff3d1735e5fe91ba
achow101 commented at 11:33 PM on May 14, 2024: member

ACK cc67d33fdac45357b593b1faff3d1735e5fe91ba
achow101 merged this on May 15, 2024
achow101 closed this on May 15, 2024
bitcoin locked this on May 15, 2025