Browse Source

Rename the remaining main.{h,cpp} to validation.{h,cpp}

tags/v0.15.1
Matt Corallo 5 years ago
parent
commit
76faa3cdfe
51 changed files with 54 additions and 54 deletions
  1. 1
    1
      configure.ac
  2. 2
    2
      src/Makefile.am
  3. 1
    1
      src/bench/Examples.cpp
  4. 1
    1
      src/bench/base58.cpp
  5. 1
    1
      src/bench/bench_bitcoin.cpp
  6. 1
    1
      src/bench/checkblock.cpp
  7. 1
    1
      src/blockencodings.cpp
  8. 1
    1
      src/checkpoints.cpp
  9. 1
    1
      src/init.cpp
  10. 1
    1
      src/miner.cpp
  11. 1
    1
      src/net_processing.cpp
  12. 1
    1
      src/policy/policy.cpp
  13. 1
    1
      src/qt/clientmodel.cpp
  14. 1
    1
      src/qt/coincontroldialog.cpp
  15. 1
    1
      src/qt/guiutil.cpp
  16. 1
    1
      src/qt/optionsdialog.cpp
  17. 1
    1
      src/qt/optionsmodel.cpp
  18. 1
    1
      src/qt/paymentserver.cpp
  19. 1
    1
      src/qt/peertablemodel.cpp
  20. 1
    1
      src/qt/sendcoinsdialog.cpp
  21. 1
    1
      src/qt/signverifymessagedialog.cpp
  22. 1
    1
      src/qt/test/rpcnestedtests.cpp
  23. 1
    1
      src/qt/transactiondesc.cpp
  24. 1
    1
      src/qt/transactionrecord.cpp
  25. 1
    1
      src/qt/transactiontablemodel.cpp
  26. 1
    1
      src/qt/walletmodel.cpp
  27. 1
    1
      src/rest.cpp
  28. 1
    1
      src/rpc/blockchain.cpp
  29. 1
    1
      src/rpc/mining.cpp
  30. 1
    1
      src/rpc/misc.cpp
  31. 1
    1
      src/rpc/net.cpp
  32. 1
    1
      src/rpc/rawtransaction.cpp
  33. 1
    1
      src/test/coins_tests.cpp
  34. 1
    1
      src/test/main_tests.cpp
  35. 1
    1
      src/test/miner_tests.cpp
  36. 1
    1
      src/test/script_P2SH_tests.cpp
  37. 1
    1
      src/test/sighash_tests.cpp
  38. 1
    1
      src/test/sigopcount_tests.cpp
  39. 1
    1
      src/test/test_bitcoin.cpp
  40. 1
    1
      src/test/transaction_tests.cpp
  41. 1
    1
      src/test/txvalidationcache_tests.cpp
  42. 1
    1
      src/test/versionbits_tests.cpp
  43. 1
    1
      src/txmempool.cpp
  44. 1
    1
      src/validation.cpp
  45. 3
    3
      src/validation.h
  46. 1
    1
      src/wallet/rpcdump.cpp
  47. 1
    1
      src/wallet/rpcwallet.cpp
  48. 1
    1
      src/wallet/wallet.cpp
  49. 1
    1
      src/wallet/walletdb.cpp
  50. 1
    1
      src/zmq/zmqnotificationinterface.cpp
  51. 1
    1
      src/zmq/zmqpublishnotifier.cpp

+ 1
- 1
configure.ac View File

@@ -9,7 +9,7 @@ define(_COPYRIGHT_YEAR, 2016)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_SRCDIR([src/validation.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])

+ 2
- 2
src/Makefile.am View File

@@ -104,7 +104,6 @@ BITCOIN_CORE_H = \
keystore.h \
dbwrapper.h \
limitedmap.h \
main.h \
memusage.h \
merkleblock.h \
miner.h \
@@ -146,6 +145,7 @@ BITCOIN_CORE_H = \
util.h \
utilmoneystr.h \
utiltime.h \
validation.h \
validationinterface.h \
versionbits.h \
wallet/coincontrol.h \
@@ -180,7 +180,6 @@ libbitcoin_server_a_SOURCES = \
httpserver.cpp \
init.cpp \
dbwrapper.cpp \
main.cpp \
merkleblock.cpp \
miner.cpp \
net.cpp \
@@ -203,6 +202,7 @@ libbitcoin_server_a_SOURCES = \
txdb.cpp \
txmempool.cpp \
ui_interface.cpp \
validation.cpp \
validationinterface.cpp \
versionbits.cpp \
$(BITCOIN_CORE_H)

+ 1
- 1
src/bench/Examples.cpp View File

@@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "bench.h"
#include "main.h"
#include "validation.h"
#include "utiltime.h"

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

+ 1
- 1
src/bench/base58.cpp View File

