refactor: merge util/ranges.h and util/pointer.h to util/helpers.h

kwvg · kwvg · commit f6c30f126cf2 · 2026-01-11T12:08:16.000+05:30
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -399,15 +399,14 @@ BITCOIN_CORE_H = \
   util/golombrice.h \
   util/hasher.h \
   util/hash_type.h \
+  util/helpers.h \
   util/asmap.h \
   util/getuniquepath.h \
   util/macros.h \
   util/message.h \
   util/moneystr.h \
   util/overflow.h \
   util/overloaded.h \
-  util/pointer.h \
-  util/ranges.h \
   util/readwritefile.h \
   util/result.h \
   util/serfloat.h \
diff --git a/src/active/dkgsession.cpp b/src/active/dkgsession.cpp
@@ -12,7 +12,7 @@
 #include <llmq/options.h>
 #include <llmq/utils.h>
 #include <masternode/meta.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chain.h>
diff --git a/src/active/quorums.cpp b/src/active/quorums.cpp
@@ -14,7 +14,7 @@
 #include <llmq/quorums.h>
 #include <llmq/utils.h>
 #include <masternode/sync.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <chain.h>
 #include <chainparams.h>
diff --git a/src/bench/bls_dkg.cpp b/src/bench/bls_dkg.cpp
@@ -5,7 +5,7 @@
 #include <bench/bench.h>
 
 #include <bls/bls_worker.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <random.h>
 
diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
@@ -9,7 +9,7 @@
 #include <masternode/meta.h>
 #include <masternode/sync.h>
 #include <rpc/evo_util.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <wallet/coinjoin.h>
 
 #include <chain.h>
diff --git a/src/coinjoin/coinjoin.h b/src/coinjoin/coinjoin.h
@@ -7,15 +7,14 @@
 
 #include <coinjoin/common.h>
 
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <core_io.h>
 #include <netaddress.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <sync.h>
 #include <timedata.h>
-#include <univalue.h>
 #include <util/translation.h>
 #include <version.h>
 
@@ -24,6 +23,8 @@
 #include <optional>
 #include <utility>
 
+#include <univalue.h>
+
 class CChainState;
 class CBLSPublicKey;
 class CBlockIndex;
diff --git a/src/coinjoin/common.h b/src/coinjoin/common.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_COINJOIN_COMMON_H
 #define BITCOIN_COINJOIN_COMMON_H
 
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <consensus/amount.h>
 #include <primitives/transaction.h>
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
@@ -13,8 +13,7 @@
 #include <masternode/meta.h>
 #include <messagesigner.h>
 #include <stats/client.h>
-#include <util/pointer.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <chainparams.h>
 #include <coins.h>
diff --git a/src/evo/dmnstate.h b/src/evo/dmnstate.h
@@ -11,7 +11,7 @@
 #include <netaddress.h>
 #include <pubkey.h>
 #include <script/script.h>
-#include <util/pointer.h>
+#include <util/helpers.h>
 
 #include <memory>
 #include <utility>
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
@@ -9,7 +9,7 @@
 #include <evo/dmn_types.h>
 #include <evo/netinfo.h>
 #include <evo/providertx.h>
-#include <util/pointer.h>
+#include <util/helpers.h>
 
 #include <merkleblock.h>
 #include <netaddress.h>
diff --git a/src/instantsend/signing.cpp b/src/instantsend/signing.cpp
@@ -9,7 +9,7 @@
 #include <llmq/signing_shares.h>
 #include <masternode/sync.h>
 #include <spork.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <chain.h>
 #include <chainparams.h>
diff --git a/src/llmq/blockprocessor.cpp b/src/llmq/blockprocessor.cpp
@@ -9,7 +9,7 @@
 #include <llmq/commitment.h>
 #include <llmq/options.h>
 #include <llmq/utils.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chain.h>
diff --git a/src/llmq/commitment.cpp b/src/llmq/commitment.cpp
@@ -8,7 +8,7 @@
 #include <evo/specialtx.h>
 #include <llmq/options.h>
 #include <llmq/utils.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chainparams.h>
diff --git a/src/llmq/commitment.h b/src/llmq/commitment.h
@@ -8,7 +8,7 @@
 #include <bls/bls.h>
 #include <llmq/params.h>
 #include <llmq/types.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <primitives/transaction.h>
diff --git a/src/llmq/debug.cpp b/src/llmq/debug.cpp
@@ -6,7 +6,7 @@
 
 #include <evo/deterministicmns.h>
 #include <llmq/utils.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chainparams.h>
diff --git a/src/llmq/dkgsession.cpp b/src/llmq/dkgsession.cpp
@@ -12,7 +12,7 @@
 #include <llmq/options.h>
 #include <llmq/utils.h>
 #include <masternode/meta.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chainparams.h>
diff --git a/src/llmq/dkgsessionmgr.cpp b/src/llmq/dkgsessionmgr.cpp
@@ -11,7 +11,7 @@
 #include <llmq/utils.h>
 #include <spork.h>
 #include <unordered_lru_cache.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chainparams.h>
diff --git a/src/llmq/dkgsessionmgr.h b/src/llmq/dkgsessionmgr.h
@@ -9,7 +9,7 @@
 #include <bls/bls_worker.h>
 #include <llmq/dkgsessionhandler.h>
 #include <msg_result.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <net_types.h>
 
