aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Newbery <[email protected]>2020-10-08 12:18:28 +0100
committerJohn Newbery <[email protected]>2020-10-08 12:28:38 +0100
commit1afcd41a906e6417925e80578c0d850d269dc008 (patch)
treed08c4cd655a4462a669d83f56879a4d7c2cad076 /src
parentMerge #20027: Use mockable time everywhere in net_processing (diff)
downloaddiscoin-1afcd41a906e6417925e80578c0d850d269dc008.tar.xz
discoin-1afcd41a906e6417925e80578c0d850d269dc008.zip
[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
Diffstat (limited to 'src')
-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 1051511f5..2b99d3bd9 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 7fea31938..c3816af0c 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()