Skip to content

Commit 2efcfa5

Browse files
sipasipa
committed
Merge bitcoin#9260: Mrs Peacock in The Library with The Candlestick (killed main.{h,cpp})
76faa3c Rename the remaining main.{h,cpp} to validation.{h,cpp} (Matt Corallo) e736772 Move network-msg-processing code out of main to its own file (Matt Corallo) 87c35f5 Remove orphan state wipe from UnloadBlockIndex. (Matt Corallo)
2 parents c36229b + 76faa3c commit 2efcfa5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3158
-3092
lines changed

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ define(_COPYRIGHT_YEAR, 2016)
99
define(_COPYRIGHT_HOLDERS,[The %s developers])
1010
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
1111
AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
12-
AC_CONFIG_SRCDIR([src/main.cpp])
12+
AC_CONFIG_SRCDIR([src/validation.cpp])
1313
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
1414
AC_CONFIG_AUX_DIR([build-aux])
1515
AC_CONFIG_MACRO_DIR([build-aux/m4])

‎src/Makefile.am‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ BITCOIN_CORE_H = \
104104
keystore.h \
105105
dbwrapper.h \
106106
limitedmap.h \
107-
main.h \
108107
memusage.h \
109108
merkleblock.h \
110109
miner.h \
111110
net.h \
111+
net_processing.h \
112112
netaddress.h \
113113
netbase.h \
114114
netmessagemaker.h \
@@ -145,6 +145,7 @@ BITCOIN_CORE_H = \
145145
util.h \
146146
utilmoneystr.h \
147147
utiltime.h \
148+
validation.h \
148149
validationinterface.h \
149150
versionbits.h \
150151
wallet/coincontrol.h \
@@ -179,10 +180,10 @@ libbitcoin_server_a_SOURCES = \
179180
httpserver.cpp \
180181
init.cpp \
181182
dbwrapper.cpp \
182-
main.cpp \
183183
merkleblock.cpp \
184184
miner.cpp \
185185
net.cpp \
186+
net_processing.cpp \
186187
noui.cpp \
187188
policy/fees.cpp \
188189
policy/policy.cpp \
@@ -201,6 +202,7 @@ libbitcoin_server_a_SOURCES = \
201202
txdb.cpp \
202203
txmempool.cpp \
203204
ui_interface.cpp \
205+
validation.cpp \
204206
validationinterface.cpp \
205207
versionbits.cpp \
206208
$(BITCOIN_CORE_H)

‎src/bench/Examples.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 "bench.h"
6-
#include "main.h"
6+
#include "validation.h"
77
#include "utiltime.h"
88

99
// Sanity test: this should loop ten times, and

‎src/bench/base58.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "bench.h"
66

7-
#include "main.h"
7+
#include "validation.h"
88
#include "base58.h"
99

1010
#include <vector>

‎src/bench/bench_bitcoin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "bench.h"
66

77
#include "key.h"
8-
#include "main.h"
8+
#include "validation.h"
99
#include "util.h"
1010

1111
int

‎src/bench/checkblock.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
#include "bench.h"
66

77
#include "chainparams.h"
8-
#include "main.h"
8+
#include "validation.h"
9+
#include "streams.h"
910
#include "consensus/validation.h"
1011

1112
namespace block_bench {

‎src/blockencodings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "random.h"
1111
#include "streams.h"
1212
#include "txmempool.h"
13-
#include "main.h"
13+
#include "validation.h"
1414
#include "util.h"
1515

1616
#include <unordered_map>

‎src/checkpoints.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "chain.h"
88
#include "chainparams.h"
9-
#include "main.h"
9+
#include "validation.h"
1010
#include "uint256.h"
1111

1212
#include <stdint.h>

‎src/init.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
#include "httpserver.h"
2020
#include "httprpc.h"
2121
#include "key.h"
22-
#include "main.h"
22+
#include "validation.h"
2323
#include "miner.h"
2424
#include "netbase.h"
2525
#include "net.h"
26+
#include "net_processing.h"
2627
#include "policy/policy.h"
2728
#include "rpc/server.h"
2829
#include "rpc/register.h"

‎src/miner.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "consensus/merkle.h"
1414
#include "consensus/validation.h"
1515
#include "hash.h"
16-
#include "main.h"
16+
#include "validation.h"
1717
#include "net.h"
1818
#include "policy/policy.h"
1919
#include "pow.h"

0 commit comments

Comments
 (0)