Fix circuit benchmarks

circuit-benchmarks/src/bytecode_circuit.rs

@@ -31,7 +31,7 @@ mod tests {
         let proof_gen_prfx = crate::constants::PROOFGEN_PREFIX;
         let proof_ver_prfx = crate::constants::PROOFVER_PREFIX;
         let degree: u32 = var("DEGREE")
-            .unwrap_or_else(|_| "15".to_string())
+            .unwrap_or("26".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");
 

circuit-benchmarks/src/copy_circuit.rs

@@ -37,7 +37,7 @@ mod tests {
         let proof_gen_prfx = crate::constants::PROOFGEN_PREFIX;
         let proof_ver_prfx = crate::constants::PROOFVER_PREFIX;
         let degree: u32 = var("DEGREE")
-            .unwrap_or_else(|_| "14".to_string())
+            .unwrap_or("14".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");
 
@@ -51,9 +51,10 @@ mod tests {
         ]);
 
         // Create the circuit
-        let block = generate_full_events_block(degree);
+        let mut block = generate_full_events_block(degree);
+        block.circuits_params.max_rws = 10_000;
+        block.circuits_params.max_copy_rows = 10_000;
         let circuit = TestCopyCircuit::<Fr>::new_from_block(&block);
-
         // Bench setup generation
         let setup_message = format!("{} {} with degree = {}", BENCHMARK_ID, setup_prfx, degree);
         let start1 = start_timer!(|| setup_message);

circuit-benchmarks/src/evm_circuit.rs

@@ -36,7 +36,7 @@ mod evm_circ_benches {
         const BENCHMARK_ID: &str = "EVM Circuit";
 
         let degree: u32 = var("DEGREE")
-            .expect("No DEGREE env var was provided")
+            .unwrap_or("18".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");
 

circuit-benchmarks/src/exp_circuit.rs

@@ -43,7 +43,7 @@ mod tests {
         // Initialize the circuit
 
         let degree: u32 = var("DEGREE")
-            .unwrap_or_else(|_| "19".to_string())
+            .unwrap_or("10".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");
 

circuit-benchmarks/src/mpt_circuit.rs

@@ -34,7 +34,7 @@ mod tests {
         const BENCHMARK_ID: &str = "MPT Circuit";
 
         let degree: u32 = var("DEGREE")
-            .expect("No DEGREE env var was provided")
+            .unwrap_or("15".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");
 

circuit-benchmarks/src/packed_multi_keccak.rs

@@ -33,7 +33,7 @@ mod tests {
         const BENCHMARK_ID: &str = "Packed Multi-Keccak Circuit";
 
         let degree: u32 = var("DEGREE")
-            .expect("No DEGREE env var was provided")
+            .unwrap_or("11".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");
 

circuit-benchmarks/src/pi_circuit.rs

@@ -38,7 +38,7 @@ mod tests {
         const MAX_CALLDATA: usize = 128;
 
         let degree: u32 = var("DEGREE")
-            .unwrap_or_else(|_| "19".to_string())
+            .unwrap_or("17".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");
 

circuit-benchmarks/src/state_circuit.rs

@@ -35,7 +35,7 @@ mod tests {
         const BENCHMARK_ID: &str = "State Circuit";
 
         let degree: u32 = var("DEGREE")
-            .expect("No DEGREE env var was provided")
+            .unwrap_or("18".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");
 

circuit-benchmarks/src/super_circuit.rs

@@ -37,7 +37,7 @@ mod tests {
         const BENCHMARK_ID: &str = "Super Circuit";
 
         let degree: u32 = var("DEGREE")
-            .expect("No DEGREE env var was provided")
+            .unwrap_or("19".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");
 

circuit-benchmarks/src/tx_circuit.rs

@@ -40,7 +40,7 @@ mod tests {
         const MAX_CALLDATA: usize = 1024;
 
         let degree: u32 = var("DEGREE")
-            .unwrap_or_else(|_| "19".to_string())
+            .unwrap_or("19".to_string())
             .parse()
             .expect("Cannot parse DEGREE env var as u32");