move-only: Move CBlockIndexWorkComparator to blockstorage
...it's declared in blockstorage.h
This commit is contained in:
1 parent
c600ee3816
commit
12eb05df63
2 files changed
+19
-18
No files matched your search
@@ -28,6 +28,25 @@ bool fHavePruned = false;
|
|||||||
bool fPruneMode = false;
|
bool fPruneMode = false;
|
||||||
uint64_t nPruneTarget = 0;
|
uint64_t nPruneTarget = 0;
|
||||||
|
|
||||||
|
bool CBlockIndexWorkComparator::operator()(const CBlockIndex* pa, const CBlockIndex* pb) const
|
||||||
|
{
|
||||||
|
// First sort by most total work, ...
|
||||||
|
if (pa->nChainWork > pb->nChainWork) return false;
|
||||||
|
if (pa->nChainWork < pb->nChainWork) return true;
|
||||||
|
|
||||||
|
// ... then by earliest time received, ...
|
||||||
|
if (pa->nSequenceId < pb->nSequenceId) return false;
|
||||||
|
if (pa->nSequenceId > pb->nSequenceId) return true;
|
||||||
|
|
||||||
|
// Use pointer address as tie breaker (should only happen with blocks
|
||||||
|
// loaded from disk, as those all have id 0).
|
||||||
|
if (pa < pb) return false;
|
||||||
|
if (pa > pb) return true;
|
||||||
|
|
||||||
|
// Identical blocks.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static FILE* OpenUndoFile(const FlatFilePos& pos, bool fReadOnly = false);
|
static FILE* OpenUndoFile(const FlatFilePos& pos, bool fReadOnly = false);
|
||||||
static FlatFileSeq BlockFileSeq();
|
static FlatFileSeq BlockFileSeq();
|
||||||
static FlatFileSeq UndoFileSeq();
|
static FlatFileSeq UndoFileSeq();
|
||||||
|
|||||||
@@ -107,24 +107,6 @@ const std::vector<std::string> CHECKLEVEL_DOC {
|
|||||||
"each level includes the checks of the previous levels",
|
"each level includes the checks of the previous levels",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool CBlockIndexWorkComparator::operator()(const CBlockIndex *pa, const CBlockIndex *pb) const {
|
|
||||||
// First sort by most total work, ...
|
|
||||||
if (pa->nChainWork > pb->nChainWork) return false;
|
|
||||||
if (pa->nChainWork < pb->nChainWork) return true;
|
|
||||||
|
|
||||||
// ... then by earliest time received, ...
|
|
||||||
if (pa->nSequenceId < pb->nSequenceId) return false;
|
|
||||||
if (pa->nSequenceId > pb->nSequenceId) return true;
|
|
||||||
|
|
||||||
// Use pointer address as tie breaker (should only happen with blocks
|
|
||||||
// loaded from disk, as those all have id 0).
|
|
||||||
if (pa < pb) return false;
|
|
||||||
if (pa > pb) return true;
|
|
||||||
|
|
||||||
// Identical blocks.
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mutex to guard access to validation specific variables, such as reading
|
* Mutex to guard access to validation specific variables, such as reading
|
||||||
* or changing the chainstate.
|
* or changing the chainstate.
|
||||||
|
|||||||
Reference in new issue
Block a user