From 30cc318cde2111b13299d026b148360140b71005 Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Thu, 25 Aug 2022 14:45:56 -0700 Subject: [PATCH] Feedback --- evm/src/all_stark.rs | 4 ++-- evm/src/keccak_memory/keccak_memory_stark.rs | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index 24499a0b..e5953a34 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -147,14 +147,14 @@ fn ctl_memory() -> CrossTableLookup { let keccak_memory_reads = (0..KECCAK_WIDTH_BYTES).map(|i| { TableWithColumns::new( Table::KeccakMemory, - keccak_memory_stark::ctl_looking_memory_read(i), + keccak_memory_stark::ctl_looking_memory(i, true), Some(keccak_memory_stark::ctl_filter()), ) }); let keccak_memory_writes = (0..KECCAK_WIDTH_BYTES).map(|i| { TableWithColumns::new( Table::KeccakMemory, - keccak_memory_stark::ctl_looking_memory_write(i), + keccak_memory_stark::ctl_looking_memory(i, false), Some(keccak_memory_stark::ctl_filter()), ) }); diff --git a/evm/src/keccak_memory/keccak_memory_stark.rs b/evm/src/keccak_memory/keccak_memory_stark.rs index d12850e1..5b0f0fd1 100644 --- a/evm/src/keccak_memory/keccak_memory_stark.rs +++ b/evm/src/keccak_memory/keccak_memory_stark.rs @@ -40,15 +40,7 @@ pub(crate) fn ctl_looking_keccak() -> Vec> { input_cols.chain(output_cols).collect() } -pub(crate) fn ctl_looking_memory_read(i: usize) -> Vec> { - ctl_looking_memory(i, true) -} - -pub(crate) fn ctl_looking_memory_write(i: usize) -> Vec> { - ctl_looking_memory(i, false) -} - -fn ctl_looking_memory(i: usize, is_read: bool) -> Vec> { +pub(crate) fn ctl_looking_memory(i: usize, is_read: bool) -> Vec> { let mut res = vec![Column::constant(F::from_bool(is_read))]; res.extend(Column::singles([COL_CONTEXT, COL_SEGMENT, COL_VIRTUAL]));