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.

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

[MN] more cleanup over the tier two area. #1825

Merged
merged 7 commits into from
Sep 9, 2020
Merged

[MN] more cleanup over the tier two area. #1825

merged 7 commits into from
Sep 9, 2020

Conversation

furszy
Copy link

@furszy furszy commented Aug 29, 2020 •
edited
Loading

This time removing:

  1. GetOldestBlock & GetNewestBlock unused methods from CMasternodePayments.
  2. pubKeyCollateralAddress1 & pubKeyMasternode1 unused members from CMasternode.
  3. Direct chainActive access in GetLastPaid from CMasternode.

Plus:

  1. Added a missing cs lock in CMasternode::Check

@furszy furszy self-assigned this Aug 29, 2020
@furszy furszy force-pushed the 2020_mnPayments_minor_cleanup branch from a8eb3d8 to 7e1354a Compare August 29, 2020 04:40
random-zebra
random-zebra previously approved these changes Aug 31, 2020
View reviewed changes
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

utACK 7e1354a

@random-zebra random-zebra added this to the 5.0.0 milestone Aug 31, 2020
@furszy furszy force-pushed the 2020_mnPayments_minor_cleanup branch from 7e1354a to aa555d9 Compare September 7, 2020 22:45
@furszy
Copy link
Author

furszy commented Sep 7, 2020 •
edited
Loading

rebased on top of master and replaced the CMasternode::Check() lock for a to do. We need to be careful there, cs_main is being locked inside the function as well.

This can be merged as is now.

@furszy furszy force-pushed the 2020_mnPayments_minor_cleanup branch from dbb38b8 to c587c73 Compare September 9, 2020 16:22
random-zebra
random-zebra approved these changes Sep 9, 2020
View reviewed changes
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

re-utACK c587c73 and merging...

@random-zebra random-zebra merged commit a06c0fd into PIVX-Project:master Sep 9, 2020
@random-zebra random-zebra modified the milestones: 5.0.0, 4.3.0 Sep 10, 2020
@furszy furszy deleted the 2020_mnPayments_minor_cleanup branch November 29, 2022 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@random-zebra random-zebra random-zebra approved these changes

Assignees

@furszy furszy

Labels
Cleanup Masternode
Projects
None yet
Milestone
4.3.0
Development

Successfully merging this pull request may close these issues.
2 participants
@furszy @random-zebra