highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-22 14:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #20105: [net] Remove CombinerAll

Browse Source 
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
This commit is contained in:
Wladimir J. van der Laan 2020-10-08 20:09:53 +02:00
commit d9de00b3e0
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/net.h
View File

@ -595,21 +595,6 @@ void InterruptMapPort();
void StopMapPort(); void StopMapPort();
uint16_t GetListenPort(); 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 * Interface for message handling
*/ */

17
src/test/validation_tests.cpp
View File

@ -9,7 +9,6 @@
#include <test/util/setup_common.h> #include <test/util/setup_common.h>
#include <boost/signals2/signal.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
BOOST_FIXTURE_TEST_SUITE(validation_tests, TestingSetup) 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())); 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() BOOST_AUTO_TEST_SUITE_END()