From 8ebf00dbbcbd52bb28a18b3c500cf2a6ebd2087c Mon Sep 17 00:00:00 2001
From: Odysseas Gabrielides <odysseas.gabrielides@gmail.com>
Date: Thu, 18 May 2023 16:10:55 +0300
Subject: [PATCH] refactoring

---
 src/evo/simplifiedmns.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 71034954dc5be7..f936f97d5b6670 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -210,21 +210,22 @@ bool CSimplifiedMNListDiff::BuildQuorumChainlockInfo(const CBlockIndex* blockInd
         idx++;
     }
 
-    auto it = workBaseBlockIndexMap.begin();
-    while (it != workBaseBlockIndexMap.end()) {
-        // Iterate the std::multimap once per key (CBlockIndex containing the expected CL signature in CbTx)
+    for(auto it = workBaseBlockIndexMap.begin(); it != workBaseBlockIndexMap.end(); ) {
+        // Process each key (CBlockIndex containing the expected CL signature in CbTx) of the std::multimap once
         const CBlockIndex* pWorkBaseBlockIndex = it->first;
-        auto cbcl = GetNonNullCoinbaseChainlock(pWorkBaseBlockIndex);
+        const auto cbcl = GetNonNullCoinbaseChainlock(pWorkBaseBlockIndex);
         CBLSSignature sig;
         if (cbcl.has_value()) {
             sig = cbcl.value().first;
         }
         // Get the range of indexes (values) for the current key and merge them into a single std::set
-        auto range = workBaseBlockIndexMap.equal_range(pWorkBaseBlockIndex);
+        const auto range = workBaseBlockIndexMap.equal_range(it->first);
         std::set<uint16_t> idx_set;
-        for (auto i = range.first; i != range.second; ++i) {
-            idx_set.insert(i->second);
+        for (auto jt = range.first; jt != range.second; ++jt) {
+            idx_set.insert(jt->second);
         }
+        // Advance the iterator to the next key
+        it = range.second;
 
         // Different CBlockIndex can contain the same CL sig in CbTx (both non-null or null during the first blocks after v20 activation)
         // Hence, we need to merge the std::set if another std::set already exists for the same sig.
@@ -235,9 +236,6 @@ bool CSimplifiedMNListDiff::BuildQuorumChainlockInfo(const CBlockIndex* blockInd
         else {
             quorumsCLSigs.insert(std::make_pair(sig, idx_set));
         }
-
-        // Advance the iterator to the next key
-        it = range.second;
     }
 
     return true;