refactor: use c++20 ranges instead of dumb wrapper

dashpay · Oct 6, 2023 · 7c22ff8 · 7c22ff8
1 parent d04fa75
commit 7c22ff8
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/src/bls/bls_worker.cpp b/src/bls/bls_worker.cpp
@@ -11,6 +11,7 @@
 
 #include <memory>
 #include <utility>
+#include <ranges>
 
 template <typename T>
 bool VerifyVectorHelper(Span<T> vec)
@@ -109,7 +110,7 @@ bool CBLSWorker::GenerateContributions(int quorumThreshold, Span<CBLSId> ids, BL
         };
         futures.emplace_back(workerPool.push(f));
     }
-    return ranges::all_of(futures, [](auto& f){
+    return std::ranges::all_of(futures, [](auto& f){
         return f.get();
     });
 }

diff --git a/src/coinjoin/coinjoin.h b/src/coinjoin/coinjoin.h
@@ -487,7 +487,7 @@ class CCoinJoin
 
     static constexpr int CalculateAmountPriority(CAmount nInputAmount)
     {
-        if (auto optDenom = ranges::find_if_opt(GetStandardDenominations(), [&nInputAmount](const auto& denom) {
+        if (auto optDenom = ranges_util::find_if_opt(GetStandardDenominations(), [&nInputAmount](const auto& denom) {
             return nInputAmount == denom;
         })) {
             return (float)COIN / *optDenom * 10000;

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
@@ -111,7 +111,7 @@ CDeterministicMNCPtr CDeterministicMNList::GetValidMN(const uint256& proTxHash)
 
 CDeterministicMNCPtr CDeterministicMNList::GetMNByOperatorKey(const CBLSPublicKey& pubKey) const
 {
-    const auto it = ranges::find_if(mnMap,
+    const auto it = std::find_if(mnMap.begin(), mnMap.end(),
                               [&pubKey](const auto& p){return p.second->pdmnState->pubKeyOperator.Get() == pubKey;});
     if (it == mnMap.end()) {
         return nullptr;

diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
@@ -238,17 +238,17 @@ class CDeterministicMNList
 
     [[nodiscard]] size_t GetValidMNsCount() const
     {
-        return ranges::count_if(mnMap, [this](const auto& p){ return IsMNValid(*p.second); });
+        return std::count_if(mnMap.begin(), mnMap.end(), [this](const auto& p){ return IsMNValid(*p.second); });
     }
 
     [[nodiscard]] size_t GetAllEvoCount() const
     {
-        return ranges::count_if(mnMap, [this](const auto& p) { return p.second->nType == MnType::Evo; });
+        return std::count_if(mnMap.begin(), mnMap.end(), [this](const auto& p) { return p.second->nType == MnType::Evo; });
     }
 
     [[nodiscard]] size_t GetValidEvoCount() const
     {
-        return ranges::count_if(mnMap, [this](const auto& p) { return p.second->nType == MnType::Evo && IsMNValid(*p.second); });
+        return std::count_if(mnMap.begin(), mnMap.end(), [this](const auto& p) { return p.second->nType == MnType::Evo && IsMNValid(*p.second); });
     }
 
     [[nodiscard]] size_t GetValidWeightedMNsCount() const

diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp
@@ -1094,7 +1094,7 @@ std::map<Consensus::LLMQType, QvvecSyncMode> GetEnabledQuorumVvecSyncEntries()
             throw std::invalid_argument(strprintf("Invalid format in -llmq-qvvec-sync: %s", strEntry));
         }
 
-        if (auto optLLMQParams = ranges::find_if_opt(Params().GetConsensus().llmqs,
+        if (auto optLLMQParams = ranges_util::find_if_opt(Params().GetConsensus().llmqs,
                                                      [&strLLMQType](const auto& params){return params.name == strLLMQType;})) {
             llmqType = optLLMQParams->type;
         } else {

diff --git a/src/spork.cpp b/src/spork.cpp
@@ -272,7 +272,7 @@ SporkValue CSporkManager::GetSporkValue(SporkId nSporkID) const
     }
 
 
-    if (auto optSpork = ranges::find_if_opt(sporkDefs,
+    if (auto optSpork = ranges_util::find_if_opt(sporkDefs,
                                             [&nSporkID](const auto& sporkDef){return sporkDef.sporkId == nSporkID;})) {
         return optSpork->defaultValue;
     } else {
@@ -283,7 +283,7 @@ SporkValue CSporkManager::GetSporkValue(SporkId nSporkID) const
 
 SporkId CSporkManager::GetSporkIDByName(std::string_view strName)
 {
-    if (auto optSpork = ranges::find_if_opt(sporkDefs,
+    if (auto optSpork = ranges_util::find_if_opt(sporkDefs,
                                             [&strName](const auto& sporkDef){return sporkDef.name == strName;})) {
         return optSpork->sporkId;
     }

diff --git a/src/util/ranges.h b/src/util/ranges.h
@@ -8,9 +8,10 @@
 #include <algorithm>
 #include <optional>
 
-//#if __cplusplus > 201703L // C++20 compiler
-//namespace ranges = std::ranges;
-//#else
+#if __cplusplus > 201703L // C++20 compiler
+#include <ranges>
+namespace ranges = std::ranges;
+#else
 
 #define MK_RANGE(FUN) \
 template <typename X, typename Z>               \
@@ -28,7 +29,11 @@ namespace ranges {
     MK_RANGE(any_of)
     MK_RANGE(count_if)
     MK_RANGE(find_if)
+}
+
+#endif // C++20 compiler
 
+namespace ranges_util {
     template <typename X, typename Z>
     constexpr inline auto find_if_opt(const X& ds, const Z& fn) {
         const auto it = ranges::find_if(ds, fn);
@@ -37,8 +42,6 @@ namespace ranges {
         }
         return std::optional<std::decay_t<decltype(*it)>>{};
     }
-
 }
 
-//#endif // C++20 compiler
 #endif // BITCOIN_UTIL_RANGES_H