@@ -4,7 +4,7 @@

#include "bench.h"

#include "main.h"
#include "validation.h"
#include "base58.h"

#include <vector>

+ 1
- 1
src/bench/bench_bitcoin.cpp View File

@@ -5,7 +5,7 @@
#include "bench.h"

#include "key.h"
#include "main.h"
#include "validation.h"
#include "util.h"

int

+ 1
- 1
src/bench/checkblock.cpp View File

@@ -5,7 +5,7 @@
#include "bench.h"

#include "chainparams.h"
#include "main.h"
#include "validation.h"
#include "streams.h"
#include "consensus/validation.h"


+ 1
- 1
src/blockencodings.cpp View File

@@ -10,7 +10,7 @@
#include "random.h"
#include "streams.h"
#include "txmempool.h"
#include "main.h"
#include "validation.h"
#include "util.h"

#include <unordered_map>

+ 1
- 1
src/checkpoints.cpp View File

@@ -6,7 +6,7 @@

#include "chain.h"
#include "chainparams.h"
#include "main.h"
#include "validation.h"
#include "uint256.h"

#include <stdint.h>

+ 1
- 1
src/init.cpp View File

@@ -19,7 +19,7 @@
#include "httpserver.h"
#include "httprpc.h"
#include "key.h"
#include "main.h"
#include "validation.h"
#include "miner.h"
#include "netbase.h"
#include "net.h"

+ 1
- 1
src/miner.cpp View File

@@ -13,7 +13,7 @@
#include "consensus/merkle.h"
#include "consensus/validation.h"
#include "hash.h"
#include "main.h"
#include "validation.h"
#include "net.h"
#include "policy/policy.h"
#include "pow.h"

+ 1
- 1
src/net_processing.cpp View File

@@ -12,7 +12,7 @@
#include "consensus/validation.h"
#include "hash.h"
#include "init.h"
#include "main.h"
#include "validation.h"
#include "merkleblock.h"
#include "net.h"
#include "netmessagemaker.h"

+ 1
- 1
src/policy/policy.cpp View File

@@ -7,7 +7,7 @@

#include "policy/policy.h"

#include "main.h"
#include "validation.h"
#include "tinyformat.h"
#include "util.h"
#include "utilstrencodings.h"

+ 1
- 1
src/qt/clientmodel.cpp View File

@@ -12,7 +12,7 @@
#include "chainparams.h"
#include "checkpoints.h"
#include "clientversion.h"
#include "main.h"
#include "validation.h"
#include "net.h"
#include "txmempool.h"
#include "ui_interface.h"

+ 1
- 1
src/qt/coincontroldialog.cpp View File

@@ -15,7 +15,7 @@

#include "wallet/coincontrol.h"
#include "init.h"
#include "main.h" // For minRelayTxFee
#include "validation.h" // For minRelayTxFee
#include "wallet/wallet.h"

#include <boost/assign/list_of.hpp> // for 'map_list_of()'

+ 1
- 1
src/qt/guiutil.cpp View File

@@ -11,7 +11,7 @@

#include "primitives/transaction.h"
#include "init.h"
#include "main.h" // For minRelayTxFee
#include "validation.h" // For minRelayTxFee
#include "protocol.h"
#include "script/script.h"
#include "script/standard.h"

+ 1
- 1
src/qt/optionsdialog.cpp View File

@@ -13,7 +13,7 @@
#include "guiutil.h"
#include "optionsmodel.h"

#include "main.h" // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
#include "validation.h" // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
#include "netbase.h"
#include "txdb.h" // for -dbcache defaults


+ 1
- 1
src/qt/optionsmodel.cpp View File

@@ -13,7 +13,7 @@

#include "amount.h"
#include "init.h"
#include "main.h" // For DEFAULT_SCRIPTCHECK_THREADS
#include "validation.h" // For DEFAULT_SCRIPTCHECK_THREADS
#include "net.h"
#include "netbase.h"
#include "txdb.h" // for -dbcache defaults

+ 1
- 1
src/qt/paymentserver.cpp View File

@@ -10,7 +10,7 @@

#include "base58.h"
#include "chainparams.h"
#include "main.h" // For minRelayTxFee
#include "validation.h" // For minRelayTxFee
#include "ui_interface.h"
#include "util.h"
#include "wallet/wallet.h"

+ 1
- 1
src/qt/peertablemodel.cpp View File

@@ -8,7 +8,7 @@
#include "guiconstants.h"
#include "guiutil.h"

#include "main.h" // for cs_main
#include "validation.h" // for cs_main
#include "sync.h"

#include <QDebug>

+ 1
- 1
src/qt/sendcoinsdialog.cpp View File

@@ -17,7 +17,7 @@

