merge bitcoin#23517: Move miner to src/node

dashpay · Oct 25, 2024 · 0b65f1d · 0b65f1d
1 parent b7db4cb
commit 0b65f1d
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -258,7 +258,6 @@ BITCOIN_CORE_H = \
   memusage.h \
   merkleblock.h \
   messagesigner.h \
-  miner.h \
   minisketchwrapper.h \
   net.h \
   net_permissions.h \
@@ -275,6 +274,7 @@ BITCOIN_CORE_H = \
   node/connection_types.h \
   node/context.h \
   node/eviction.h \
+  node/miner.h \
   node/psbt.h \
   node/transaction.h \
   node/ui_interface.h \
@@ -494,7 +494,6 @@ libbitcoin_server_a_SOURCES = \
   masternode/payments.cpp \
   masternode/sync.cpp \
   masternode/utils.cpp \
-  miner.cpp \
   minisketchwrapper.cpp \
   net.cpp \
   netfulfilledman.cpp \
@@ -507,6 +506,7 @@ libbitcoin_server_a_SOURCES = \
   node/context.cpp \
   node/eviction.cpp \
   node/interfaces.cpp \
+  node/miner.cpp \
   node/psbt.cpp \
   node/transaction.cpp \
   node/ui_interface.cpp \

diff --git a/src/init.cpp b/src/init.cpp
@@ -31,7 +31,7 @@
 #include <index/txindex.h>
 #include <interfaces/node.h>
 #include <mapport.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <net.h>
 #include <net_permissions.h>
 #include <net_processing.h>

diff --git a/src/miner.cpp → src/node/miner.cpp b/src/miner.cpp → src/node/miner.cpp
@@ -4,7 +4,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <miner.h>
+#include <node/miner.h>
 
 #include <chain.h>
 #include <chainparams.h>
@@ -22,6 +22,7 @@
 #include <timedata.h>
 #include <util/moneystr.h>
 #include <util/system.h>
+#include <validation.h>
 
 #include <evo/specialtx.h>
 #include <evo/cbtx.h>
@@ -37,7 +38,6 @@
 #include <llmq/options.h>
 #include <masternode/payments.h>
 #include <spork.h>
-#include <validation.h>
 
 #include <algorithm>
 #include <utility>

diff --git a/src/miner.h → src/node/miner.h b/src/miner.h → src/node/miner.h
@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_MINER_H
-#define BITCOIN_MINER_H
+#ifndef BITCOIN_NODE_MINER_H
+#define BITCOIN_NODE_MINER_H
 
 #include <primitives/block.h>
 #include <txmempool.h>
@@ -234,4 +234,4 @@ class BlockAssembler
 void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
 int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev);
 
-#endif // BITCOIN_MINER_H
+#endif // BITCOIN_NODE_MINER_H
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -19,9 +19,9 @@
 #include <llmq/chainlocks.h>
 #include <llmq/instantsend.h>
 #include <evo/evodb.h>
-#include <miner.h>
 #include <net.h>
 #include <node/context.h>
+#include <node/miner.h>
 #include <policy/fees.h>
 #include <pow.h>
 #include <rpc/blockchain.h>

diff --git a/src/test/block_reward_reallocation_tests.cpp b/src/test/block_reward_reallocation_tests.cpp
@@ -9,8 +9,8 @@
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
 #include <messagesigner.h>
-#include <miner.h>
 #include <netbase.h>
+#include <node/miner.h>
 #include <script/interpreter.h>
 #include <script/sign.h>
 #include <script/signingprovider.h>

diff --git a/src/test/blockfilter_index_tests.cpp b/src/test/blockfilter_index_tests.cpp
@@ -6,7 +6,7 @@
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <index/blockfilterindex.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <pow.h>
 #include <script/standard.h>
 #include <spork.h>

diff --git a/src/test/dynamic_activation_thresholds_tests.cpp b/src/test/dynamic_activation_thresholds_tests.cpp
@@ -7,7 +7,7 @@
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <script/interpreter.h>
 #include <spork.h>
 #include <validation.h>

diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <consensus/validation.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>

diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
@@ -13,7 +13,7 @@
 #include <llmq/chainlocks.h>
 #include <llmq/context.h>
 #include <llmq/instantsend.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <policy/policy.h>
 #include <pow.h>
 #include <script/standard.h>

diff --git a/src/test/util/mining.cpp b/src/test/util/mining.cpp
@@ -8,8 +8,8 @@
 #include <consensus/merkle.h>
 #include <evo/evodb.h>
 #include <key_io.h>
-#include <miner.h>
 #include <node/context.h>
+#include <node/miner.h>
 #include <pow.h>
 #include <script/standard.h>
 #include <spork.h>

diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -27,10 +27,10 @@
 #include <llmq/snapshot.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
-#include <miner.h>
 #include <net.h>
 #include <net_processing.h>
 #include <noui.h>
+#include <node/miner.h>
 #include <policy/fees.h>
 #include <pow.h>
 #include <rpc/blockchain.h>

diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp
@@ -8,7 +8,7 @@
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <pow.h>
 #include <random.h>
 #include <script/standard.h>