Add AffinityFilter::from_topics and use it in build_combined_affinity_filter

Author: AndreiEres

lib/src/network/codec/affinity.rs

@@ -148,6 +148,20 @@ impl AffinityFilter {
         AffinityFilter { bloom, seed }
     }
 
+    pub fn from_topics<'a>(
+        topics: impl Iterator<Item = &'a [u8; 32]>,
+        seed: u128,
+        false_positive_rate: f64,
+    ) -> Self {
+        let topics: Vec<&[u8; 32]> = topics.collect();
+        let count = topics.len().max(1);
+        let mut filter = Self::new(seed, false_positive_rate, count);
+        for topic in topics {
+            filter.insert(topic);
+        }
+        filter
+    }
+
     pub fn decode(data: &[u8]) -> Result<Self, DecodeAffinityFilterError> {
         let encoded = EncodedBloomFilter::decode(data)?;
         if encoded.bits.is_empty() {

light-base/src/json_rpc_service/background.rs

@@ -773,7 +773,10 @@ pub(super) async fn run<TPlat: PlatformRef>(
                 if matches!(version, network_service::StatementProtocolVersion::V2) {
                     me.v2_statement_peers.insert(peer_id.clone());
                     if !me.statement_subscriptions.is_empty() {
-                        let spc = me.statement_protocol_config.as_ref().expect("V2 peers require statement protocol; qed");
+                        let spc = me
+                            .statement_protocol_config
+                            .as_ref()
+                            .expect("V2 peers require statement protocol; qed");
                         let combined_filter = build_combined_affinity_filter(
                             &me.statement_subscriptions,
                             spc.bloom_seed(),
@@ -2920,11 +2923,14 @@ pub(super) async fn run<TPlat: PlatformRef>(
                             .insert(subscription_id.clone(), filter);
 
                         if !me.v2_statement_peers.is_empty() {
-                            let fpr = me.statement_protocol_config.as_ref().expect("V2 peers require statement protocol; qed").false_positive_rate();
+                            let spc = me
+                                .statement_protocol_config
+                                .as_ref()
+                                .expect("V2 peers require statement protocol; qed");
                             let combined_filter = build_combined_affinity_filter(
                                 &me.statement_subscriptions,
-                                me.bloom_seed,
-                                fpr,
+                                spc.bloom_seed(),
+                                spc.false_positive_rate(),
                             );
                             for peer_id in me.v2_statement_peers.clone() {
                                 let _ = me
@@ -2949,11 +2955,14 @@ pub(super) async fn run<TPlat: PlatformRef>(
                         let existed = me.statement_subscriptions.remove(&subscription).is_some();
 
                         if existed && !me.v2_statement_peers.is_empty() {
-                            let fpr = me.statement_protocol_config.as_ref().expect("V2 peers require statement protocol; qed").false_positive_rate();
+                            let spc = me
+                                .statement_protocol_config
+                                .as_ref()
+                                .expect("V2 peers require statement protocol; qed");
                             let combined_filter = build_combined_affinity_filter(
                                 &me.statement_subscriptions,
-                                me.bloom_seed,
-                                fpr,
+                                spc.bloom_seed(),
+                                spc.false_positive_rate(),
                             );
                             for peer_id in me.v2_statement_peers.clone() {
                                 let _ = me
@@ -6107,10 +6116,6 @@ fn build_combined_affinity_filter(
 ) -> network_service::AffinityFilter {
     use smoldot::json_rpc::methods::TopicFilter;
 
-    if subscriptions.is_empty() {
-        return network_service::AffinityFilter::new(seed, false_positive_rate, 1);
-    }
-
     let mut all_topics: Vec<&[u8; 32]> = Vec::new();
 
     for filter in subscriptions.values() {
@@ -6124,10 +6129,5 @@ fn build_combined_affinity_filter(
         }
     }
 
-    let count = all_topics.len().max(1);
-    let mut affinity = network_service::AffinityFilter::new(seed, false_positive_rate, count);
-    for topic in all_topics {
-        affinity.insert(topic);
-    }
-    affinity
+    network_service::AffinityFilter::from_topics(all_topics.into_iter(), seed, false_positive_rate)
 }