From 92f1f8b3197c2ba3cf65556070509838098975a4 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Wed, 20 Sep 2017 16:57:44 -0700 Subject: Split off key_io_tests from base58_tests --- src/Makefile.test.include | 11 +- src/test/base58_tests.cpp | 138 +-------- src/test/data/base58_keys_invalid.json | 182 ----------- src/test/data/base58_keys_valid.json | 533 --------------------------------- src/test/data/key_io_invalid.json | 182 +++++++++++ src/test/data/key_io_valid.json | 533 +++++++++++++++++++++++++++++++++ src/test/key_io_tests.cpp | 149 +++++++++ 7 files changed, 871 insertions(+), 857 deletions(-) delete mode 100644 src/test/data/base58_keys_invalid.json delete mode 100644 src/test/data/base58_keys_valid.json create mode 100644 src/test/data/key_io_invalid.json create mode 100644 src/test/data/key_io_valid.json create mode 100644 src/test/key_io_tests.cpp (limited to 'src') diff --git a/src/Makefile.test.include b/src/Makefile.test.include index d4d972b2bb..4ee9102519 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -9,13 +9,13 @@ TEST_SRCDIR = test TEST_BINARY=test/test_bitcoin$(EXEEXT) JSON_TEST_FILES = \ - test/data/script_tests.json \ - test/data/base58_keys_valid.json \ test/data/base58_encode_decode.json \ - test/data/base58_keys_invalid.json \ + test/data/key_io_valid.json \ + test/data/key_io_invalid.json \ + test/data/script_tests.json \ + test/data/sighash.json \ test/data/tx_invalid.json \ - test/data/tx_valid.json \ - test/data/sighash.json + test/data/tx_valid.json RAW_TEST_FILES = @@ -45,6 +45,7 @@ BITCOIN_TESTS =\ test/DoS_tests.cpp \ test/getarg_tests.cpp \ test/hash_tests.cpp \ + test/key_io_tests.cpp \ test/key_tests.cpp \ test/limitedmap_tests.cpp \ test/dbwrapper_tests.cpp \ diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index 63885a7aff..f90d4f90cb 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -2,18 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include - #include -#include -#include -#include -#include -#include