address comments

0xPolygonZero · Oct 6, 2024 · 051702d · 051702d
1 parent 640bae1
commit 051702d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/evm_arithmetization/src/fixed_recursive_verifier.rs b/evm_arithmetization/src/fixed_recursive_verifier.rs
@@ -1919,25 +1919,23 @@ where
             let table_circuits = &self.by_table[table];
             if KECCAK_TABLES_INDICES.contains(&table) && !all_proof.use_keccak_tables {
                 // generate and set a dummy `index_verifier_data` and `proof_with_pis`
-                let index_verifier_data = table_circuits
-                    .by_stark_size
-                    .keys()
-                    .min()
-                    .expect("No valid size in shrinking circuits");
+                let index_verifier_data =
+                    table_circuits.by_stark_size.keys().min().ok_or_else(|| {
+                        anyhow::format_err!("No valid size in shrinking circuits")
+                    })?;
                 root_inputs.set_target(
                     self.root.index_verifier_data[table],
                     F::from_canonical_usize(*index_verifier_data),
                 );
-                let common_data = &table_circuits
+                let table_circuit = table_circuits
                     .by_stark_size
                     .get(index_verifier_data)
-                    .expect("No valid size in shrinking circuits")
+                    .ok_or_else(|| anyhow::format_err!("No valid size in shrinking circuits"))?
                     .shrinking_wrappers
                     .last()
-                    .expect("No shrinking circuits")
-                    .circuit
-                    .common;
-                let dummy_circuit: CircuitData<F, C, D> = dummy_circuit(common_data);
+                    .ok_or_else(|| anyhow::format_err!("No shrinking circuits"))?;
+                let dummy_circuit: CircuitData<F, C, D> =
+                    dummy_circuit(&table_circuit.circuit.common);
                 let dummy_pis = HashMap::new();
                 let dummy_proof = dummy_proof(&dummy_circuit, dummy_pis)
                     .expect("Unable to generate dummy proofs");
@@ -2112,7 +2110,7 @@ where
                 let common_date = &table_circuit
                     .shrinking_wrappers
                     .last()
-                    .expect("No shrinking circuits")
+                    .ok_or_else(|| anyhow::format_err!("No shrinking circuits"))?
                     .circuit
                     .common;
                 let dummy_circuit: CircuitData<F, C, D> = dummy_circuit(common_date);

diff --git a/evm_arithmetization/src/generation/mod.rs b/evm_arithmetization/src/generation/mod.rs
@@ -585,8 +585,7 @@ pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
         mem_after: MemCap::default(),
     };
 
-    let use_keccak_tables =
-        !state.traces.keccak_inputs.is_empty() || !state.traces.keccak_sponge_ops.is_empty();
+    let use_keccak_tables = !state.traces.keccak_inputs.is_empty();
 
     let tables = timed!(
         timing,

diff --git a/evm_arithmetization/src/prover.rs b/evm_arithmetization/src/prover.rs
@@ -279,7 +279,7 @@ where
     let (keccak_proof, _) = prove_table!(keccak_stark, Table::Keccak);
     let (keccak_sponge_proof, _) = prove_table!(keccak_sponge_stark, Table::KeccakSponge);
     if !use_keccak_tables {
-        // We need to connect the challenger state of Logic and CPU tables when the
+        // We need to connect the challenger state of CPU and Logic tables when the
         // Keccak tables are not in use.
         *challenger = challenger_after_cpu;
     }