fix(dash-spv): update ClientConfig and tests after watch API removal; adjust BlockProcessor and sync_manager generics; fix example to compile; all tests green (#117)

* fix(dash-spv): update ClientConfig and tests after watch API removal; adjust BlockProcessor and sync_manager generics; fix example to compile; all tests green

* chore: run cargo fmt

Author: PastaPastaPasta

dash-spv/examples/filter_sync.rs

@@ -22,9 +22,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     )?;
 
     // Create configuration with filter support
-    let config = ClientConfig::mainnet()
-        .watch_address(watch_address.clone().require_network(Network::Dash).unwrap())
-        .without_masternodes(); // Skip masternode sync for this example
+    let config = ClientConfig::mainnet().without_masternodes(); // Skip masternode sync for this example
 
     // Create network manager
     let network_manager = MultiPeerNetworkManager::new(&config).await?;

dash-spv/src/client/block_processor_test.rs

@@ -85,13 +85,10 @@ mod tests {
         let stats = Arc::new(RwLock::new(SpvStats::default()));
         let wallet = Arc::new(RwLock::new(MockWallet::new(Network::Dash)));
         let storage = Arc::new(Mutex::new(MemoryStorageManager::new().await.unwrap()));
-        let watch_items = Arc::new(RwLock::new(HashSet::new()));
-
         let processor = BlockProcessor::new(
             task_rx,
             wallet.clone(),
             storage.clone(),
-            watch_items,
             stats,
             event_tx,
             Network::Dash,
@@ -265,17 +262,9 @@ mod tests {
             network: Network::Dash,
         }));
         let storage = Arc::new(Mutex::new(MemoryStorageManager::new().await.unwrap()));
-        let watch_items = Arc::new(RwLock::new(HashSet::new()));
 
-        let processor = BlockProcessor::new(
-            task_rx,
-            wallet,
-            storage,
-            watch_items,
-            stats,
-            event_tx,
-            Network::Dash,
-        );
+        let processor =
+            BlockProcessor::new(task_rx, wallet, storage, stats, event_tx, Network::Dash);
 
         let block_hash = create_test_block(Network::Dash).block_hash();
         let filter_data = vec![1, 2, 3, 4, 5];

dash-spv/src/client/config_test.rs

@@ -23,7 +23,6 @@ mod tests {
         assert_eq!(config.message_timeout, Duration::from_secs(60));
         assert_eq!(config.sync_timeout, Duration::from_secs(300));
         assert_eq!(config.read_timeout, Duration::from_millis(100));
-        assert!(config.watch_items.is_empty());
         assert!(config.enable_filters);
         assert!(config.enable_masternodes);
         assert_eq!(config.max_peers, 8);
@@ -114,23 +113,6 @@ mod tests {
         assert_eq!(config.peers[1], addr2);
     }
 
-    #[test]
-    fn test_watch_items() {
-        let mut config = ClientConfig::default();
-
-        // Create a dummy P2PKH address for testing
-        use dashcore::hashes::Hash;
-        let pubkey_hash = dashcore::PubkeyHash::from_byte_array([0u8; 20]);
-        let address =
-            Address::new(Network::Testnet, dashcore::address::Payload::PubkeyHash(pubkey_hash));
-        config = config.watch_address(address);
-        assert_eq!(config.watch_items.len(), 1);
-
-        let script = dashcore::ScriptBuf::new();
-        config = config.watch_script(script);
-        assert_eq!(config.watch_items.len(), 2);
-    }
-
     #[test]
     fn test_disable_features() {
         let config = ClientConfig::default().without_filters().without_masternodes();

dash-spv/src/client/mod.rs

@@ -2383,7 +2383,7 @@ impl<
 
     /// Get mutable reference to sync manager (for testing)
     #[cfg(test)]
-    pub fn sync_manager_mut(&mut self) -> &mut SequentialSyncManager<S, N> {
+    pub fn sync_manager_mut(&mut self) -> &mut SequentialSyncManager<S, N, W> {
         &mut self.sync_manager
     }
 

dash-spv/src/network/tests.rs

@@ -135,7 +135,6 @@ mod multi_peer_tests {
             message_timeout: Duration::from_secs(30),
             sync_timeout: Duration::from_secs(60),
             read_timeout: Duration::from_millis(15),
-            watch_items: vec![],
             enable_filters: false,
             enable_masternodes: false,
             max_peers: 3,

dash-spv/src/sync/filters.rs

@@ -1,14 +1,14 @@
 //! Filter synchronization functionality.
 
 use dashcore::{
-    BlockHash, ScriptBuf,
     bip158::{BlockFilterReader, Error as Bip158Error},
     hash_types::FilterHeader,
     network::message::NetworkMessage,
     network::message_blockdata::Inventory,
     network::message_filter::{CFHeaders, GetCFHeaders, GetCFilters},
+    BlockHash, ScriptBuf,
 };
-use dashcore_hashes::{Hash, sha256d};
+use dashcore_hashes::{sha256d, Hash};
 use std::collections::{HashMap, HashSet, VecDeque};
 use tokio::sync::mpsc;
 

dash-spv/src/sync/sequential/mod.rs

@@ -37,11 +37,7 @@ use transitions::TransitionManager;
 const CHAINLOCK_VALIDATION_MASTERNODE_OFFSET: u32 = 8;
 
 /// Manages sequential synchronization of all data types
-pub struct SequentialSyncManager<
-    S: StorageManager,
-    N: NetworkManager,
-    W: WalletInterface,
-> {
+pub struct SequentialSyncManager<S: StorageManager, N: NetworkManager, W: WalletInterface> {
     _phantom_s: std::marker::PhantomData<S>,
     _phantom_n: std::marker::PhantomData<N>,
     /// Current synchronization phase