diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-29 16:16:23 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-07-29 16:17:16 +0200 |
| commit | b1c8ea45c9e0b658c86ed0bbbf6e0fe44cd40f1c (patch) | |
| tree | 803b238a23ac4d4b6c191b015390bcb50d22545e /src/test | |
| parent | 1abbae65eb9c99df5d8941008068d83ad99bf117 (diff) | |
| parent | b4b657ba57a2ce31b3c21ea9245aad26d5b06a57 (diff) | |
| download | bitcoin-b1c8ea45c9e0b658c86ed0bbbf6e0fe44cd40f1c.tar.xz | |
Merge bitcoin/bitcoin#25683: refactor: log `nEvicted` message in `LimitOrphans` then return void
b4b657ba57a2ce31b3c21ea9245aad26d5b06a57 refactor: log `nEvicted` message in `LimitOrphans` then return void (chinggg)
Pull request description:
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49347
LimitOrphans() can log expired tx and it should log evicted tx as well instead of returning the `nEvicted` number for caller to print the message.
Since `LimitOrphans()` now returns void, the redundant assertion check in fuzz test is also removed.
Top commit has no ACKs.
Tree-SHA512: 18c41702321b0e59812590cd389f3163831d431f4ebdc3b3e1e0698496a6bdbac52288f28f779237a58813c6717da1a35e8933d509822978ff726c1b13cfc778
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/fuzz/txorphan.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/test/fuzz/txorphan.cpp b/src/test/fuzz/txorphan.cpp index 3fc6cde84e..7580651371 100644 --- a/src/test/fuzz/txorphan.cpp +++ b/src/test/fuzz/txorphan.cpp @@ -138,10 +138,8 @@ FUZZ_TARGET_INIT(txorphan, initialize_orphanage) [&] { // test mocktime and expiry SetMockTime(ConsumeTime(fuzzed_data_provider)); - auto size_before = orphanage.Size(); auto limit = fuzzed_data_provider.ConsumeIntegral<unsigned int>(); - auto n_evicted = WITH_LOCK(g_cs_orphans, return orphanage.LimitOrphans(limit)); - Assert(size_before - n_evicted <= limit); + WITH_LOCK(g_cs_orphans, orphanage.LimitOrphans(limit)); Assert(orphanage.Size() <= limit); }); } |