diff --git a/crates/zkevm_test_harness/src/compute_setups/mod.rs b/crates/zkevm_test_harness/src/compute_setups/mod.rs index 1143e7a..ac35e1b 100644 --- a/crates/zkevm_test_harness/src/compute_setups/mod.rs +++ b/crates/zkevm_test_harness/src/compute_setups/mod.rs @@ -9,7 +9,7 @@ use circuit_definitions::circuit_definitions::aux_layer::compression::{ CompressionMode5ForWrapperCircuit, ProofCompressionFunction, }; use circuit_definitions::circuit_definitions::aux_layer::compression_modes::{ - CompressionMode1, CompressionMode2, CompressionMode3, CompressionMode4, CompressionMode5, + CompressionMode1, CompressionMode2, CompressionMode3, CompressionMode4, }; use circuit_definitions::circuit_definitions::aux_layer::{ ZkSyncCompressionForWrapperCircuit, ZkSyncCompressionLayerCircuit, @@ -17,8 +17,9 @@ use circuit_definitions::circuit_definitions::aux_layer::{ use circuit_definitions::circuit_definitions::base_layer::ZkSyncBaseLayerCircuit; use circuit_definitions::circuit_definitions::recursion_layer::leaf_layer::ZkSyncLeafLayerRecursiveCircuit; use circuit_definitions::circuit_definitions::recursion_layer::{ - base_circuit_type_into_recursive_leaf_circuit_type, ZkSyncRecursionLayerStorageType, - ZkSyncRecursiveLayerCircuit, RECURSION_ARITY, SCHEDULER_CAPACITY, + base_circuit_type_into_recursive_leaf_circuit_type, circuit_def, + ZkSyncRecursionLayerStorageType, ZkSyncRecursiveLayerCircuit, RECURSION_ARITY, + SCHEDULER_CAPACITY, }; use circuit_definitions::circuit_definitions::ZkSyncUniformCircuitInstance; use circuit_definitions::recursion_layer_proof_config; @@ -46,7 +47,7 @@ fn get_compression_circuits( ZkSyncCompressionLayerCircuit::CompressionMode1Circuit(CompressionMode1Circuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode1::proof_config_for_compression_step(), + proof_config: recursion_layer_proof_config(), // recursion circuit 1 is scheduler verification_key: source.get_recursion_layer_vk(1).unwrap().into_inner(), _marker: Default::default(), @@ -57,7 +58,7 @@ fn get_compression_circuits( ZkSyncCompressionLayerCircuit::CompressionMode2Circuit(CompressionMode2Circuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode2::proof_config_for_compression_step(), + proof_config: CompressionMode1::proof_config_for_compression_step(), verification_key: source.get_compression_vk(1).unwrap().into_inner(), _marker: Default::default(), }, @@ -67,7 +68,7 @@ fn get_compression_circuits( ZkSyncCompressionLayerCircuit::CompressionMode3Circuit(CompressionMode3Circuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode3::proof_config_for_compression_step(), + proof_config: CompressionMode2::proof_config_for_compression_step(), verification_key: source.get_compression_vk(2).unwrap().into_inner(), _marker: Default::default(), }, @@ -77,7 +78,7 @@ fn get_compression_circuits( ZkSyncCompressionLayerCircuit::CompressionMode4Circuit(CompressionMode4Circuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode4::proof_config_for_compression_step(), + proof_config: CompressionMode3::proof_config_for_compression_step(), verification_key: source.get_compression_vk(3).unwrap().into_inner(), _marker: Default::default(), }, @@ -87,7 +88,7 @@ fn get_compression_circuits( ZkSyncCompressionLayerCircuit::CompressionMode5Circuit(CompressionMode5Circuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode5::proof_config_for_compression_step(), + proof_config: CompressionMode4::proof_config_for_compression_step(), verification_key: source.get_compression_vk(4).unwrap().into_inner(), _marker: Default::default(), }, @@ -105,8 +106,8 @@ fn get_compression_for_wrapper_circuits( CompressionMode1ForWrapperCircuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode1::proof_config_for_compression_step(), - verification_key: source.get_compression_vk(1).unwrap().into_inner(), + proof_config: recursion_layer_proof_config(), + verification_key: source.get_recursion_layer_vk(1).unwrap().into_inner(), _marker: Default::default(), }, transcript_params: (), @@ -117,8 +118,8 @@ fn get_compression_for_wrapper_circuits( CompressionMode2ForWrapperCircuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode2::proof_config_for_compression_step(), - verification_key: source.get_compression_vk(2).unwrap().into_inner(), + proof_config: CompressionMode1::proof_config_for_compression_step(), + verification_key: source.get_compression_vk(1).unwrap().into_inner(), _marker: Default::default(), }, transcript_params: (), @@ -129,8 +130,8 @@ fn get_compression_for_wrapper_circuits( CompressionMode3ForWrapperCircuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode3::proof_config_for_compression_step(), - verification_key: source.get_compression_vk(3).unwrap().into_inner(), + proof_config: CompressionMode2::proof_config_for_compression_step(), + verification_key: source.get_compression_vk(2).unwrap().into_inner(), _marker: Default::default(), }, transcript_params: (), @@ -141,8 +142,8 @@ fn get_compression_for_wrapper_circuits( CompressionMode4ForWrapperCircuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode4::proof_config_for_compression_step(), - verification_key: source.get_compression_vk(4).unwrap().into_inner(), + proof_config: CompressionMode3::proof_config_for_compression_step(), + verification_key: source.get_compression_vk(3).unwrap().into_inner(), _marker: Default::default(), }, transcript_params: (), @@ -153,8 +154,8 @@ fn get_compression_for_wrapper_circuits( CompressionMode5ForWrapperCircuit { witness: None, config: CompressionRecursionConfig { - proof_config: CompressionMode5::proof_config_for_compression_step(), - verification_key: source.get_compression_vk(5).unwrap().into_inner(), + proof_config: CompressionMode4::proof_config_for_compression_step(), + verification_key: source.get_compression_vk(4).unwrap().into_inner(), _marker: Default::default(), }, transcript_params: (),