Merge pull request #295 from rustaceanrob/filter-2-13

Improve `Filter` API

Author: rustaceanrob

example/managed.rs

@@ -74,7 +74,7 @@ async fn main() {
                         Event::IndexedFilter(mut filter) => {
                             let height = filter.height();
                             tracing::info!("Checking filter: {height}");
-                            if filter.contains_any(&addresses) {
+                            if filter.contains_any(addresses.iter()) {
                                 let hash = *filter.block_hash();
                                 tracing::info!("Found script at {}!", hash);
                                 let indexed_block = requester.get_block(hash).await.unwrap();

src/chain/chain.rs

@@ -727,7 +727,7 @@ impl<H: HeaderStore> Chain<H> {
         #[cfg(not(feature = "filter-control"))]
         if !self.block_queue.contains(&filter_message.block_hash)
             && filter
-                .contains_any(&self.scripts)
+                .contains_any(self.scripts.iter())
                 .map_err(CFilterSyncError::Filter)?
         {
             // Add to the block queue

src/filters/mod.rs

@@ -7,8 +7,6 @@ pub(crate) mod cfheader_chain;
 pub(crate) mod error;
 pub(crate) mod filter_chain;
 
-use std::collections::HashSet;
-
 use bitcoin::hashes::{sha256d, Hash};
 use bitcoin::{bip158::BlockFilter, BlockHash, FilterHash, ScriptBuf};
 
@@ -42,12 +40,12 @@ impl Filter {
         &self.block_hash
     }
 
-    pub fn contains_any(&mut self, scripts: &HashSet<ScriptBuf>) -> Result<bool, FilterError> {
+    pub fn contains_any<'a>(
+        &'a mut self,
+        scripts: impl Iterator<Item = &'a ScriptBuf>,
+    ) -> Result<bool, FilterError> {
         self.block_filter
-            .match_any(
-                &self.block_hash,
-                &mut scripts.iter().map(|script| script.to_bytes()),
-            )
+            .match_any(&self.block_hash, scripts.map(|script| script.to_bytes()))
             .map_err(|_| FilterError::IORead)
     }
 }

src/lib.rs

@@ -216,7 +216,7 @@ impl IndexedFilter {
     }
 
     /// Does the filter contain a positive match for any of the provided scripts
-    pub fn contains_any(&mut self, scripts: &HashSet<ScriptBuf>) -> bool {
+    pub fn contains_any<'a>(&'a mut self, scripts: impl Iterator<Item = &'a ScriptBuf>) -> bool {
         self.filter
             .contains_any(scripts)
             .expect("vec reader is infallible")