#include "base58.h"
#include "wallet/coincontrol.h"
#include "main.h" // mempool and minRelayTxFee
#include "validation.h" // mempool and minRelayTxFee
#include "ui_interface.h"
#include "txmempool.h"
#include "wallet/wallet.h"

+ 1
- 1
src/qt/signverifymessagedialog.cpp View File

@@ -12,7 +12,7 @@

#include "base58.h"
#include "init.h"
#include "main.h" // For strMessageMagic
#include "validation.h" // For strMessageMagic
#include "wallet/wallet.h"

#include <string>

+ 1
- 1
src/qt/test/rpcnestedtests.cpp View File

@@ -6,7 +6,7 @@

#include "chainparams.h"
#include "consensus/validation.h"
#include "main.h"
#include "validation.h"
#include "rpc/register.h"
#include "rpc/server.h"
#include "rpcconsole.h"

+ 1
- 1
src/qt/transactiondesc.cpp View File

@@ -11,7 +11,7 @@

#include "base58.h"
#include "consensus/consensus.h"
#include "main.h"
#include "validation.h"
#include "script/script.h"
#include "timedata.h"
#include "util.h"

+ 1
- 1
src/qt/transactionrecord.cpp View File

@@ -6,7 +6,7 @@

#include "base58.h"
#include "consensus/consensus.h"
#include "main.h"
#include "validation.h"
#include "timedata.h"
#include "wallet/wallet.h"


+ 1
- 1
src/qt/transactiontablemodel.cpp View File

@@ -14,7 +14,7 @@
#include "walletmodel.h"

#include "core_io.h"
#include "main.h"
#include "validation.h"
#include "sync.h"
#include "uint256.h"
#include "util.h"

+ 1
- 1
src/qt/walletmodel.cpp View File

@@ -14,7 +14,7 @@

#include "base58.h"
#include "keystore.h"
#include "main.h"
#include "validation.h"
#include "net.h" // for g_connman
#include "sync.h"
#include "ui_interface.h"

+ 1
- 1
src/rest.cpp View File

@@ -7,7 +7,7 @@
#include "chainparams.h"
#include "primitives/block.h"
#include "primitives/transaction.h"
#include "main.h"
#include "validation.h"
#include "httpserver.h"
#include "rpc/server.h"
#include "streams.h"

+ 1
- 1
src/rpc/blockchain.cpp View File

@@ -9,7 +9,7 @@
#include "checkpoints.h"
#include "coins.h"
#include "consensus/validation.h"
#include "main.h"
#include "validation.h"
#include "policy/policy.h"
#include "primitives/transaction.h"
#include "rpc/server.h"

+ 1
- 1
src/rpc/mining.cpp View File

@@ -12,7 +12,7 @@
#include "consensus/validation.h"
#include "core_io.h"
#include "init.h"
#include "main.h"
#include "validation.h"
#include "miner.h"
#include "net.h"
#include "pow.h"

+ 1
- 1
src/rpc/misc.cpp View File

@@ -6,7 +6,7 @@
#include "base58.h"
#include "clientversion.h"
#include "init.h"
#include "main.h"
#include "validation.h"
#include "net.h"
#include "netbase.h"
#include "rpc/server.h"

+ 1
- 1
src/rpc/net.cpp View File

@@ -6,7 +6,7 @@

#include "chainparams.h"
#include "clientversion.h"
#include "main.h"
#include "validation.h"
#include "net.h"
#include "net_processing.h"
#include "netbase.h"

+ 1
- 1
src/rpc/rawtransaction.cpp View File

@@ -10,7 +10,7 @@
#include "core_io.h"
#include "init.h"
#include "keystore.h"
#include "main.h"
#include "validation.h"
#include "merkleblock.h"
#include "net.h"
#include "policy/policy.h"

+ 1
- 1
src/test/coins_tests.cpp View File

@@ -8,7 +8,7 @@
#include "utilstrencodings.h"
#include "test/test_bitcoin.h"
#include "test/test_random.h"
#include "main.h"
#include "validation.h"
#include "consensus/validation.h"

#include <vector>

+ 1
- 1
src/test/main_tests.cpp View File

@@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "chainparams.h"
#include "main.h"
#include "validation.h"
#include "net.h"

#include "test/test_bitcoin.h"

+ 1
- 1
src/test/miner_tests.cpp View File

@@ -7,7 +7,7 @@
#include "consensus/consensus.h"
#include "consensus/merkle.h"
#include "consensus/validation.h"
#include "main.h"
#include "validation.h"
#include "miner.h"
#include "pubkey.h"
#include "script/standard.h"

+ 1
- 1
src/test/script_P2SH_tests.cpp View File

@@ -5,7 +5,7 @@
#include "core_io.h"
#include "key.h"
#include "keystore.h"
#include "main.h"
#include "validation.h"
#include "policy/policy.h"
#include "script/script.h"
#include "script/script_error.h"

