Merge remote-tracking branch 'origin/main' into hm/upgrade-fvm

ChainSafe · Nov 28, 2024 · 926a580 · 926a580
2 parents f8597a6 + 0fc577e
commit 926a580
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/networks/actors_bundle.rs b/src/networks/actors_bundle.rs
@@ -201,11 +201,7 @@ pub async fn generate_actor_bundle(output: &Path) -> anyhow::Result<()> {
     blocks.dedup();
 
     for block in blocks.iter() {
-        ensure!(
-            block.valid(),
-            "sources contain an invalid block, cid {}",
-            block.cid
-        )
+        block.validate()?;
     }
 
     stream::iter(blocks)

diff --git a/src/utils/db/car_stream.rs b/src/utils/db/car_stream.rs
@@ -245,7 +245,7 @@ mod tests {
         let blocks: Vec<CarBlock> = stream.try_collect().await.unwrap();
         assert_eq!(blocks.len(), 1207);
         for block in blocks {
-            assert!(block.valid());
+            block.validate().unwrap();
         }
     }
 
@@ -255,7 +255,7 @@ mod tests {
         let blocks: Vec<CarBlock> = stream.try_collect().await.unwrap();
         assert_eq!(blocks.len(), 1222);
         for block in blocks {
-            assert!(block.valid());
+            block.validate().unwrap();
         }
     }
 }