Break circular dependency main ↔ txdb
Break the circular dependency between main and txdb by: - 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 seems specific to txdb. - Pass a functor `insertBlockIndex` to `LoadBlockIndexGuts`. This leaves it up to the caller how to insert block indices.
This commit is contained in:
committed by
lateminer
parent
69de80c238
commit
7a11d02bde
@@ -4136,7 +4136,7 @@ CBlockIndex * InsertBlockIndex(uint256 hash)
|
||||
bool static LoadBlockIndexDB()
|
||||
{
|
||||
const CChainParams& chainparams = Params();
|
||||
if (!pblocktree->LoadBlockIndexGuts())
|
||||
if (!pblocktree->LoadBlockIndexGuts(InsertBlockIndex))
|
||||
return false;
|
||||
|
||||
boost::this_thread::interruption_point();
|
||||
|
||||
Reference in New Issue
Block a user