From 1afcd41a906e6417925e80578c0d850d269dc008 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Thu, 8 Oct 2020 12:18:28 +0100 Subject: [net] Remove CombinerAll This was introduced in 9519a9a4 for use with boost signals. Boost signals have not been used in net since 8ad663c1, so this code is unused --- src/net.h | 15 --------------- src/test/validation_tests.cpp | 17 ----------------- 2 files changed, 32 deletions(-) diff --git a/src/net.h b/src/net.h index 1051511f54..2b99d3bd9d 100644 --- a/src/net.h +++ b/src/net.h @@ -595,21 +595,6 @@ void InterruptMapPort(); void StopMapPort(); uint16_t GetListenPort(); -struct CombinerAll -{ - typedef bool result_type; - - template - bool operator()(I first, I last) const - { - while (first != last) { - if (!(*first)) return false; - ++first; - } - return true; - } -}; - /** * Interface for message handling */ diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp index 7fea31938a..c3816af0cd 100644 --- a/src/test/validation_tests.cpp +++ b/src/test/validation_tests.cpp @@ -9,7 +9,6 @@ #include -#include #include BOOST_FIXTURE_TEST_SUITE(validation_tests, TestingSetup) @@ -120,20 +119,4 @@ BOOST_AUTO_TEST_CASE(signet_parse_tests) BOOST_CHECK(!CheckSignetBlockSolution(block, signet_params->GetConsensus())); } -static bool ReturnFalse() { return false; } -static bool ReturnTrue() { return true; } - -BOOST_AUTO_TEST_CASE(test_combiner_all) -{ - boost::signals2::signal Test; - BOOST_CHECK(Test()); - Test.connect(&ReturnFalse); - BOOST_CHECK(!Test()); - Test.connect(&ReturnTrue); - BOOST_CHECK(!Test()); - Test.disconnect(&ReturnFalse); - BOOST_CHECK(Test()); - Test.disconnect(&ReturnTrue); - BOOST_CHECK(Test()); -} BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.3