From 0d8461d66d1fd87428be94ea451c293b3d2a764c Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Wed, 15 Jun 2022 17:01:30 +0200 Subject: [PATCH] PR feedback --- evm/src/all_stark.rs | 6 ++---- evm/src/cross_table_lookup.rs | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index f19d4997..670732cb 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -144,14 +144,12 @@ mod tests { .map(keccak::registers::reg_input_limb) .collect::>(); keccak_keccak_input_output.extend(Column::singles( - (0..2 * NUM_INPUTS) - .map(keccak::registers::reg_output_limb) - .collect(), + (0..2 * NUM_INPUTS).map(keccak::registers::reg_output_limb), )); let cross_table_lookups = vec![CrossTableLookup::new( vec![TableWithColumns::new( Table::Cpu, - Column::singles(cpu_keccak_input_output), + Column::singles(cpu_keccak_input_output).collect(), Some(Column::single(cpu::columns::IS_KECCAK)), )], TableWithColumns::new( diff --git a/evm/src/cross_table_lookup.rs b/evm/src/cross_table_lookup.rs index bc9f93c2..4fa49401 100644 --- a/evm/src/cross_table_lookup.rs +++ b/evm/src/cross_table_lookup.rs @@ -38,8 +38,8 @@ impl Column { } } - pub fn singles(cs: Vec) -> Vec { - cs.into_iter().map(Self::single).collect() + pub fn singles>(cs: I) -> impl Iterator { + cs.into_iter().map(Self::single) } pub fn linear_combination_with_constant>( @@ -67,8 +67,8 @@ impl Column { Self::linear_combination(cs.into_iter().zip(F::TWO.powers())) } - pub fn sum(cs: &[usize]) -> Self { - Self::linear_combination(cs.iter().copied().zip(repeat(F::ONE))) + pub fn sum>(cs: I) -> Self { + Self::linear_combination(cs.into_iter().zip(repeat(F::ONE))) } pub fn eval(&self, v: &[P]) -> P