+ 1
- 1
src/test/sighash_tests.cpp View File

@@ -5,7 +5,7 @@
#include "consensus/validation.h"
#include "data/sighash.json.h"
#include "hash.h"
#include "main.h" // For CheckTransaction
#include "validation.h" // For CheckTransaction
#include "script/interpreter.h"
#include "script/script.h"
#include "serialize.h"

+ 1
- 1
src/test/sigopcount_tests.cpp View File

@@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "main.h"
#include "validation.h"
#include "pubkey.h"
#include "key.h"
#include "script/script.h"

+ 1
- 1
src/test/test_bitcoin.cpp View File

@@ -10,7 +10,7 @@
#include "consensus/consensus.h"
#include "consensus/validation.h"
#include "key.h"
#include "main.h"
#include "validation.h"
#include "miner.h"
#include "net_processing.h"
#include "pubkey.h"

+ 1
- 1
src/test/transaction_tests.cpp View File

@@ -12,7 +12,7 @@
#include "core_io.h"
#include "key.h"
#include "keystore.h"
#include "main.h" // For CheckTransaction
#include "validation.h" // For CheckTransaction
#include "policy/policy.h"
#include "script/script.h"
#include "script/sign.h"

+ 1
- 1
src/test/txvalidationcache_tests.cpp View File

@@ -4,7 +4,7 @@

#include "consensus/validation.h"
#include "key.h"
#include "main.h"
#include "validation.h"
#include "miner.h"
#include "pubkey.h"
#include "txmempool.h"

+ 1
- 1
src/test/versionbits_tests.cpp View File

@@ -7,7 +7,7 @@
#include "test/test_bitcoin.h"
#include "test/test_random.h"
#include "chainparams.h"
#include "main.h"
#include "validation.h"
#include "consensus/params.h"

#include <boost/test/unit_test.hpp>

+ 1
- 1
src/txmempool.cpp View File

@@ -8,7 +8,7 @@
#include "clientversion.h"
#include "consensus/consensus.h"
#include "consensus/validation.h"
#include "main.h"
#include "validation.h"
#include "policy/policy.h"
#include "policy/fees.h"
#include "streams.h"

src/main.cpp → src/validation.cpp View File

@@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "main.h"
#include "validation.h"

#include "arith_uint256.h"
#include "chainparams.h"

src/main.h → src/validation.h View File

@@ -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_MAIN_H
#define BITCOIN_MAIN_H
#ifndef BITCOIN_VALIDATION_H
#define BITCOIN_VALIDATION_H

#if defined(HAVE_CONFIG_H)
#include "config/bitcoin-config.h"
@@ -562,4 +562,4 @@ void DumpMempool();
/** Load the mempool from disk. */
bool LoadMempool();

#endif // BITCOIN_MAIN_H
#endif // BITCOIN_VALIDATION_H

+ 1
- 1
src/wallet/rpcdump.cpp View File

@@ -6,7 +6,7 @@
#include "chain.h"
#include "rpc/server.h"
#include "init.h"
#include "main.h"
#include "validation.h"
#include "script/script.h"
#include "script/standard.h"
#include "sync.h"

+ 1
- 1
src/wallet/rpcwallet.cpp View File

@@ -9,7 +9,7 @@
#include "consensus/validation.h"
#include "core_io.h"
#include "init.h"
#include "main.h"
#include "validation.h"
#include "net.h"
#include "policy/rbf.h"
#include "rpc/server.h"

+ 1
- 1
src/wallet/wallet.cpp View File

@@ -13,7 +13,7 @@
#include "consensus/validation.h"
#include "key.h"
#include "keystore.h"
#include "main.h"
#include "validation.h"
#include "net.h"
#include "policy/policy.h"
#include "primitives/block.h"

+ 1
- 1
src/wallet/walletdb.cpp View File

@@ -7,7 +7,7 @@

#include "base58.h"
#include "consensus/validation.h"
#include "main.h" // For CheckTransaction
#include "validation.h" // For CheckTransaction
#include "protocol.h"
#include "serialize.h"
#include "sync.h"

+ 1
- 1
src/zmq/zmqnotificationinterface.cpp View File

@@ -6,7 +6,7 @@
#include "zmqpublishnotifier.h"

#include "version.h"
#include "main.h"
#include "validation.h"
#include "streams.h"
#include "util.h"


+ 1
- 1
src/zmq/zmqpublishnotifier.cpp View File

@@ -5,7 +5,7 @@
#include "chainparams.h"
#include "streams.h"
#include "zmqpublishnotifier.h"
#include "main.h"
#include "validation.h"
#include "util.h"

static std::multimap<std::string, CZMQAbstractPublishNotifier*> mapPublishNotifiers;

Loading…
Cancel
Save