Merge 4c6b7d330a into merged_master (Bitcoin PR bitcoin/bitcoin#27297)

This commit is contained in:
Byron Hambly 2025-04-11 21:00:39 +02:00
commit e9ec524089

View file

@ -57,7 +57,6 @@ struct FakeCheckCheckCompletion {
struct FailingCheck {
bool fails;
FailingCheck(bool _fails) : fails(_fails){};
FailingCheck() : fails(true){};
bool operator()() const
{
return !fails;
@ -69,7 +68,6 @@ struct UniqueCheck {
static std::unordered_multiset<size_t> results GUARDED_BY(m);
size_t check_id;
UniqueCheck(size_t check_id_in) : check_id(check_id_in){};
UniqueCheck() : check_id(0){};
bool operator()()
{
LOCK(m);
@ -86,7 +84,6 @@ struct MemoryCheck {
{
return true;
}
MemoryCheck() = default;
MemoryCheck(const MemoryCheck& x)
{
// We have to do this to make sure that destructor calls are paired
@ -179,9 +176,7 @@ static void Correct_Queue_range(std::vector<size_t> range)
control.Add(std::move(vChecks));
}
BOOST_REQUIRE(control.Wait());
if (FakeCheckCheckCompletion::n_calls != i) {
BOOST_REQUIRE_EQUAL(FakeCheckCheckCompletion::n_calls, i);
}
BOOST_REQUIRE_EQUAL(FakeCheckCheckCompletion::n_calls, i);
}
small_queue->StopWorkerThreads();
}