refactor: llmq/clsig.{cpp,h} > chainlock/clsig.{cpp,h}

Author: kwvg

src/Makefile.am

@@ -150,6 +150,7 @@ BITCOIN_CORE_H = \
   cachemultimap.h \
   blockfilter.h \
   chain.h \
+  chainlock/clsig.h \
   chainparams.h \
   chainparamsbase.h \
   chainparamsseeds.h \
@@ -240,7 +241,6 @@ BITCOIN_CORE_H = \
   limitedmap.h \
   llmq/blockprocessor.h \
   llmq/chainlocks.h \
-  llmq/clsig.h \
   llmq/commitment.h \
   llmq/context.h \
   llmq/debug.h \
@@ -455,6 +455,7 @@ libbitcoin_node_a_SOURCES = \
   blockencodings.cpp \
   blockfilter.cpp \
   chain.cpp \
+  chainlock/clsig.cpp \
   coinjoin/coinjoin.cpp \
   coinjoin/context.cpp \
   coinjoin/server.cpp \
@@ -499,7 +500,6 @@ libbitcoin_node_a_SOURCES = \
   instantsend/signing.cpp \
   llmq/blockprocessor.cpp \
   llmq/chainlocks.cpp \
-  llmq/clsig.cpp \
   llmq/commitment.cpp \
   llmq/context.cpp \
   llmq/debug.cpp \

src/llmq/clsig.cpp renamed to src/chainlock/clsig.cpp

@@ -2,7 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/clsig.h>
+#include <chainlock/clsig.h>
+
 #include <tinyformat.h>
 
 namespace llmq {

src/llmq/clsig.h renamed to src/chainlock/clsig.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_CLSIG_H
-#define BITCOIN_LLMQ_CLSIG_H
+#ifndef BITCOIN_CHAINLOCK_CLSIG_H
+#define BITCOIN_CHAINLOCK_CLSIG_H
 
 #include <bls/bls.h>
 #include <serialize.h>
@@ -43,4 +43,4 @@ class CChainLockSig
 };
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_CLSIG_H
+#endif // BITCOIN_CHAINLOCK_CLSIG_H

src/evo/specialtxman.cpp

@@ -8,6 +8,12 @@
 #include <consensus/amount.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
+#include <hash.h>
+#include <primitives/block.h>
+#include <util/irange.h>
+#include <validation.h>
+
+#include <chainlock/clsig.h>
 #include <evo/assetlocktx.h>
 #include <evo/cbtx.h>
 #include <evo/creditpool.h>
@@ -16,13 +22,9 @@
 #include <evo/simplifiedmns.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/chainlocks.h>
-#include <llmq/clsig.h>
 #include <llmq/commitment.h>
 #include <llmq/quorums.h>
 #include <llmq/utils.h>
-#include <primitives/block.h>
-#include <util/irange.h>
-#include <validation.h>
 
 static bool CheckCbTxBestChainlock(const CCbTx& cbTx, const CBlockIndex* pindex,
                                    const llmq::CChainLocksHandler& chainlock_handler, BlockValidationState& state)

src/llmq/chainlocks.h

@@ -5,7 +5,7 @@
 #ifndef BITCOIN_LLMQ_CHAINLOCKS_H
 #define BITCOIN_LLMQ_CHAINLOCKS_H
 
-#include <llmq/clsig.h>
+#include <chainlock/clsig.h>
 
 #include <crypto/common.h> // For ReadLE64
 #include <llmq/signing.h>

src/test/llmq_chainlock_tests.cpp

@@ -5,10 +5,11 @@
 #include <test/util/llmq_tests.h>
 #include <test/util/setup_common.h>
 
-#include <llmq/clsig.h>
 #include <streams.h>
 #include <util/strencodings.h>
 
+#include <chainlock/clsig.h>
+
 #include <boost/test/unit_test.hpp>
 
 using namespace llmq;

src/test/util/llmq_tests.h

@@ -5,19 +5,21 @@
 #ifndef BITCOIN_TEST_UTIL_LLMQ_TESTS_H
 #define BITCOIN_TEST_UTIL_LLMQ_TESTS_H
 
+#include <test/util/setup_common.h>
+
 #include <arith_uint256.h>
 #include <bls/bls.h>
 #include <consensus/params.h>
-#include <llmq/clsig.h>
-#include <llmq/commitment.h>
-#include <llmq/params.h>
 #include <primitives/transaction.h>
 #include <random.h>
 #include <serialize.h>
 #include <streams.h>
-#include <test/util/setup_common.h>
 #include <uint256.h>
 
+#include <chainlock/clsig.h>
+#include <llmq/commitment.h>
+#include <llmq/params.h>
+
 #include <vector>
 
 namespace llmq {

src/zmq/zmqpublishnotifier.cpp

@@ -10,10 +10,10 @@
 #include <node/blockstorage.h>
 #include <streams.h>
 
+#include <chainlock/clsig.h>
 #include <governance/common.h>
 #include <governance/vote.h>
 #include <instantsend/lock.h>
-#include <llmq/chainlocks.h>
 #include <llmq/signing.h>
 
 #include <zmq.h>

test/util/data/non-backported.txt

@@ -4,6 +4,8 @@ src/bls/*.cpp
 src/bls/*.h
 src/cachemap.h
 src/cachemultimap.h
+src/chainlock/*.cpp
+src/chainlock/*.h
 src/coinjoin/*.cpp
 src/coinjoin/*.h
 src/ctpl_stl.h