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

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

Merged
merged 1 commit into from May 15, 2024

Conversation

luke-jr
Copy link
Member

@luke-jr luke-jr commented Dec 15, 2023

Instead of duplicating mempool options two places, just include the Options struct directly on the CTxMemPool

@DrahtBot
Copy link
Contributor

DrahtBot commented Dec 15, 2023

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.

@glozow
Copy link
Member

glozow commented Dec 18, 2023

Looking at the conflicts with kernel, v3, cluster mempool, etc., is this the kind of mempool refactor we should defer for now?

@maflcko
Copy link
Member

maflcko commented Mar 16, 2024

Closing for now due to inactivity. Leave a comment below to have it re-opened.

@maflcko maflcko closed this Mar 16, 2024
@luke-jr
Copy link
Member Author

luke-jr commented May 6, 2024

reopen please

@fanquake fanquake reopened this May 6, 2024
@luke-jr
Copy link
Member Author

luke-jr commented May 7, 2024

Rebased

Copy link
Contributor

@kristapsk kristapsk left a comment

Choose a reason for hiding this comment

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

cr utACK cc67d33

Copy link
Contributor

@jonatack jonatack left a comment

Choose a reason for hiding this comment

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

Nice cleanup.

ACK cc67d33

@achow101
Copy link
Member

ACK cc67d33

@achow101 achow101 merged commit f5fc319 into bitcoin:master May 15, 2024
16 checks passed
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

8 participants