From afc5a4dc4fc435799db946e1904405c17b3950fa Mon Sep 17 00:00:00 2001
From: Nicholas Ward <npward@berkeley.edu>
Date: Thu, 7 Jul 2022 09:52:38 -0700
Subject: [PATCH] fixes

---
 evm/src/all_stark.rs     |  9 ++++++---
 evm/src/cpu/cpu_stark.rs | 10 ++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs
index 48b1be76..c242a1be 100644
--- a/evm/src/all_stark.rs
+++ b/evm/src/all_stark.rs
@@ -133,6 +133,7 @@ mod tests {
     use crate::keccak::keccak_stark::{KeccakStark, NUM_INPUTS, NUM_ROUNDS};
     use crate::logic::{self, LogicStark};
     use crate::memory::memory_stark::{generate_random_memory_ops, MemoryStark};
+    use crate::memory::NUM_CHANNELS;
     use crate::proof::AllProof;
     use crate::prover::prove;
     use crate::recursive_verifier::{
@@ -282,12 +283,14 @@ mod tests {
             cpu_trace_rows.push(row.into());
         }
         for i in 0..num_memory_ops {
-            let mem_timestamp: usize = memory_trace[memory::columns::TIMESTAMP].values[i].to_canonical_u64().try_into().unwrap();
+            let mem_timestamp: usize = memory_trace[memory::columns::TIMESTAMP].values[i]
+                .to_canonical_u64()
+                .try_into()
+                .unwrap();
             let clock = mem_timestamp / NUM_CHANNELS;
             let channel = mem_timestamp % NUM_CHANNELS;
 
-            let row: &mut cpu::columns::CpuColumnsView<F> =
-                cpu_trace_rows[clock].borrow_mut();
+            let row: &mut cpu::columns::CpuColumnsView<F> = cpu_trace_rows[clock].borrow_mut();
 
             row.mem_channel_used[channel] = F::ONE;
             row.clock = F::from_canonical_usize(clock);
diff --git a/evm/src/cpu/cpu_stark.rs b/evm/src/cpu/cpu_stark.rs
index 86b04246..ad32dd98 100644
--- a/evm/src/cpu/cpu_stark.rs
+++ b/evm/src/cpu/cpu_stark.rs
@@ -46,14 +46,7 @@ pub fn ctl_data_memory<F: Field>(channel: usize) -> Vec<Column<F>> {
         COL_MAP.mem_addr_virtual[channel],
     ])
     .collect_vec();
-cols.extend(Column::singles(COL_MAP.mem_value[channel]));
-
-    let scalar = F::from_canonical_usize(NUM_CHANNELS);
-    let addend = F::from_canonical_usize(channel);
-    cols.push(Column::linear_combination_with_constant(
-        vec![(columns::CLOCK, scalar)],
-        addend,
-    ));
+    cols.extend(Column::singles(COL_MAP.mem_value[channel]));
 
     let scalar = F::from_canonical_usize(NUM_CHANNELS);
     let addend = F::from_canonical_usize(channel);
@@ -61,6 +54,7 @@ cols.extend(Column::singles(COL_MAP.mem_value[channel]));
         vec![(COL_MAP.clock, scalar)],
         addend,
     ));
+
     cols
 }