From ca69d9fb8f4df8a2194c0667600bb4b3f13b9303 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Sun, 4 Aug 2024 21:50:17 -0700
Subject: [PATCH] Remove deprecated BloomFilter serialization methods

---
 src/probabilistic/BloomFilter.cc | 10 ----------
 src/probabilistic/BloomFilter.h  |  3 ---
 2 files changed, 13 deletions(-)

diff --git a/src/probabilistic/BloomFilter.cc b/src/probabilistic/BloomFilter.cc
index e3a970c3c6..9d95cf5a8d 100644
--- a/src/probabilistic/BloomFilter.cc
+++ b/src/probabilistic/BloomFilter.cc
@@ -18,12 +18,6 @@ BloomFilter::BloomFilter(const detail::Hasher* arg_hasher) { hasher = arg_hasher
 
 BloomFilter::~BloomFilter() { delete hasher; }
 
-broker::expected<broker::data> BloomFilter::Serialize() const {
-    if ( auto res = SerializeData() )
-        return zeek::detail::BrokerDataAccess::Unbox(*res);
-    return {broker::make_error(broker::ec::serialization_failed)};
-}
-
 std::optional<BrokerData> BloomFilter::SerializeData() const {
     auto h = hasher->Serialize();
 
@@ -43,10 +37,6 @@ std::optional<BrokerData> BloomFilter::SerializeData() const {
     return std::move(builder).Build();
 }
 
-std::unique_ptr<BloomFilter> BloomFilter::Unserialize(const broker::data& data) {
-    return UnserializeData(BrokerDataView{&data});
-}
-
 std::unique_ptr<BloomFilter> BloomFilter::UnserializeData(BrokerDataView data) {
     if ( ! data.IsList() )
         return nullptr;
diff --git a/src/probabilistic/BloomFilter.h b/src/probabilistic/BloomFilter.h
index b3cfb34eb6..f79b81a60e 100644
--- a/src/probabilistic/BloomFilter.h
+++ b/src/probabilistic/BloomFilter.h
@@ -105,9 +105,6 @@ public:
      */
     virtual std::string InternalState() const = 0;
 
-    [[deprecated("Remove in v7.1: use SerializeData instead")]] broker::expected<broker::data> Serialize() const;
-    [[deprecated("Remove in v7.1: use UnserializeData instead")]] static std::unique_ptr<BloomFilter> Unserialize(
-        const broker::data& data);
     std::optional<BrokerData> SerializeData() const;
     static std::unique_ptr<BloomFilter> UnserializeData(BrokerDataView data);