fix clippy issues

Author: wolfv

src/merkle/integrate.rs

@@ -586,13 +586,11 @@ mod tests {
 
         // Chain range hashes to get root
         let mut root: Option<Sha256Hash> = None;
-        for level_hash in &range {
-            if let Some(h) = level_hash {
-                root = Some(match root {
-                    None => *h,
-                    Some(right) => hash_children(h, &right),
-                });
-            }
+        for h in range.iter().flatten() {
+            root = Some(match root {
+                None => *h,
+                Some(right) => hash_children(h, &right),
+            });
         }
 
         root.unwrap_or_else(empty_root_hash)

src/merkle/proof_test.rs

@@ -55,13 +55,11 @@ fn compute_root(leaves: &[Sha256Hash]) -> Sha256Hash {
     }
 
     let mut root: Option<Sha256Hash> = None;
-    for h in &range {
-        if let Some(hash) = h {
-            root = Some(match root {
-                None => *hash,
-                Some(r) => hash_children(hash, &r),
-            });
-        }
+    for hash in range.iter().flatten() {
+        root = Some(match root {
+            None => *hash,
+            Some(r) => hash_children(hash, &r),
+        });
     }
     root.unwrap_or_else(empty_root_hash)
 }
@@ -101,8 +99,6 @@ async fn create_test_storage(leaves: &[Sha256Hash]) -> TileStorage {
 /// Test that proof_length matches what we generate.
 #[test]
 fn test_expected_proof_lengths() {
-    use crate::witness::ConsistencyProof;
-
     // Calculate expected proof length using the same algorithm as the verifier
     fn proof_length(old_size: u64, new_size: u64) -> usize {
         if old_size == 0 || old_size == new_size {

src/witness/litewitness_test.rs

@@ -62,13 +62,11 @@ fn compute_root(leaves: &[Sha256Hash]) -> Sha256Hash {
     }
 
     let mut root: Option<Sha256Hash> = None;
-    for h in &range {
-        if let Some(hash) = h {
-            root = Some(match root {
-                None => *hash,
-                Some(r) => hash_children(hash, &r),
-            });
-        }
+    for hash in range.iter().flatten() {
+        root = Some(match root {
+            None => *hash,
+            Some(r) => hash_children(hash, &r),
+        });
     }
     root.unwrap_or_else(empty_root_hash)
 }

src/witness/proof.rs

@@ -348,6 +348,7 @@ mod tests {
     use sigstore_merkle::hash_leaf;
 
     /// Build a complete tree and return the root hash.
+    #[allow(dead_code)]
     fn build_tree(leaves: &[Sha256Hash]) -> Sha256Hash {
         if leaves.is_empty() {
             return empty_root_hash();
@@ -383,13 +384,11 @@ mod tests {
 
         // Compute root from range
         let mut root: Option<Sha256Hash> = None;
-        for h in &range {
-            if let Some(hash) = h {
-                root = Some(match root {
-                    None => *hash,
-                    Some(r) => hash_children(hash, &r),
-                });
-            }
+        for hash in range.iter().flatten() {
+            root = Some(match root {
+                None => *hash,
+                Some(r) => hash_children(hash, &r),
+            });
         }
         root.unwrap_or_else(empty_root_hash)
     }