Merge branch 'main' into matias/separate-chain-create

core/lib/config/src/configs/prover_autoscaler.rs

@@ -100,7 +100,7 @@ pub enum Gpu {
 
 // TODO: generate this enum by QueueReport from https://github.com/matter-labs/zksync-era/blob/main/prover/crates/bin/prover_job_monitor/src/autoscaler_queue_reporter.rs#L23
 // and remove allowing of non_camel_case_types by generating field name parser.
-#[derive(Debug, Display, PartialEq, Eq, Hash, Clone, Deserialize, EnumString, Default)]
+#[derive(Debug, Display, PartialEq, Eq, Hash, Clone, Copy, Deserialize, EnumString, Default)]
 #[allow(non_camel_case_types)]
 pub enum QueueReportFields {
     #[strum(ascii_case_insensitive)]

core/lib/multivm/src/versions/shadow/tests.rs

@@ -197,6 +197,54 @@ mod default_aa {
     }
 }
 
+mod evm_emulator {
+    use test_casing::{test_casing, Product};
+
+    use crate::versions::testonly::evm_emulator::*;
+
+    #[test]
+    fn tracing_evm_contract_deployment() {
+        test_tracing_evm_contract_deployment::<super::ShadowedFastVm>();
+    }
+
+    #[test]
+    fn mock_emulator_basics() {
+        test_mock_emulator_basics::<super::ShadowedFastVm>();
+    }
+
+    #[test_casing(2, [false, true])]
+    #[test]
+    fn mock_emulator_with_payment(deploy_emulator: bool) {
+        test_mock_emulator_with_payment::<super::ShadowedFastVm>(deploy_emulator);
+    }
+
+    #[test_casing(4, Product(([false, true], [false, true])))]
+    #[test]
+    fn mock_emulator_with_recursion(deploy_emulator: bool, is_external: bool) {
+        test_mock_emulator_with_recursion::<super::ShadowedFastVm>(deploy_emulator, is_external);
+    }
+
+    #[test]
+    fn calling_to_mock_emulator_from_native_contract() {
+        test_calling_to_mock_emulator_from_native_contract::<super::ShadowedFastVm>();
+    }
+
+    #[test]
+    fn mock_emulator_with_deployment() {
+        test_mock_emulator_with_deployment::<super::ShadowedFastVm>();
+    }
+
+    #[test]
+    fn mock_emulator_with_delegate_call() {
+        test_mock_emulator_with_delegate_call::<super::ShadowedFastVm>();
+    }
+
+    #[test]
+    fn mock_emulator_with_static_call() {
+        test_mock_emulator_with_static_call::<super::ShadowedFastVm>();
+    }
+}
+
 mod gas_limit {
     use crate::versions::testonly::gas_limit::*;