diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-30 17:18:17 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-30 17:24:36 +0100 |
| commit | 8d2396c9c41cbd5b8746f48f41180697f58b0681 (patch) | |
| tree | ce5bb77b48ee354790eeae3f0ee3dd19d160b322 /src/test | |
| parent | c4761ffb70a9fc38b32f9febcac1434ffb4fee50 (diff) | |
| parent | 71697f97d3f9512f0af934070690c14f1c0d95ea (diff) | |
| download | bitcoin-8d2396c9c41cbd5b8746f48f41180697f58b0681.tar.xz | |
Merge pull request #5164
71697f9 Separate protocol versioning from clientversion (Cory Fields)
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/alert_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/bloom_tests.cpp | 1 | ||||
| -rw-r--r-- | src/test/checkblock_tests.cpp | 1 | ||||
| -rw-r--r-- | src/test/transaction_tests.cpp | 1 | ||||
| -rw-r--r-- | src/test/util_tests.cpp | 2 |
5 files changed, 5 insertions, 2 deletions
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp index 28610f0d2e..9cf7a98f46 100644 --- a/src/test/alert_tests.cpp +++ b/src/test/alert_tests.cpp @@ -7,13 +7,13 @@ // #include "alert.h" +#include "clientversion.h" #include "data/alertTests.raw.h" #include "serialize.h" #include "streams.h" #include "util.h" #include "utilstrencodings.h" -#include "version.h" #include <fstream> diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index 99b21a23a0..783e284af5 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -5,6 +5,7 @@ #include "bloom.h" #include "base58.h" +#include "clientversion.h" #include "key.h" #include "main.h" #include "serialize.h" diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp index 9151fdc0c8..fc36b43e16 100644 --- a/src/test/checkblock_tests.cpp +++ b/src/test/checkblock_tests.cpp @@ -8,6 +8,7 @@ +#include "clientversion.h" #include "main.h" #include "utiltime.h" diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index c46c31e99f..d4c9b1a0ea 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -5,6 +5,7 @@ #include "data/tx_invalid.json.h" #include "data/tx_valid.json.h" +#include "clientversion.h" #include "key.h" #include "keystore.h" #include "main.h" diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 761210feac..67d50fccf4 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -4,12 +4,12 @@ #include "util.h" +#include "clientversion.h" #include "core/transaction.h" #include "random.h" #include "sync.h" #include "utilstrencodings.h" #include "utilmoneystr.h" -#include "version.h" #include <stdint.h> #include <vector> |