Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
0xVolosnikov committed Sep 30, 2024
1 parent 53e6cec commit 1a98048
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 59 deletions.
31 changes: 0 additions & 31 deletions crates/zkevm_test_harness/src/tests/complex_tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
28 changes: 0 additions & 28 deletions crates/zkevm_test_harness/src/tests/run_manually.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 1a98048

Please sign in to comment.