Add and use CBlockIndexHeightOnlyComparator

...also use std::sort for clarity

1 files changed, 8 insertions, 9 deletions

diff --git a/src/validation.cpp b/src/validation.cpp
index eebb6773d4..2828b4ae98 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -65,21 +65,22 @@
 using node::BLOCKFILE_CHUNK_SIZE;
 using node::BlockManager;
 using node::BlockMap;
+using node::CBlockIndexHeightOnlyComparator;
 using node::CBlockIndexWorkComparator;
 using node::CCoinsStats;
 using node::CoinStatsHashType;
+using node::fHavePruned;
+using node::fImporting;
+using node::fPruneMode;
+using node::fReindex;
 using node::GetUTXOStats;
+using node::nPruneTarget;
 using node::OpenBlockFile;
 using node::ReadBlockFromDisk;
 using node::SnapshotMetadata;
 using node::UNDOFILE_CHUNK_SIZE;
 using node::UndoReadFromDisk;
 using node::UnlinkPrunedFiles;
-using node::fHavePruned;
-using node::fImporting;
-using node::fPruneMode;
-using node::fReindex;
-using node::nPruneTarget;
 
 #define MICRO 0.000001
 #define MILLI 0.001
@@ -4073,10 +4074,8 @@ bool ChainstateManager::LoadBlockIndex()
         for (auto& [_, block_index] : m_blockman.m_block_index) {
             vSortedByHeight.push_back(&block_index);
         }
-        sort(vSortedByHeight.begin(), vSortedByHeight.end(),
-             [](const CBlockIndex* pa, const CBlockIndex* pb) {
-                 return pa->nHeight < pb->nHeight;
-             });
+        std::sort(vSortedByHeight.begin(), vSortedByHeight.end(),
+                  CBlockIndexHeightOnlyComparator());
 
         // Find start of assumed-valid region.
         int first_assumed_valid_height = std::numeric_limits<int>::max();