address comment

Author: yiweichi

crates/node/src/test_utils/fixture.rs

@@ -520,29 +520,35 @@ impl TestFixtureBuilder {
         &mut self.config
     }
 
-    /// Enable Anvil with the default state file (`./tests/testdata/anvil_state.json`).
-    pub fn with_anvil(mut self) -> Self {
-        self.anvil_config.enabled = true;
-        self.anvil_config.state_path = Some(PathBuf::from("./tests/testdata/anvil_state.json"));
-        self
-    }
-
-    /// Enable Anvil with a custom state file.
-    pub fn with_anvil_custom_state(mut self, path: impl Into<PathBuf>) -> Self {
+    /// Enable Anvil with optional configuration.
+    ///
+    /// # Parameters
+    /// - `state_path`: Optional path to Anvil state file. Defaults to `./tests/testdata/anvil_state.json` if `None`.
+    /// - `chain_id`: Optional chain ID for Anvil. If `None`, Anvil uses its default.
+    /// - `block_time`: Optional block time in seconds. If `None`, Anvil uses its default.
+    ///
+    /// # Examples
+    /// ```ignore
+    /// // Use default state file and default Anvil settings
+    /// builder.with_anvil(None, None, None)
+    ///
+    /// // Use default state file with custom chain ID
+    /// builder.with_anvil(None, Some(22222222), None)
+    ///
+    /// // Use custom state file with custom chain ID and block time
+    /// builder.with_anvil(Some(PathBuf::from("custom_state.json")), Some(22222222), Some(1))
+    /// ```
+    pub fn with_anvil(
+        mut self,
+        state_path: Option<PathBuf>,
+        chain_id: Option<u64>,
+        block_time: Option<u64>,
+    ) -> Self {
         self.anvil_config.enabled = true;
-        self.anvil_config.state_path = Some(path.into());
-        self
-    }
-
-    /// Set the chain ID for Anvil.
-    pub const fn with_anvil_chain_id(mut self, chain_id: u64) -> Self {
-        self.anvil_config.chain_id = Some(chain_id);
-        self
-    }
-
-    /// Set the block time for Anvil (in seconds).
-    pub const fn with_anvil_block_time(mut self, block_time: u64) -> Self {
-        self.anvil_config.block_time = Some(block_time);
+        self.anvil_config.state_path = state_path
+            .or_else(|| Some(PathBuf::from("./tests/testdata/anvil_state.json")));
+        self.anvil_config.chain_id = chain_id;
+        self.anvil_config.block_time = block_time;
         self
     }
 

crates/node/tests/l1_sync.rs

@@ -101,8 +101,7 @@ async fn test_l1_sync_batch_commit() -> eyre::Result<()> {
     let mut fixture = TestFixture::builder()
         .followers(1)
         .skip_l1_synced_notifications() // Prevents automatic L1Synced, simulates initial sync
-        .with_anvil()
-        .with_anvil_chain_id(22222222)
+        .with_anvil(None, Some(22222222), None)
         .build()
         .await?;
 
@@ -171,8 +170,7 @@ async fn test_l1_sync_batch_finalized() -> eyre::Result<()> {
     let mut fixture = TestFixture::builder()
         .followers(1)
         .skip_l1_synced_notifications()
-        .with_anvil()
-        .with_anvil_chain_id(22222222)
+        .with_anvil(None, Some(22222222), None)
         .build()
         .await?;
 
@@ -295,8 +293,7 @@ async fn test_l1_sync_batch_revert() -> eyre::Result<()> {
     let mut fixture = TestFixture::builder()
         .followers(1)
         .skip_l1_synced_notifications()
-        .with_anvil()
-        .with_anvil_chain_id(22222222)
+        .with_anvil(None, Some(22222222), None)
         .build()
         .await?;
 
@@ -370,8 +367,7 @@ async fn test_l1_reorg_batch_commit() -> eyre::Result<()> {
     let mut fixture = TestFixture::builder()
         .followers(1)
         .skip_l1_synced_notifications()
-        .with_anvil()
-        .with_anvil_chain_id(22222222)
+        .with_anvil(None, Some(22222222), None)
         .build()
         .await?;
 
@@ -454,8 +450,7 @@ async fn test_l1_reorg_batch_finalized() -> eyre::Result<()> {
     let mut fixture = TestFixture::builder()
         .followers(1)
         .skip_l1_synced_notifications()
-        .with_anvil()
-        .with_anvil_chain_id(22222222)
+        .with_anvil(None, Some(22222222), None)
         .build()
         .await?;
 
@@ -534,8 +529,7 @@ async fn test_l1_reorg_batch_revert() -> eyre::Result<()> {
     let mut fixture = TestFixture::builder()
         .followers(1)
         .skip_l1_synced_notifications()
-        .with_anvil()
-        .with_anvil_chain_id(22222222)
+        .with_anvil(None, Some(22222222), None)
         .build()
         .await?;