refactor: consolidate llmq::CQuorum{,C}Ptr definitions

Author: kwvg

src/Makefile.am

@@ -260,6 +260,7 @@ BITCOIN_CORE_H = \
   llmq/signing.h \
   llmq/signing_shares.h \
   llmq/snapshot.h \
+  llmq/types.h \
   llmq/utils.h \
   logging.h \
   logging/timer.h \

src/llmq/quorums.h

@@ -10,6 +10,7 @@
 #include <ctpl_stl.h>
 #include <evo/types.h>
 #include <llmq/params.h>
+#include <llmq/types.h>
 #include <unordered_lru_cache.h>
 
 #include <protocol.h>
@@ -170,10 +171,6 @@ class CQuorumDataRequest
  * the public key shares of individual members, which are needed to verify signature shares of these members.
  */
 
-class CQuorum;
-using CQuorumPtr = std::shared_ptr<CQuorum>;
-using CQuorumCPtr = std::shared_ptr<const CQuorum>;
-
 class CFinalCommitment;
 using CFinalCommitmentPtr = std::unique_ptr<CFinalCommitment>;
 

src/llmq/signing.h

@@ -6,17 +6,20 @@
 #define BITCOIN_LLMQ_SIGNING_H
 
 #include <bls/bls.h>
-#include <gsl/pointers.h>
 #include <llmq/params.h>
 #include <llmq/signhash.h>
+#include <llmq/types.h>
+#include <unordered_lru_cache.h>
+
 #include <net_types.h>
 #include <protocol.h>
 #include <random.h>
 #include <saltedhasher.h>
 #include <sync.h>
-#include <unordered_lru_cache.h>
 #include <util/threadinterrupt.h>
 
+#include <gsl/pointers.h>
+
 #include <string_view>
 #include <unordered_map>
 
@@ -29,10 +32,7 @@ class CInv;
 class PeerManager;
 class UniValue;
 
-namespace llmq
-{
-class CQuorum;
-using CQuorumCPtr = std::shared_ptr<const CQuorum>;
+namespace llmq {
 class CQuorumManager;
 class CSigSharesManager;
 

src/llmq/types.h

@@ -0,0 +1,17 @@
+// Copyright (c) 2025 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_LLMQ_TYPES_H
+#define BITCOIN_LLMQ_TYPES_H
+
+#include <memory>
+
+namespace llmq {
+class CQuorum;
+
+using CQuorumPtr = std::shared_ptr<CQuorum>;
+using CQuorumCPtr = std::shared_ptr<const CQuorum>;
+} // namespace llmq
+
+#endif // BITCOIN_LLMQ_TYPES_H

src/llmq/utils.cpp

@@ -4,30 +4,26 @@
 
 #include <llmq/utils.h>
 
+#include <bls/bls.h>
+#include <evo/deterministicmns.h>
 #include <llmq/options.h>
 #include <llmq/snapshot.h>
+#include <llmq/types.h>
+#include <masternode/meta.h>
+#include <util/irange.h>
+#include <util/ranges.h>
 
-#include <bls/bls.h>
 #include <chainparams.h>
 #include <deploymentstatus.h>
-#include <evo/deterministicmns.h>
-#include <masternode/meta.h>
 #include <net.h>
 #include <random.h>
-#include <util/irange.h>
-#include <util/ranges.h>
 #include <util/time.h>
 #include <util/underlying.h>
 
 #include <atomic>
 #include <optional>
 
 class CBLSSignature;
-namespace llmq {
-class CQuorum;
-using CQuorumPtr = std::shared_ptr<CQuorum>;
-using CQuorumCPtr = std::shared_ptr<const CQuorum>;
-} // namespace llmq
 
 /**
  * Forward declarations