chore(EOF): Use Bytecode::new_legacy (#1628)

bluealloy · Jul 16, 2024 · 6354446 · 6354446
1 parent 887c5d9
commit 6354446
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/crates/primitives/src/bytecode.rs b/crates/primitives/src/bytecode.rs
@@ -68,6 +68,12 @@ impl Bytecode {
         matches!(self, Self::Eof(_))
     }
 
+    /// Creates a new legacy [`Bytecode`].
+    #[inline]
+    pub fn new_legacy(raw: Bytes) -> Self {
+        Self::LegacyRaw(raw)
+    }
+
     /// Creates a new raw [`Bytecode`].
     ///
     /// # Panics

diff --git a/crates/revm/src/context/evm_context.rs b/crates/revm/src/context/evm_context.rs
@@ -270,8 +270,6 @@ impl<DB: Database> EvmContext<DB> {
             return return_error(InstructionResult::CallTooDeep);
         }
 
-        //self.precompiles
-
         // Prague EOF
         if spec_id.is_enabled_in(PRAGUE_EOF) && inputs.init_code.get(..2) == Some(&EOF_MAGIC_BYTES)
         {
@@ -325,7 +323,7 @@ impl<DB: Database> EvmContext<DB> {
             }
         };
 
-        let bytecode = Bytecode::new_raw(inputs.init_code.clone());
+        let bytecode = Bytecode::new_legacy(inputs.init_code.clone());
 
         let contract = Contract::new(
             Bytes::new(),

diff --git a/crates/revm/src/context/inner_evm_context.rs b/crates/revm/src/context/inner_evm_context.rs
@@ -368,9 +368,9 @@ impl<DB: Database> InnerEvmContext<DB> {
 
         // Do analysis of bytecode straight away.
         let bytecode = match self.env.cfg.perf_analyse_created_bytecodes {
-            AnalysisKind::Raw => Bytecode::new_raw(interpreter_result.output.clone()),
+            AnalysisKind::Raw => Bytecode::new_legacy(interpreter_result.output.clone()),
             AnalysisKind::Analyse => {
-                to_analysed(Bytecode::new_raw(interpreter_result.output.clone()))
+                to_analysed(Bytecode::new_legacy(interpreter_result.output.clone()))
             }
         };