[Refactor] Move CBlockFileInfo and CValidationState out of main #1302
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
barrystyle
reviewed
Jan 26, 2020
There was a problem hiding this comment.
@random-zebra mentioned it might be a good idea to group the change in amount.cpp, with the associated QT changes in a separate PR?
|
Ref: #1209 (comment) My nit was exclusively about |
Fuzzbawls
force-pushed
the
2020_setup-consensus-subdir
branch
from
fe6990f
to
d5e3f81
Compare
|
Removed the unused |
|
Also needs rebase due to conflicts with #1290 just merged. |
First part of splitting up main.cpp(.h), this moves some common consensus constants into a new consensus.h file.
The commit following this one abstracts out the CValidationState class to consensus/validation.h. During that refactor, the class' Abort method is removed. This commit expands on the pre-existing AbortNode method to allow for the validation state to be passed in.
Fuzzbawls
force-pushed
the
2020_setup-consensus-subdir
branch
from
d5e3f81
to
f578a68
Compare
|
rebased and addressed @random-zebra 's comment |
furszy
approved these changes
Jan 30, 2020
| LogPrintf("*** %s\n", strMessage); | ||
| uiInterface.ThreadSafeMessageBox( | ||
| userMessage.empty() ? _("Error: A fatal internal error occured, see debug.log for details") : userMessage, | ||
| "", CClientUIInterface::MSG_ERROR); |
There was a problem hiding this comment.
The second param here is the dialog title, would be good to set it and not leave it empty. Maybe: "Internal Error".
(Stating it for a subsequent PR, not this one.)
|
Merging... |
random-zebra
added a commit
that referenced
this pull request
Jan 30, 2020
…of main f578a68 Move CValidationState to consensus subdir (Fuzzbawls) 083cc4d Use AbortNode instead of state.Abort (Fuzzbawls) ad77d3d Move consensus constants to consensus.h (Fuzzbawls) c210d20 Move CBlockTemplate from main.h to miner.h (Fuzzbawls) 4d8b9ce Move CBlockFileInfo class from main.h to chain.h (Fuzzbawls) 668ac61 Refactor nMaxMoneyOut back to amount.h (Fuzzbawls) Pull request description: This is the first part of #1209 that moves the CBlockFileInfo and CValidationState classes (and their supporting constants) out of `main.cpp(.h)` @barrystyle's original commits have been further split to assist in review-ability ease. I left the refactor of `nMaxMoneyOut` and `CBlockTemplate` included here as they are rather straight forward, however they each now are in their own respective commits. ACKs for top commit: random-zebra: utACK f578a68 furszy: utACK f578a68 Tree-SHA512: 4433aacde02be0479d6c8ac3d6d4d725c4ed5518c82a412539e791f62b63516f042828c0407a697b4018c8f92965425f05837293a38d6da890a98bdf0e4e9dfe
random-zebra
added a commit
that referenced
this pull request
Aug 12, 2020
5147571 Break circular dependency main ↔ txdb (random-zebra) 2725fac txdb: Add Cursor() method to CCoinsView to iterate over UTXO set (random-zebra) Pull request description: Other two quick backports needed for the upcoming per-txout model. - bitcoin#7756 - Add cursor to iterate over utxo set, use this in `gettxoutsetinfo` > - Add a method `Cursor()` to `CCoinsView` that returns a cursor which can be used to iterate over the whole UTXO set. > - Implement `GetUTXOStats` in terms of this, remove `GetStats()` method on `CCoinsView`. > - Change `gettxoutsetinfo` RPC to use new `GetUTXOStats` function. - bitcoin#7815 - Break circular dependency main ↔ txdb (part of this was done already in #1302 and #1319) > - Moving `CBlockFileInfo` from main.h to chain.h. I think this makes sense, as the other block-file stuff is there too. > - Moving `CDiskTxPos` from main.h to txdb.h. This type, used for `-txindex` seems specific to txdb. > - Pass a functor `insertBlockIndex` to `LoadBlockIndexGuts`. This leaves it up to the caller how to insert block indices. ACKs for top commit: furszy: ACK 5147571 Fuzzbawls: ACK 5147571 Tree-SHA512: 166f5d797fac68667c59e002a3596af65596cd6ebee5e8b4bee538e6f66ec5f6365e4dd0bbb44be2226ebb51411d4db01f9f2417660841ed7a5125b3c8a7ad97
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the first part of #1209 that moves the CBlockFileInfo and CValidationState classes (and their supporting constants) out of
main.cpp(.h)@barrystyle's original commits have been further split to assist in review-ability ease.
I left the refactor of
nMaxMoneyOutandCBlockTemplateincluded here as they are rather straight forward, however they each now are in their own respective commits.