o1vm: remove legacy flavor

o1-labs · Jan 3, 2025 · c2f1bf4 · c2f1bf4
1 parent eb80434
commit c2f1bf4
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 2,523 deletions.
diff --git a/o1vm/Cargo.toml b/o1vm/Cargo.toml
@@ -12,10 +12,6 @@ license = "Apache-2.0"
 [lib]
 path = "src/lib.rs"
 
-[[bin]]
-name = "legacy_o1vm"
-path = "src/legacy/main.rs"
-
 [[bin]]
 name = "pickles_o1vm"
 path = "src/pickles/main.rs"

diff --git a/o1vm/README.md b/o1vm/README.md
@@ -126,7 +126,6 @@ In either case, `run-code.sh` will:
 
 Different versions/flavors of the o1vm are available.
 
-- [legacy](./src/legacy/mod.rs) - to be deprecated.
 - [pickles](./src/pickles/mod.rs) (currently the default)
 
 You can select the flavor you want to run with `run-code.sh` by using the

diff --git a/o1vm/src/interpreters/keccak/environment.rs b/o1vm/src/interpreters/keccak/environment.rs
@@ -1,25 +1,19 @@
 //! This module contains the definition and implementation of the Keccak environment
 //! including the common functions between the witness and the constraints environments
 //! for arithmetic, boolean, and column operations.
-use crate::{
-    interpreters::keccak::{
-        column::{
-            Absorbs::{self, *},
-            KeccakWitness,
-            Sponges::{self, *},
-            Steps,
-            Steps::*,
-            PAD_SUFFIX_LEN,
-        },
-        constraints::Env as ConstraintsEnv,
-        grid_index,
-        interpreter::KeccakInterpreter,
-        pad_blocks, standardize,
-        witness::Env as WitnessEnv,
-        KeccakColumn, DIM, HASH_BYTELENGTH, QUARTERS, WORDS_IN_HASH,
+use crate::interpreters::keccak::{
+    column::{
+        Absorbs::{self, *},
+        KeccakWitness,
+        Sponges::{self, *},
+        Steps,
+        Steps::*,
+        PAD_SUFFIX_LEN,
     },
-    lookups::Lookup,
-    E,
+    constraints::Env as ConstraintsEnv,
+    grid_index, pad_blocks, standardize,
+    witness::Env as WitnessEnv,
+    KeccakColumn, DIM, HASH_BYTELENGTH, QUARTERS, WORDS_IN_HASH,
 };
 
 use ark_ff::Field;
@@ -437,24 +431,4 @@ impl<F: Field> KeccakEnv<F> {
 
         state_g
     }
-
-    /// Returns the list of constraints used in a specific Keccak step
-    pub(crate) fn constraints_of(step: Steps) -> Vec<E<F>> {
-        let mut env = ConstraintsEnv {
-            constraints: vec![],
-            lookups: vec![],
-        };
-        env.constraints(step);
-        env.constraints
-    }
-
-    /// Returns the list of lookups used in a specific Keccak step
-    pub(crate) fn lookups_of(step: Steps) -> Vec<Lookup<E<F>>> {
-        let mut env = ConstraintsEnv {
-            constraints: vec![],
-            lookups: vec![],
-        };
-        env.lookups(step);
-        env.lookups
-    }
 }