Skip to content

refactor: Replace struct update_lock_points with lambda #23958

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

refactor: Replace struct update_lock_points with lambda #23958

wants to merge 1 commit into from

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Jan 3, 2022

This change makes code concise and improves it readability.

@hebasto
refactor: Replace struct update_lock_points with lambda
b32a43f 
This change makes code concise and improves it readability.
@DrahtBot
Copy link
Contributor

DrahtBot commented Jan 3, 2022 •
edited
Loading

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #24080 (policy: Remove unused locktime flags by MarcoFalke)
  • #23976 (document and clean up MaybeUpdateMempoolForReorg by glozow)
  • #23897 (refactor: Separate lockpoint calculate logic from CheckSequenceLocks function by hebasto)

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.

This was referenced Jan 3, 2022
Merged
Merged
glozow
glozow reviewed Jan 14, 2022
View reviewed changes
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.

Concept ACK

It seems like these structs were introduced (5add7a7) before the codebase required a C++11 compiler (67969af), so no lambdas.

Since we're doing this here, I think it makes sense to modernize the other ones too:

bitcoin/src/txmempool.cpp

Lines 26 to 65 in 807169e

struct update_descendant_state
{
update_descendant_state(int64_t _modifySize, CAmount _modifyFee, int64_t _modifyCount) :
modifySize(_modifySize), modifyFee(_modifyFee), modifyCount(_modifyCount)
{}
void operator() (CTxMemPoolEntry &e)
{ e.UpdateDescendantState(modifySize, modifyFee, modifyCount); }
private:
int64_t modifySize;
CAmount modifyFee;
int64_t modifyCount;
};
struct update_ancestor_state
{
update_ancestor_state(int64_t _modifySize, CAmount _modifyFee, int64_t _modifyCount, int64_t _modifySigOpsCost) :
modifySize(_modifySize), modifyFee(_modifyFee), modifyCount(_modifyCount), modifySigOpsCost(_modifySigOpsCost)
{}
void operator() (CTxMemPoolEntry &e)
{ e.UpdateAncestorState(modifySize, modifyFee, modifyCount, modifySigOpsCost); }
private:
int64_t modifySize;
CAmount modifyFee;
int64_t modifyCount;
int64_t modifySigOpsCost;
};
struct update_fee_delta
{
explicit update_fee_delta(int64_t _feeDelta) : feeDelta(_feeDelta) { }
void operator() (CTxMemPoolEntry &e) { e.UpdateFeeDelta(feeDelta); }
private:
int64_t feeDelta;
};

@DrahtBot DrahtBot mentioned this pull request Jan 16, 2022
Merged
@hebasto
Copy link
Member Author

hebasto commented Jan 18, 2022

Closing in favor of #23976.

@hebasto hebasto closed this Jan 18, 2022
@hebasto hebasto deleted the 220103-updatelp branch February 2, 2022 09:32
@bitcoin bitcoin locked and limited conversation to collaborators Feb 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@glozow glozow glozow left review comments

Assignees
No one assigned
Labels
Mempool Refactoring Validation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hebasto @DrahtBot @glozow