aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@protonmail.com>2020-10-08 20:09:53 +0200
committerWladimir J. van der Laan <laanwj@protonmail.com>2020-10-08 20:42:19 +0200
commitd9de00b3e067d26cde0ea349b911d082acc8801a (patch)
treeb26d53834ba67b7bb04ec7149582ff45dcbf1270
parent392c6f4fb253ca40a45b052528760ecb23869da2 (diff)
parent1afcd41a906e6417925e80578c0d850d269dc008 (diff)
Merge #20105: [net] Remove CombinerAll
1afcd41a906e6417925e80578c0d850d269dc008 [net] Remove CombinerAll (John Newbery) Pull request description: 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. ACKs for top commit: MarcoFalke: review ACK 1afcd41a906e6417925e80578c0d850d269dc008 laanwj: code review ACK 1afcd41a906e6417925e80578c0d850d269dc008 Tree-SHA512: a4313142afb88bf12f15abc4e717b3b0d0b40d2d5db2638494af3181e1cd680d7b036087050fc0e0dfe606228849a2e20ae85135908a9ebe8ff2130f163920e1
-rw-r--r--src/net.h15
-rw-r--r--src/test/validation_tests.cpp17
2 files changed, 0 insertions, 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<typename I>
- 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 <test/util/setup_common.h>
-#include <boost/signals2/signal.hpp>
#include <boost/test/unit_test.hpp>
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<bool (), CombinerAll> 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()