From 5707732b75906b87a3c5a7bff6b1c82863ed5c4a Mon Sep 17 00:00:00 2001
From: Nicholas Ward <npward@berkeley.edu>
Date: Fri, 17 Jun 2022 16:52:42 -0700
Subject: [PATCH] fix

---
 evm/src/all_stark.rs           |  1 -
 evm/src/memory/memory_stark.rs | 22 +++++++++++-----------
 evm/src/memory/registers.rs    |  9 +++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs
index 59a3ad3d..85064fe7 100644
--- a/evm/src/all_stark.rs
+++ b/evm/src/all_stark.rs
@@ -206,7 +206,6 @@ mod tests {
             cpu_stark.generate(&mut row);
             cpu_trace_rows.push(row);
         }
-
         for i in 0..num_memory_ops {
             let mem_timestamp: usize = memory_trace[memory::registers::TIMESTAMP].values[i]
                 .to_canonical_u64()
diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs
index 3997bc6a..d74c65e8 100644
--- a/evm/src/memory/memory_stark.rs
+++ b/evm/src/memory/memory_stark.rs
@@ -90,7 +90,7 @@ pub fn sort_memory_ops<F: RichField>(
     context: &[F],
     segment: &[F],
     virtuals: &[F],
-    values: &Vec<[F; 8]>,
+    values: &[[F; 8]],
 ) -> (Vec<F>, Vec<F>, Vec<F>, Vec<F>, Vec<F>, Vec<[F; 8]>) {
     let mut ops: Vec<(F, F, F, F, F, [F; 8])> = izip!(
         timestamp.iter().cloned(),
@@ -115,9 +115,9 @@ pub fn sort_memory_ops<F: RichField>(
 }
 
 pub fn generate_first_change_flags<F: RichField>(
-    context: &Vec<F>,
-    segment: &Vec<F>,
-    virtuals: &Vec<F>,
+    context: &[F],
+    segment: &[F],
+    virtuals: &[F],
 ) -> (Vec<F>, Vec<F>, Vec<F>) {
     let num_ops = context.len();
     let mut context_first_change = Vec::new();
@@ -157,13 +157,13 @@ pub fn generate_first_change_flags<F: RichField>(
 }
 
 pub fn generate_range_check_value<F: RichField>(
-    context: &Vec<F>,
-    segment: &Vec<F>,
-    virtuals: &Vec<F>,
-    timestamp: &Vec<F>,
-    context_first_change: &Vec<F>,
-    segment_first_change: &Vec<F>,
-    virtual_first_change: &Vec<F>,
+    context: &[F],
+    segment: &[F],
+    virtuals: &[F],
+    timestamp: &[F],
+    context_first_change: &[F],
+    segment_first_change: &[F],
+    virtual_first_change: &[F],
 ) -> Vec<F> {
     let num_ops = context.len();
     let mut range_check = Vec::new();
diff --git a/evm/src/memory/registers.rs b/evm/src/memory/registers.rs
index 196c62c8..c81408c8 100644
--- a/evm/src/memory/registers.rs
+++ b/evm/src/memory/registers.rs
@@ -8,8 +8,8 @@ pub(crate) const IS_READ: usize = TIMESTAMP + 1;
 pub(crate) const ADDR_CONTEXT: usize = IS_READ + 1;
 pub(crate) const ADDR_SEGMENT: usize = ADDR_CONTEXT + 1;
 pub(crate) const ADDR_VIRTUAL: usize = ADDR_SEGMENT + 1;
-pub(crate) const VALUE_START: usize = ADDR_VIRTUAL + 1;
 
+const VALUE_START: usize = ADDR_VIRTUAL + 1;
 pub(crate) const fn value_limb(i: usize) -> usize {
     debug_assert!(i < NUM_MEMORY_VALUE_LIMBS);
     VALUE_START + i
@@ -20,8 +20,8 @@ pub(crate) const SORTED_IS_READ: usize = SORTED_TIMESTAMP + 1;
 pub(crate) const SORTED_ADDR_CONTEXT: usize = SORTED_IS_READ + 1;
 pub(crate) const SORTED_ADDR_SEGMENT: usize = SORTED_ADDR_CONTEXT + 1;
 pub(crate) const SORTED_ADDR_VIRTUAL: usize = SORTED_ADDR_SEGMENT + 1;
-pub(crate) const SORTED_VALUE_START: usize = SORTED_ADDR_VIRTUAL + 1;
 
+const SORTED_VALUE_START: usize = SORTED_ADDR_VIRTUAL + 1;
 pub(crate) const fn sorted_value_limb(i: usize) -> usize {
     debug_assert!(i < NUM_MEMORY_VALUE_LIMBS);
     SORTED_VALUE_START + i
@@ -36,9 +36,10 @@ pub(crate) const COUNTER: usize = RANGE_CHECK + 1;
 pub(crate) const RANGE_CHECK_PERMUTED: usize = COUNTER + 1;
 pub(crate) const COUNTER_PERMUTED: usize = RANGE_CHECK_PERMUTED + 1;
 
+const IS_MEMOP_START: usize = COUNTER_PERMUTED + 1;
 pub(crate) const fn is_memop(i: usize) -> usize {
     debug_assert!(i < NUM_MEMORY_OPS);
-    COUNTER_PERMUTED + i
+    IS_MEMOP_START + i
 }
 
-pub(crate) const NUM_REGISTERS: usize = COUNTER_PERMUTED + NUM_MEMORY_OPS;
+pub(crate) const NUM_REGISTERS: usize = IS_MEMOP_START + NUM_MEMORY_OPS;