Merge branch 'zkvm/keccak/pattern' into zkvm/keccak/generic-cols

o1-labs · Oct 30, 2023 · 01312b7 · 01312b7
2 parents ceee254 + f3bc909
commit 01312b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/kimchi/src/circuits/berkeley_columns.rs b/kimchi/src/circuits/berkeley_columns.rs
@@ -152,11 +152,12 @@ impl<F: Copy, const COLUMNS: usize> ColumnEvaluations<F>
             LookupKindIndex(LookupPattern::ForeignFieldMul) => self
                 .foreign_field_mul_lookup_selector
                 .ok_or(ExprError::MissingIndexEvaluation(col)),
+            LookupKindIndex(LookupPattern::KeccakRound) => todo!(),
+            LookupKindIndex(LookupPattern::KeccakSponge) => todo!(),
             LookupRuntimeSelector => self
                 .runtime_lookup_table_selector
                 .ok_or(ExprError::MissingIndexEvaluation(col)),
             Index(_) => Err(ExprError::MissingIndexEvaluation(col)),
-            LookupKindIndex(_) => Err(ExprError::MissingIndexEvaluation(col)),
         }
     }
 }
diff --git a/kimchi/src/proof.rs b/kimchi/src/proof.rs
@@ -435,7 +435,8 @@ impl<F, const COLUMNS: usize> ProofEvaluations<F, COLUMNS> {
             Column::LookupKindIndex(LookupPattern::ForeignFieldMul) => {
                 self.foreign_field_mul_lookup_selector.as_ref()
             }
-            Column::LookupKindIndex(_) => None,
+            Column::LookupKindIndex(LookupPattern::KeccakRound) => todo!(),
+            Column::LookupKindIndex(LookupPattern::KeccakSponge) => todo!(),
             Column::LookupRuntimeSelector => self.runtime_lookup_table_selector.as_ref(),
             Column::LookupRuntimeTable => self.runtime_lookup_table.as_ref(),
             Column::Index(GateType::Generic) => Some(&self.generic_selector),