diff options
| author | fanquake <fanquake@gmail.com> | 2023-03-22 17:45:13 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-03-22 17:58:35 +0000 |
| commit | 4c6b7d330a4e80460dcce19b1a0a47d77a0b99ea (patch) | |
| tree | d77cc6e90341fd693af461907d7edac28f6e6552 /src | |
| parent | fc7c21f664fd24ac17f518d07f04e0a3d9f8681c (diff) | |
| parent | fae349076db03ddfbf23c5d828368d538b5d52d5 (diff) | |
Merge bitcoin/bitcoin#27297: test: Remove unused Check* default constructors
fae349076db03ddfbf23c5d828368d538b5d52d5 test: Remove unused Check* default constructors (MarcoFalke)
Pull request description:
They are no longer needed after the removal of `swap`, see https://github.com/bitcoin/bitcoin/pull/26749#discussion_r1144532693
Also, flatten a redundant `if` check.
ACKs for top commit:
hebasto:
ACK fae349076db03ddfbf23c5d828368d538b5d52d5
Tree-SHA512: c0bc0c16b5df0f16fc25e18d2414a2a3c4769da1aa30d53f8d267bc2e97dd79a0296db94c1e49cd1ca89bd42275d8c462f7bf47f03f105dfe867ebea6563454b
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/checkqueue_tests.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp index 012b0eb321..6bc4770f9b 100644 --- a/src/test/checkqueue_tests.cpp +++ b/src/test/checkqueue_tests.cpp @@ -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 @@ -176,9 +173,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(); } |