Fixes and cleanups

Author: 0xVolosnikov

tests/instances/transactions/src/lib.rs

@@ -287,7 +287,7 @@ fn test_withdrawal() {
 
     let output = tester.execute_block(transactions);
 
-    tester.assert_all_txs_succeded(&output);
+    tester.assert_all_txs_succeeded(&output);
 
     // Check preimage of withdrawal
     let mut expected_preimage =
@@ -346,7 +346,7 @@ fn test_tx_with_access_list() {
 
     let output = tester.execute_block(transactions);
 
-    tester.assert_all_txs_succeded(&output);
+    tester.assert_all_txs_succeeded(&output);
 }
 
 #[test]
@@ -396,7 +396,7 @@ fn test_tx_with_authorization_list() {
 
     let output = tester.execute_block(vec![mint_tx]);
 
-    tester.assert_all_txs_succeded(&output);
+    tester.assert_all_txs_succeeded(&output);
 }
 
 // Test that slots made warm in a tx are cold in the next tx
@@ -460,7 +460,13 @@ fn test_cold_in_new_tx() {
 
     let output = tester.execute_block(transactions);
 
-    tester.assert_all_txs_succeded(&output);
+    // Assert all txs succeeded
+    let result0 = output.tx_results.first().unwrap().clone();
+    let result1 = output.tx_results.get(1).unwrap().clone();
+    let result2 = output.tx_results.get(2).unwrap().clone();
+    assert!(result0.is_ok_and(|o| o.is_success()));
+    assert!(result1.is_ok_and(|o| o.is_success()));
+    assert!(result2.is_ok_and(|o| !o.is_success()));
 }
 
 #[test]
@@ -514,7 +520,7 @@ fn test_independent_txs_have_same_pubdata() {
     let output = tester.execute_block(transactions);
 
     // Assert all txs succeeded and compare pubdata len
-    tester.assert_all_txs_succeded(&output);
+    tester.assert_all_txs_succeeded(&output);
 
     let result1 = output.tx_results.first().unwrap().clone();
     let result2 = output.tx_results.get(1).unwrap().clone();
@@ -616,7 +622,7 @@ fn test_invalid_tx_does_not_affect_native() {
     let output = tester.execute_block(transactions);
 
     // Assert tx succeeded
-    tester.assert_all_txs_succeded(&output);
+    tester.assert_all_txs_succeeded(&output);
 
     let native_used_reference = output
         .tx_results

tests/rig/src/lib.rs

@@ -15,6 +15,7 @@ use alloy::signers::local::PrivateKeySigner;
 pub use alloy_rlp;
 pub use alloy_sol_types;
 pub use basic_bootloader;
+use basic_bootloader::bootloader::errors::BootloaderSubsystemError;
 pub use basic_system;
 pub use callable_oracles;
 pub use chain::BlockContext;
@@ -108,6 +109,12 @@ impl ZKsyncOSTester<true> {
     }
 }
 
+impl Default for ZKsyncOSTester<false> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl ZKsyncOSTester<false> {
     pub fn new() -> Self {
         init_logger();
@@ -283,7 +290,7 @@ impl<const RANDOMIZED_TREE: bool> ZKsyncOSTester<RANDOMIZED_TREE> {
         self.chain.run_block(
             encoded_txs,
             self.block_context.clone(),
-            self.da_commitment_scheme.clone(),
+            self.da_commitment_scheme,
             self.run_config.clone(),
         )
     }
@@ -300,20 +307,20 @@ impl<const RANDOMIZED_TREE: bool> ZKsyncOSTester<RANDOMIZED_TREE> {
     pub fn execute_block_no_panic<T: IntoEncodedTx>(
         &mut self,
         transactions: Vec<T>,
-    ) -> Result<BlockOutput, basic_bootloader::bootloader::errors::BootloaderSubsystemError> {
+    ) -> Result<BlockOutput, BootloaderSubsystemError> {
         let encoded_txs = transactions
             .into_iter()
             .map(IntoEncodedTx::into_encoded_tx)
             .collect::<Vec<_>>();
         self.chain.run_block_no_panic(
             encoded_txs,
             self.block_context.clone(),
-            self.da_commitment_scheme.clone(),
+            self.da_commitment_scheme,
             self.run_config.clone(),
         )
     }
 
-    pub fn assert_all_txs_succeded(&self, block_output: &BlockOutput) {
+    pub fn assert_all_txs_succeeded(&self, block_output: &BlockOutput) {
         assert!(block_output
             .tx_results
             .iter()