Skip to content

Commit eef19c4

Browse files
committed
Merge bitcoin#29064: fuzz: Improve fuzzing stability for minisketch harness
b2fc7a2 [fuzz] Improve fuzzing stability for minisketch harness (dergoegge) Pull request description: The `minisketch` harness has low stability due to: * Rng internal to minisketch * Benchmarkning for the best minisketch impl Fix this by seeding the rng and letting the fuzzer choose the impl. Also see bitcoin#29018. ACKs for top commit: maflcko: review ACK b2fc7a2 Tree-SHA512: 3d81414299c6803c34e928a53bcf843722fa8c38e1d3676cde7fa80923f9058b1ad4b9a2941f718303a6641b17eeb28b4a22eda09678102e9fb7c4e31d06f8f2
2 parents c840dea + b2fc7a2 commit eef19c4

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

src/test/fuzz/minisketch.cpp

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,27 @@
1212
#include <map>
1313
#include <numeric>
1414

15-
using node::MakeMinisketch32;
15+
namespace {
16+
17+
Minisketch MakeFuzzMinisketch32(size_t capacity, uint32_t impl)
18+
{
19+
return Assert(Minisketch(32, impl, capacity));
20+
}
21+
22+
} // namespace
1623

1724
FUZZ_TARGET(minisketch)
1825
{
1926
FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
27+
2028
const auto capacity{fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, 200)};
21-
Minisketch sketch_a{Assert(MakeMinisketch32(capacity))};
22-
Minisketch sketch_b{Assert(MakeMinisketch32(capacity))};
29+
const uint32_t impl{fuzzed_data_provider.ConsumeIntegralInRange<uint32_t>(0, Minisketch::MaxImplementation())};
30+
if (!Minisketch::ImplementationSupported(32, impl)) return;
31+
32+
Minisketch sketch_a{MakeFuzzMinisketch32(capacity, impl)};
33+
Minisketch sketch_b{MakeFuzzMinisketch32(capacity, impl)};
34+
sketch_a.SetSeed(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
35+
sketch_b.SetSeed(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
2336

2437
// Fill two sets and keep the difference in a map
2538
std::map<uint32_t, bool> diff;
@@ -47,8 +60,11 @@ FUZZ_TARGET(minisketch)
4760
}
4861
const auto num_diff{std::accumulate(diff.begin(), diff.end(), size_t{0}, [](auto n, const auto& e) { return n + e.second; })};
4962

50-
Minisketch sketch_ar{MakeMinisketch32(capacity)};
51-
Minisketch sketch_br{MakeMinisketch32(capacity)};
63+
Minisketch sketch_ar{MakeFuzzMinisketch32(capacity, impl)};
64+
Minisketch sketch_br{MakeFuzzMinisketch32(capacity, impl)};
65+
sketch_ar.SetSeed(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
66+
sketch_br.SetSeed(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
67+
5268
sketch_ar.Deserialize(sketch_a.Serialize());
5369
sketch_br.Deserialize(sketch_b.Serialize());
5470

0 commit comments

Comments
 (0)