diff --git a/src/llmq/observer/quorums.cpp b/src/llmq/observer/quorums.cpp
@@ -12,7 +12,7 @@
 #include <masternode/sync.h>
 #include <msg_result.h>
 #include <unordered_lru_cache.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <chain.h>
 #include <chainparams.h>
diff --git a/src/llmq/options.cpp b/src/llmq/options.cpp
@@ -5,7 +5,7 @@
 #include <llmq/options.h>
 
 #include <spork.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chainparams.h>
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
@@ -6,7 +6,7 @@
 
 #include <evo/deterministicmns.h>
 #include <llmq/commitment.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <dbwrapper.h>
 
diff --git a/src/llmq/quorumsman.cpp b/src/llmq/quorumsman.cpp
@@ -15,7 +15,7 @@
 #include <llmq/params.h>
 #include <llmq/signhash.h>
 #include <llmq/utils.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chainparams.h>
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
@@ -13,7 +13,7 @@
 #include <llmq/signhash.h>
 #include <llmq/signing.h>
 #include <spork.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chainparams.h>
diff --git a/src/llmq/snapshot.h b/src/llmq/snapshot.h
@@ -9,7 +9,7 @@
 #include <llmq/commitment.h>
 #include <llmq/params.h>
 #include <unordered_lru_cache.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <saltedhasher.h>
 #include <serialize.h>
diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp
@@ -10,7 +10,7 @@
 #include <llmq/snapshot.h>
 #include <llmq/types.h>
 #include <masternode/meta.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chainparams.h>
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
@@ -20,7 +20,7 @@
 #include <llmq/snapshot.h>
 #include <llmq/utils.h>
 #include <rpc/evo_util.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <chainparams.h>
 #include <deploymentstatus.h>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -57,7 +57,7 @@
 #include <llmq/commitment.h>
 #include <llmq/context.h>
 #include <rpc/index_util.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <cstdint>
 #include <numeric>
diff --git a/src/spork.cpp b/src/spork.cpp
@@ -5,7 +5,7 @@
 #include <spork.h>
 
 #include <flat-database.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <chainparams.h>
 #include <key_io.h>
diff --git a/src/test/block_reward_reallocation_tests.cpp b/src/test/block_reward_reallocation_tests.cpp
@@ -9,7 +9,7 @@
 #include <evo/providertx.h>
 #include <evo/specialtx.h>
 #include <masternode/payments.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <chainparams.h>
diff --git a/src/test/bls_tests.cpp b/src/test/bls_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <bls/bls.h>
 #include <bls/bls_batchverifier.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 
 #include <clientversion.h>
 #include <random.h>
diff --git a/src/test/evo_netinfo_tests.cpp b/src/test/evo_netinfo_tests.cpp
@@ -4,12 +4,13 @@
 
 #include <test/util/setup_common.h>
 
+#include <evo/netinfo.h>
+#include <util/helpers.h>
+
 #include <chainparams.h>
 #include <clientversion.h>
-#include <evo/netinfo.h>
 #include <netbase.h>
 #include <streams.h>
-#include <util/pointer.h>
 #include <util/strencodings.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/llmq_dkg_tests.cpp b/src/test/llmq_dkg_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <llmq/dkgsession.h>
-#include <util/ranges.h>
+#include <util/helpers.h>
 #include <util/std23.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/util/helpers.h b/src/util/helpers.h
@@ -0,0 +1,48 @@
+// Copyright (c) 2021-2026 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_UTIL_HELPERS_H
+#define BITCOIN_UTIL_HELPERS_H
+
+#include <memory>
+#include <optional>
+#include <ranges>
+
+namespace util {
+template <typename X, typename Z>
+constexpr inline auto find_if_opt(const X& ds, const Z& fn)
+{
+    const auto it = std::ranges::find_if(ds, fn);
+    if (it != std::end(ds)) {
+        return std::make_optional(*it);
+    }
+    return std::optional<std::decay_t<decltype(*it)>>{};
+}
+
+template <typename T>
+constexpr inline auto irange(const T& max)
+{
+    return std::views::iota(T{0}, max);
+}
+
+template <typename T>
+inline bool shared_ptr_equal(const std::shared_ptr<T>& lhs, const std::shared_ptr<T>& rhs)
+    requires requires { *lhs == *rhs; }
+{
+    if (lhs == rhs) return true;    // Same object or both blank
+    if (!lhs || !rhs) return false; // Inequal initialization state
+    return *lhs == *rhs;            // Deep comparison
+}
+
+template <typename T>
+inline bool shared_ptr_not_equal(const std::shared_ptr<T>& lhs, const std::shared_ptr<T>& rhs)
+    requires requires { *lhs != *rhs; }
+{
+    if (lhs == rhs) return false;   // Same object or both blank
+    if (!lhs || !rhs) return true;  // Inequal initialization state
+    return *lhs != *rhs;            // Deep comparison
+}
+} // namespace util
+
+#endif // BITCOIN_UTIL_HELPERS_H
diff --git a/src/util/pointer.h b/src/util/pointer.h
diff --git a/src/util/ranges.h b/src/util/ranges.h
diff --git a/test/util/data/non-backported.txt b/test/util/data/non-backported.txt
