fix tests

Author: avalonche

crates/op-rbuilder/src/builders/flashblocks/payload.rs

@@ -100,7 +100,7 @@ impl OpPayloadBuilderCtx<FlashblocksExtraCtx> {
 
     /// Returns if the flashblock is the last one
     pub(crate) fn is_last_flashblock(&self) -> bool {
-        self.flashblock_index() == self.target_flashblock_count() - 1
+        self.flashblock_index() == self.target_flashblock_count()
     }
 }
 
@@ -439,7 +439,7 @@ where
                         info!(
                             target: "payload_builder",
                             target = ctx.target_flashblock_count(),
-                            flashblock_count = ctx.flashblock_index(),
+                            flashblock_index = ctx.flashblock_index(),
                             block_number = ctx.block_number(),
                             "Skipping flashblock reached target",
                         );
@@ -449,7 +449,7 @@ where
                     info!(
                         target: "payload_builder",
                         block_number = ctx.block_number(),
-                        flashblock_count = ctx.flashblock_index(),
+                        flashblock_index = ctx.flashblock_index(),
                         target_gas = total_gas_per_batch,
                         gas_used = info.cumulative_gas_used,
                         target_da = total_da_per_batch.unwrap_or(0),
@@ -614,7 +614,7 @@ where
                             info!(
                                 target: "payload_builder",
                                 message = "Flashblock built",
-                                flashblock_count = ctx.flashblock_index(),
+                                flashblock_index = ctx.flashblock_index(),
                                 current_gas = info.cumulative_gas_used,
                                 current_da = info.cumulative_da_bytes_used,
                                 target_flashblocks = flashblocks_per_block,

crates/op-rbuilder/src/tests/flashblocks.rs

@@ -189,7 +189,12 @@ async fn unichain_dynamic_with_lag(rbuilder: LocalInstance) -> eyre::Result<()>
         let block = driver
             .build_new_block_with_current_timestamp(Some(Duration::from_millis(i * 100)))
             .await?;
-        assert_eq!(block.transactions.len(), 8, "Got: {:?}", block.transactions); // 5 normal txn + deposit + 2 builder txn
+        assert_eq!(
+            block.transactions.len(),
+            8,
+            "Got: {:#?}",
+            block.transactions
+        ); // 5 normal txn + deposit + 2 builder txn
         tokio::time::sleep(std::time::Duration::from_secs(1)).await;
     }
 
@@ -383,17 +388,17 @@ async fn test_flashblock_min_max_filtering(rbuilder: LocalInstance) -> eyre::Res
 
     let _block = driver.build_new_block_with_current_timestamp(None).await?;
 
-    // It ends up in the flashblock with index 3. Flashblock number and index
-    // are different.
+    // It ends up in the 2nd flashblock
     assert_eq!(
-        2 + 1,
+        2,
         flashblocks_listener
             .find_transaction_flashblock(tx1.tx_hash())
-            .unwrap()
+            .unwrap(),
+        "Transaction should be in the 2nd flashblock"
     );
 
     let flashblocks = flashblocks_listener.get_flashblocks();
-    assert_eq!(6, flashblocks.len());
+    assert_eq!(6, flashblocks.len(), "Flashblocks length should be 6");
 
     flashblocks_listener.stop().await
 }