diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-27 13:35:15 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-27 15:00:02 +0200 |
| commit | c7c9af381cacd76fa5190dad5a8a537eb3aa6b70 (patch) | |
| tree | 09cf79810e57fbd4069ce624e93ff612064fb12f /src/test | |
| parent | 2b2d5b92b9278a233b3263e06a6d5212b03b9c98 (diff) | |
| parent | da29ecbcc6c003a603ee2312309d593708ec6fb2 (diff) | |
| download | bitcoin-c7c9af381cacd76fa5190dad5a8a537eb3aa6b70.tar.xz | |
Merge pull request #5669
da29ecb Consensus: MOVEONLY: Move CValidationState from main consensus/validation (jtimon)
27afcd8 Consensus: Refactor: Decouple CValidationState from main::AbortNode() (Cory Fields)
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/checkblock_tests.cpp | 9 | ||||
| -rw-r--r-- | src/test/miner_tests.cpp | 1 | ||||
| -rw-r--r-- | src/test/sighash_tests.cpp | 7 | ||||
| -rw-r--r-- | src/test/transaction_tests.cpp | 3 |
4 files changed, 9 insertions, 11 deletions
diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp index 7abfad151e..51530c4de5 100644 --- a/src/test/checkblock_tests.cpp +++ b/src/test/checkblock_tests.cpp @@ -2,16 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -// -// Unit tests for block.CheckBlock() -// - - - #include "clientversion.h" +#include "consensus/validation.h" #include "main.h" -#include "utiltime.h" #include "test/test_bitcoin.h" +#include "utiltime.h" #include <cstdio> diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index d7ea91607c..b6365b1b3a 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -2,6 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "consensus/validation.h" #include "main.h" #include "miner.h" #include "pubkey.h" diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index afb7a41bbd..87be2217c4 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -2,15 +2,16 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "consensus/validation.h" #include "data/sighash.json.h" #include "main.h" #include "random.h" -#include "serialize.h" -#include "script/script.h" #include "script/interpreter.h" +#include "script/script.h" +#include "serialize.h" +#include "test/test_bitcoin.h" #include "util.h" #include "version.h" -#include "test/test_bitcoin.h" #include <iostream> diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 2a3083316e..d12535e438 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -7,12 +7,13 @@ #include "test/test_bitcoin.h" #include "clientversion.h" +#include "consensus/validation.h" +#include "core_io.h" #include "key.h" #include "keystore.h" #include "main.h" #include "script/script.h" #include "script/script_error.h" -#include "core_io.h" #include <map> #include <string> |