-
Notifications
You must be signed in to change notification settings - Fork 725
[Refactoring] Budget, round 6: masternode vote for finalized budgets #1861
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
[Refactoring] Budget, round 6: masternode vote for finalized budgets #1861
Conversation
c7e4452 to
a78c07e
Compare
a78c07e to
f112960
Compare
f121301 to
16d1fe5
Compare
|
Rebased on master. Ready for review. |
furszy
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking pretty nice, made a first pass through the commits, only minor styling nits for now.
|
Nits addressed. |
Fuzzbawls
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK 03b925b269a2d9b9107b2a791120dc3d21808250
As we want to access the CBudgetProposal objects, to check finalized budgets, without locking cs_proposals, so we use the copy as a snapshot of the current state.
03b925b to
5c0d2aa
Compare
|
Rebased on master. Ready to be merged. |
furszy
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 5c0d2aa after rebase for 1916 and merging..
…iles c7051e7 [Cleanup] Remove masternode-budget.cpp/.h (random-zebra) e4f1f5e [MOVE-ONLY] Move CBudgetDB to budgetdb.h/cpp (random-zebra) 682067b [MOVE-ONLY] Move CBudgetManager to budgetmanager.h/cpp (random-zebra) 6053dc3 [MOVE-ONLY] move CBudgetProposal/CFinalizedBudget to separate files (random-zebra) 3d8ecaf [MOVE-ONLY] move CBudgetVote/CFinalizedBudgetVote to separate files (random-zebra) Pull request description: Based on top of - [x] #1861 Final round for this first cleanup of the budget classes. MOVE-ONLY commits. Split masternode-budget.h/.cpp in single files inside the `budget` subdir: - `budget/budgetdb.*` (CBudgetDB) - `budget/budgetmanager.*` (CBudgetManager) - `budget/budgetproposal.*` (CBudgetProposal) - `budget/budgetvote.*` (CBudgetVote) - `budget/finalizedbudget.*` (CFinalizedBudget) - `budget/finalizedbudgetvote.*` (CFinalizedBudgetVote) ACKs for top commit: furszy: looking good, utACK c7051e7 Fuzzbawls: ACK c7051e7 Tree-SHA512: 59d009110c615650cd4107b5ae0f8ed0a84652b033eb7e6b35b37d42f18631451c42326ac153e8c97818bf5b54020d2eca383ff2e12f274edcaa9d2bcf7137ea
Based on top of
Starting with
[Trivial] Rename global budget object to g_budgetman(64f0840)This refactors
CFinalizedBudget::SubmitVote, moving it to the budget manager (VoteOnFinalizedBudgets), and removing the nested locking issues.It also does some trivial cleanup:
g_budgetmanCBudgetVote/CFinalizedBudgetconstructorsDumpBudgets(instead of using the global one)