Merge branch 'zkvm/keccak/layout' into zkvm/keccak/witness

o1-labs · Oct 30, 2023 · 2b4b0d3 · 2b4b0d3
2 parents 42d8ba1 + 0276c75
commit 2b4b0d3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/kimchi/src/circuits/polynomials/keccak/witness.rs b/kimchi/src/circuits/polynomials/keccak/witness.rs
@@ -19,9 +19,9 @@ use super::{
     RATE,
 };
 
-type Layout<const W: usize, F> = Vec<Box<dyn WitnessCell<W, F, Vec<F>>>>;
+type Layout<F, const COLUMNS: usize> = Vec<Box<dyn WitnessCell<F, Vec<F>, COLUMNS>>>;
 
-fn layout_round<F: PrimeField>() -> [Layout<KECCAK_COLS, F>; 1] {
+fn layout_round<F: PrimeField>() -> [Layout<F, KECCAK_COLS>; 1] {
     [vec![
         IndexCell::create("state_a", 0, 100),
         IndexCell::create("state_c", 100, 120),
@@ -48,7 +48,7 @@ fn layout_round<F: PrimeField>() -> [Layout<KECCAK_COLS, F>; 1] {
     ]]
 }
 
-fn layout_sponge<F: PrimeField>() -> [Layout<KECCAK_COLS, F>; 1] {
+fn layout_sponge<F: PrimeField>() -> [Layout<F, KECCAK_COLS>; 1] {
     [vec![
         IndexCell::create("old_state", 0, 100),
         IndexCell::create("new_state", 100, 200),