diff --git a/cmake/modules/TestSuite.cmake b/cmake/modules/TestSuite.cmake --- a/cmake/modules/TestSuite.cmake +++ b/cmake/modules/TestSuite.cmake @@ -106,7 +106,7 @@ ) endforeach() - find_package(Boost 1.58 REQUIRED unit_test_framework) + find_package(Boost 1.59 REQUIRED unit_test_framework) target_link_libraries(${NAME} Boost::unit_test_framework) # We need to detect if the BOOST_TEST_DYN_LINK flag is required diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -943,7 +943,7 @@ if test x$use_boost = xyes; then dnl Minimum required Boost version -define(MINIMUM_REQUIRED_BOOST, 1.58.0) +define(MINIMUM_REQUIRED_BOOST, 1.59.0) dnl Check for boost libs AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST]) diff --git a/doc/dependencies.md b/doc/dependencies.md --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -6,7 +6,7 @@ | Dependency | Version used | Minimum required | CVEs | Shared | [Bundled Qt library](https://doc.qt.io/qt-5/configure-options.html) | | --- | --- | --- | --- | --- | --- | | Berkeley DB | [5.3.28](http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 5.3 | No | | | -| Boost | [1.70.0](https://www.boost.org/users/download/) | 1.58.0 | No | | | +| Boost | [1.70.0](https://www.boost.org/users/download/) | 1.59.0 | No | | | | Clang | | [3.4](https://releases.llvm.org/download.html) (C++14 support) | | | | | CMake | | [3.13](https://cmake.org/download/) | | | | | Expat | [2.2.7](https://libexpat.github.io/) | | No | Yes | | diff --git a/doc/release-notes.md b/doc/release-notes.md --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -3,3 +3,5 @@ This release includes the following features and fixes: + - Upgrade minimum supported boost version to 1.59 + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -401,7 +401,7 @@ prepend(BOOST_LIBRARIES "Boost::" ${BOOST_PACKAGES_REQUIRED}) -find_package(Boost 1.58 REQUIRED ${BOOST_PACKAGES_REQUIRED}) +find_package(Boost 1.59 REQUIRED ${BOOST_PACKAGES_REQUIRED}) # This require libevent set(EVENT_MIN_VERSION 2.0.22) diff --git a/src/test/avalanche_tests.cpp b/src/test/avalanche_tests.cpp --- a/src/test/avalanche_tests.cpp +++ b/src/test/avalanche_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2010-2020 The Bitcoin developers +// Copyright (c) 2018-2020 The Bitcoin developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -644,13 +644,7 @@ connman->ClearNodes(); } -#if BOOST_VERSION >= 105900 BOOST_AUTO_TEST_CASE(poll_inflight_timeout, *boost::unit_test::timeout(60)) { -#else -// TODO: Cleanup this branch when boost 1.58 is no longer supported. -BOOST_AUTO_TEST_CASE(poll_inflight_timeout) { - int64_t timeStart = GetTimeMillis(); -#endif const Config &config = GetConfig(); auto connman = std::make_unique(config, 0x1337, 0x1337); @@ -682,10 +676,6 @@ auto queryTimeDuration = std::chrono::milliseconds(10); p.setQueryTimeoutDuration(queryTimeDuration); for (int i = 0; i < 10; i++) { -#if BOOST_VERSION < 105900 - // TODO: Cleanup this statement when boost 1.58 is no longer supported. - BOOST_REQUIRE(timeStart + 60 * 1000 > GetTimeMillis()); -#endif AvalancheResponse resp = { AvalancheTest::getRound(p), 0, {AvalancheVote(0, blockHash)}};