diff --git a/src/Makefile.test.include b/src/Makefile.test.include --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -50,9 +50,9 @@ BITCOIN_TEST_SUITE = \ test/jsonutil.cpp \ + test/main.cpp \ test/scriptflags.cpp \ test/sigutil.cpp \ - test/test_bitcoin_main.cpp \ test/test_bitcoin.h \ test/test_bitcoin.cpp diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -74,10 +74,10 @@ add_boost_unit_tests_to_suite(bitcoin test_bitcoin jsonutil.cpp + main.cpp scriptflags.cpp sigutil.cpp test_bitcoin.cpp - test_bitcoin_main.cpp # Tests generated from JSON ${JSON_HEADERS} diff --git a/src/test/test_bitcoin_main.cpp b/src/test/main.cpp rename from src/test/test_bitcoin_main.cpp rename to src/test/main.cpp --- a/src/test/test_bitcoin_main.cpp +++ b/src/test/main.cpp @@ -4,29 +4,10 @@ #define BOOST_TEST_MODULE Bitcoin ABC unit tests -#include -#include #include #include -#include - -std::unique_ptr g_connman; -std::unique_ptr g_banman; - -[[noreturn]] void Shutdown(void *parg) { - std::exit(EXIT_SUCCESS); -} - -[[noreturn]] void StartShutdown() { - std::exit(EXIT_SUCCESS); -} - -bool ShutdownRequested() { - return false; -} - namespace utf = boost::unit_test::framework; /* diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h --- a/src/test/test_bitcoin.h +++ b/src/test/test_bitcoin.h @@ -78,10 +78,6 @@ * Testing setup that configures a complete environment. * Included are data directory, coins database, script check threads setup. */ -class CConnman; -class CNode; - -class PeerLogicValidation; struct TestingSetup : public BasicTestingSetup { boost::thread_group threadGroup; CScheduler scheduler;