From 1a98048b8b8112c99475f32f41bbde417bb47753 Mon Sep 17 00:00:00 2001 From: Vladislav Volosnikov Date: Mon, 30 Sep 2024 12:52:02 +0200 Subject: [PATCH] Fix tests --- .../src/tests/complex_tests/mod.rs | 31 ------------------- .../src/tests/run_manually.rs | 28 ----------------- 2 files changed, 59 deletions(-) diff --git a/crates/zkevm_test_harness/src/tests/complex_tests/mod.rs b/crates/zkevm_test_harness/src/tests/complex_tests/mod.rs index 616155b..06c5940 100644 --- a/crates/zkevm_test_harness/src/tests/complex_tests/mod.rs +++ b/crates/zkevm_test_harness/src/tests/complex_tests/mod.rs @@ -298,37 +298,6 @@ pub(crate) fn generate_base_layer( artifacts_callback, ); - let mut unsorted_memory_queue_witnesses_it = unsorted_memory_queue_witnesses.into_iter(); - let mut sorted_memory_queue_witnesses = sorted_memory_queue_witnesses.into_iter(); - for el in basic_block_circuits.iter_mut() { - use circuit_definitions::boojum::field::Field; - match &el { - ZkSyncBaseLayerCircuit::RAMPermutation(inner) => { - let mut witness = inner.witness.take().unwrap(); - let zero_state = [GoldilocksField::ZERO; FULL_SPONGE_QUEUE_STATE_WIDTH]; - witness.sorted_queue_witness = FullStateCircuitQueueRawWitness { - elements: sorted_memory_queue_witnesses - .next() - .unwrap() - .into_iter() - .map(|x| (x, zero_state)) - .collect(), - }; - witness.unsorted_queue_witness = FullStateCircuitQueueRawWitness { - elements: unsorted_memory_queue_witnesses_it - .next() - .unwrap() - .into_iter() - .map(|x| (x, zero_state)) - .collect(), - }; - - inner.witness.store(Some(witness)); - } - _ => {} - } - } - ( basic_block_circuits, recursion_queues, diff --git a/crates/zkevm_test_harness/src/tests/run_manually.rs b/crates/zkevm_test_harness/src/tests/run_manually.rs index 2b44fa5..35e9767 100644 --- a/crates/zkevm_test_harness/src/tests/run_manually.rs +++ b/crates/zkevm_test_harness/src/tests/run_manually.rs @@ -319,36 +319,8 @@ pub(crate) fn run_with_options(entry_point_bytecode: Vec<[u8; 32]>, options: Opt println!("Simulation and witness creation are completed"); - let mut unsorted_memory_queue_witnesses_it = unsorted_memory_queue_witnesses.into_iter(); - let mut sorted_memory_queue_witnesses = sorted_memory_queue_witnesses.into_iter(); for el in basic_block_circuits { println!("Doing {} circuit", el.short_description()); - use circuit_definitions::boojum::field::Field; - match &el { - ZkSyncBaseLayerCircuit::RAMPermutation(inner) => { - let mut witness = inner.witness.take().unwrap(); - let zero_state = [GoldilocksField::ZERO; FULL_SPONGE_QUEUE_STATE_WIDTH]; - witness.sorted_queue_witness = FullStateCircuitQueueRawWitness { - elements: sorted_memory_queue_witnesses - .next() - .unwrap() - .into_iter() - .map(|x| (x, zero_state)) - .collect(), - }; - witness.unsorted_queue_witness = FullStateCircuitQueueRawWitness { - elements: unsorted_memory_queue_witnesses_it - .next() - .unwrap() - .into_iter() - .map(|x| (x, zero_state)) - .collect(), - }; - - inner.witness.store(Some(witness)); - } - _ => {} - } base_test_circuit(el); }