Skip to content

Commit fa53e3a

Browse files
author
MarcoFalke
committed
scripted-diff: Move miner to src/node
-BEGIN VERIFY SCRIPT- # Move module git mv src/miner.cpp src/node/ git mv src/miner.h src/node/ # Replacements sed -i 's:miner\.h:node/miner.h:g' $(git grep -l miner) sed -i 's:miner\.cpp:node/miner.cpp:g' $(git grep -l miner) sed -i 's:MINER_H:NODE_MINER_H:g' $(git grep -l MINER_H) -END VERIFY SCRIPT-
1 parent ad09c28 commit fa53e3a

File tree

12 files changed

+15
-15
lines changed

12 files changed

+15
-15
lines changed

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ BITCOIN_CORE_H = \
166166
mapport.h \
167167
memusage.h \
168168
merkleblock.h \
169-
miner.h \
169+
node/miner.h \
170170
net.h \
171171
net_permissions.h \
172172
net_processing.h \
@@ -334,7 +334,7 @@ libbitcoin_server_a_SOURCES = \
334334
index/txindex.cpp \
335335
init.cpp \
336336
mapport.cpp \
337-
miner.cpp \
337+
node/miner.cpp \
338338
net.cpp \
339339
net_processing.cpp \
340340
node/blockstorage.cpp \

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <interfaces/init.h>
3030
#include <interfaces/node.h>
3131
#include <mapport.h>
32-
#include <miner.h>
32+
#include <node/miner.h>
3333
#include <net.h>
3434
#include <net_permissions.h>
3535
#include <net_processing.h>

src/miner.cpp renamed to src/node/miner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <miner.h>
6+
#include <node/miner.h>
77

88
#include <chain.h>
99
#include <chainparams.h>

src/miner.h renamed to src/node/miner.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#ifndef BITCOIN_MINER_H
7-
#define BITCOIN_MINER_H
6+
#ifndef BITCOIN_NODE_MINER_H
7+
#define BITCOIN_NODE_MINER_H
88

99
#include <primitives/block.h>
1010
#include <txmempool.h>
@@ -205,4 +205,4 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam
205205
/** Update an old GenerateCoinbaseCommitment from CreateNewBlock after the block txs have changed */
206206
void RegenerateCommitments(CBlock& block, ChainstateManager& chainman);
207207

208-
#endif // BITCOIN_MINER_H
208+
#endif // BITCOIN_NODE_MINER_H

src/rpc/mining.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <deploymentinfo.h>
1414
#include <deploymentstatus.h>
1515
#include <key_io.h>
16-
#include <miner.h>
16+
#include <node/miner.h>
1717
#include <net.h>
1818
#include <node/context.h>
1919
#include <policy/fees.h>

src/test/blockfilter_index_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <chainparams.h>
77
#include <consensus/validation.h>
88
#include <index/blockfilterindex.h>
9-
#include <miner.h>
9+
#include <node/miner.h>
1010
#include <pow.h>
1111
#include <script/standard.h>
1212
#include <test/util/blockfilter.h>

src/test/fuzz/tx_pool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <consensus/validation.h>
6-
#include <miner.h>
6+
#include <node/miner.h>
77
#include <test/fuzz/FuzzedDataProvider.h>
88
#include <test/fuzz/fuzz.h>
99
#include <test/fuzz/util.h>

src/test/miner_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <consensus/consensus.h>
88
#include <consensus/merkle.h>
99
#include <consensus/tx_verify.h>
10-
#include <miner.h>
10+
#include <node/miner.h>
1111
#include <policy/policy.h>
1212
#include <script/standard.h>
1313
#include <txmempool.h>

src/test/util/mining.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <chainparams.h>
88
#include <consensus/merkle.h>
99
#include <key_io.h>
10-
#include <miner.h>
10+
#include <node/miner.h>
1111
#include <node/context.h>
1212
#include <pow.h>
1313
#include <script/standard.h>

src/test/util/setup_common.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <crypto/sha256.h>
1414
#include <init.h>
1515
#include <interfaces/chain.h>
16-
#include <miner.h>
16+
#include <node/miner.h>
1717
#include <net.h>
1818
#include <net_processing.h>
1919
#include <noui.h>

0 commit comments

Comments
 (0)