diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index 4cc95e20..2361f798 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -114,13 +114,13 @@ mod tests { } let cpu_trace = trace_rows_to_poly_values(cpu_trace_rows); - let cross_table_lookups = vec![CrossTableLookup { - looking_tables: vec![Table::Cpu], - looking_columns: vec![vec![cpu::columns::OPCODE]], - looked_table: Table::Keccak, - looked_columns: vec![keccak_looked_col], + let cross_table_lookups = vec![CrossTableLookup::new( + vec![Table::Cpu], + vec![vec![cpu::columns::OPCODE]], + Table::Keccak, + vec![keccak_looked_col], default, - }]; + )]; let all_stark = AllStark { cpu_stark, diff --git a/evm/src/cross_table_lookup.rs b/evm/src/cross_table_lookup.rs index f4887b68..1f89f7b9 100644 --- a/evm/src/cross_table_lookup.rs +++ b/evm/src/cross_table_lookup.rs @@ -23,11 +23,11 @@ use crate::vars::{StarkEvaluationTargets, StarkEvaluationVars}; #[derive(Clone)] pub struct CrossTableLookup { - pub looking_tables: Vec, - pub looking_columns: Vec>, - pub looked_table: Table, - pub looked_columns: Vec, - pub default: Vec, + looking_tables: Vec
, + looking_columns: Vec>, + looked_table: Table, + looked_columns: Vec, + default: Vec, } impl CrossTableLookup { @@ -42,6 +42,7 @@ impl CrossTableLookup { assert!(looking_columns .iter() .all(|cols| cols.len() == looked_columns.len())); + assert!(default.len() == looked_columns.len()); Self { looking_tables, looking_columns,