chore: fix clippy errors

Author: PastaPastaPasta

dash-spv/src/sync/filters.rs

@@ -498,23 +498,18 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
                     let stop_hash = if next_batch_end_height < header_tip_height {
                         // Try to get the header at the calculated height
                         // Convert blockchain height to storage height
-                        let storage_height = match self
+                        let storage_height = self
                             .header_abs_to_storage_index(next_batch_end_height)
-                        {
-                            Some(v) => v,
-                            None => {
+                            .unwrap_or_else(|| {
                                 tracing::warn!(
                                     "next_batch_end_height {} is at or before checkpoint base {}",
                                     next_batch_end_height,
                                     self.sync_base_height
                                 );
                                 // Fallback to current_sync_height
-                                match self.header_abs_to_storage_index(self.current_sync_height) {
-                                    Some(v) => v,
-                                    None => 0,
-                                }
-                            }
-                        };
+                                self.header_abs_to_storage_index(self.current_sync_height)
+                                    .unwrap_or_default()
+                            });
                         match storage.get_header(storage_height).await {
                             Ok(Some(header)) => header.block_hash(),
                             Ok(None) => {
@@ -617,10 +612,7 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
                         // Special handling for chain tip: if we can't find the exact tip header,
                         // try the previous header as we might be at the actual chain tip
                         let tip_storage_height =
-                            match self.header_abs_to_storage_index(header_tip_height) {
-                                Some(v) => v,
-                                None => 0,
-                            };
+                            self.header_abs_to_storage_index(header_tip_height).unwrap_or_default();
                         match storage.get_header(tip_storage_height).await {
                             Ok(Some(header)) => header.block_hash(),
                             Ok(None) if header_tip_height > 0 => {
@@ -630,11 +622,9 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
                                     header_tip_height
                                 );
                                 // Try previous header when at chain tip
-                                let prev_storage_height =
-                                    match self.header_abs_to_storage_index(header_tip_height - 1) {
-                                        Some(v) => v,
-                                        None => 0,
-                                    };
+                                let prev_storage_height = self
+                                    .header_abs_to_storage_index(header_tip_height - 1)
+                                    .unwrap_or_default();
                                 storage
                                     .get_header(prev_storage_height)
                                     .await
@@ -1577,10 +1567,7 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
             let batch_end = (current_height + batch_size - 1).min(end);
 
             // Get stop hash for this batch - convert blockchain height to storage index
-            let storage_height = match self.header_abs_to_storage_index(batch_end) {
-                Some(v) => v,
-                None => 0,
-            };
+            let storage_height = self.header_abs_to_storage_index(batch_end).unwrap_or_default();
             let stop_hash = storage
                 .get_header(storage_height)
                 .await
@@ -1907,10 +1894,7 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
         }
 
         // Calculate stop hash for retry - convert blockchain height to storage index
-        let storage_height = match self.header_abs_to_storage_index(end) {
-            Some(v) => v,
-            None => 0,
-        };
+        let storage_height = self.header_abs_to_storage_index(end).unwrap_or_default();
         match storage.get_header(storage_height).await {
             Ok(Some(header)) => {
                 let stop_hash = header.block_hash();
@@ -3349,10 +3333,7 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
             }
 
             // Calculate stop hash for this range - convert blockchain height to storage index
-            let storage_height = match self.header_abs_to_storage_index(end) {
-                Some(v) => v,
-                None => 0,
-            };
+            let storage_height = self.header_abs_to_storage_index(end).unwrap_or_default();
             match storage.get_header(storage_height).await {
                 Ok(Some(header)) => {
                     let stop_hash = header.block_hash();
@@ -3389,10 +3370,7 @@ impl<S: StorageManager + Send + Sync + 'static, N: NetworkManager + Send + Sync
 
                             // Get stop hash for this batch - convert blockchain height to storage index
                             let batch_storage_height =
-                                match self.header_abs_to_storage_index(batch_end) {
-                                    Some(v) => v,
-                                    None => 0,
-                                };
+                                self.header_abs_to_storage_index(batch_end).unwrap_or_default();
                             match storage.get_header(batch_storage_height).await {
                                 Ok(Some(batch_header)) => {
                                     let batch_stop_hash = batch_header.block_hash();