fix test

paradigmxyz · Jan 8, 2025 · d97732e · d97732e
1 parent 3d020b8
commit d97732e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/crates/static-file/static-file/src/static_file_producer.rs b/crates/static-file/static-file/src/static_file_producer.rs
@@ -228,10 +228,7 @@ where
                 )
             }),
             block_meta: finalized_block_numbers.block_meta.and_then(|finalized_block_number| {
-                self.get_static_file_target(
-                    highest_static_files.block_meta,
-                    finalized_block_number,
-                )
+                self.get_static_file_target(highest_static_files.block_meta, finalized_block_number)
             }),
         };
 
@@ -329,7 +326,7 @@ mod tests {
                 headers: Some(1),
                 receipts: Some(1),
                 transactions: Some(1),
-                block_meta: Some(1),
+                block_meta: None,
             })
             .expect("get static file targets");
         assert_eq!(
@@ -338,21 +335,26 @@ mod tests {
                 headers: Some(0..=1),
                 receipts: Some(0..=1),
                 transactions: Some(0..=1),
-                block_meta: Some(0..=1)
+                block_meta: None
             }
         );
         assert_matches!(static_file_producer.run(targets), Ok(_));
         assert_eq!(
             provider_factory.static_file_provider().get_highest_static_files(),
-            HighestStaticFiles { headers: Some(1), receipts: Some(1), transactions: Some(1), block_meta: Some(1) }
+            HighestStaticFiles {
+                headers: Some(1),
+                receipts: Some(1),
+                transactions: Some(1),
+                block_meta: None
+            }
         );
 
         let targets = static_file_producer
             .get_static_file_targets(HighestStaticFiles {
                 headers: Some(3),
                 receipts: Some(3),
                 transactions: Some(3),
-                block_meta: Some(3),
+                block_meta: None,
             })
             .expect("get static file targets");
         assert_eq!(
@@ -361,21 +363,26 @@ mod tests {
                 headers: Some(2..=3),
                 receipts: Some(2..=3),
                 transactions: Some(2..=3),
-                block_meta: Some(2..=3)
+                block_meta: None
             }
         );
         assert_matches!(static_file_producer.run(targets), Ok(_));
         assert_eq!(
             provider_factory.static_file_provider().get_highest_static_files(),
-            HighestStaticFiles { headers: Some(3), receipts: Some(3), transactions: Some(3), block_meta: Some(3) }
+            HighestStaticFiles {
+                headers: Some(3),
+                receipts: Some(3),
+                transactions: Some(3),
+                block_meta: None
+            }
         );
 
         let targets = static_file_producer
             .get_static_file_targets(HighestStaticFiles {
                 headers: Some(4),
                 receipts: Some(4),
                 transactions: Some(4),
-                block_meta: Some(4),
+                block_meta: None,
             })
             .expect("get static file targets");
         assert_eq!(
@@ -384,7 +391,7 @@ mod tests {
                 headers: Some(4..=4),
                 receipts: Some(4..=4),
                 transactions: Some(4..=4),
-                block_meta: Some(4..=4)
+                block_meta: None
             }
         );
         assert_matches!(
@@ -393,7 +400,12 @@ mod tests {
         );
         assert_eq!(
             provider_factory.static_file_provider().get_highest_static_files(),
-            HighestStaticFiles { headers: Some(3), receipts: Some(3), transactions: Some(3), block_meta: Some(3) }
+            HighestStaticFiles {
+                headers: Some(3),
+                receipts: Some(3),
+                transactions: Some(3),
+                block_meta: None
+            }
         );
     }
 

diff --git a/crates/static-file/types/src/lib.rs b/crates/static-file/types/src/lib.rs
@@ -92,7 +92,10 @@ pub struct StaticFileTargets {
 impl StaticFileTargets {
     /// Returns `true` if any of the targets are [Some].
     pub const fn any(&self) -> bool {
-        self.headers.is_some() || self.receipts.is_some() || self.transactions.is_some() || self.block_meta.is_some()
+        self.headers.is_some() ||
+            self.receipts.is_some() ||
+            self.transactions.is_some() ||
+            self.block_meta.is_some()
     }
 
     /// Returns `true` if all targets are either [`None`] or has beginning of the range equal to the