diff --git a/src/bloom.h b/src/bloom.h --- a/src/bloom.h +++ b/src/bloom.h @@ -89,9 +89,6 @@ bool contains(const COutPoint &outpoint) const; bool contains(const uint256 &hash) const; - void clear(); - void reset(const uint32_t nNewTweak); - //! True if the size is <= MAX_BLOOM_FILTER_SIZE and the number of hash //! functions is <= MAX_HASH_FUNCS (catch a filter which was just //! deserialized which was too big) diff --git a/src/bloom.cpp b/src/bloom.cpp --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -105,17 +105,6 @@ return contains(data); } -void CBloomFilter::clear() { - vData.assign(vData.size(), 0); - isFull = false; - isEmpty = true; -} - -void CBloomFilter::reset(const uint32_t nNewTweak) { - clear(); - nTweak = nNewTweak; -} - bool CBloomFilter::IsWithinSizeConstraints() const { return vData.size() <= MAX_BLOOM_FILTER_SIZE && nHashFuncs <= MAX_HASH_FUNCS; diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -29,6 +29,9 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize) { CBloomFilter filter(3, 0.01, 0, BLOOM_UPDATE_ALL); + BOOST_CHECK_MESSAGE( + !filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), + "Bloom filter should be empty!"); filter.insert(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")); BOOST_CHECK_MESSAGE( filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), @@ -64,10 +67,6 @@ BOOST_CHECK_MESSAGE( filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), "Bloom filter doesn't contain just-inserted object!"); - filter.clear(); - BOOST_CHECK_MESSAGE( - !filter.contains(ParseHex("99108ad8ed9bb6274d3980bab5a85c048f0950c8")), - "Bloom filter should be empty!"); } BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize_with_tweak) { diff --git a/src/test/fuzz/bloom_filter.cpp b/src/test/fuzz/bloom_filter.cpp --- a/src/test/fuzz/bloom_filter.cpp +++ b/src/test/fuzz/bloom_filter.cpp @@ -26,7 +26,7 @@ {BLOOM_UPDATE_NONE, BLOOM_UPDATE_ALL, BLOOM_UPDATE_P2PUBKEY_ONLY, BLOOM_UPDATE_MASK}))}; while (fuzzed_data_provider.remaining_bytes() > 0) { - switch (fuzzed_data_provider.ConsumeIntegralInRange(0, 6)) { + switch (fuzzed_data_provider.ConsumeIntegralInRange(0, 4)) { case 0: { const std::vector &b = ConsumeRandomLengthByteVector(fuzzed_data_provider); @@ -60,14 +60,7 @@ assert(present); break; } - case 3: - bloom_filter.clear(); - break; - case 4: - bloom_filter.reset( - fuzzed_data_provider.ConsumeIntegral()); - break; - case 5: { + case 3: { const std::optional mut_tx = ConsumeDeserializable( fuzzed_data_provider); @@ -78,7 +71,7 @@ (void)bloom_filter.IsRelevantAndUpdate(tx); break; } - case 6: + case 4: bloom_filter.UpdateEmptyFull(); break; }