reuse code

Author: Pana

crates/execution/vm-interpreter/src/instructions.rs

@@ -434,14 +434,14 @@ impl Instruction {
     pub fn info<const CANCUN: bool>(
         &self, cip645: bool, eip7939: bool,
     ) -> &InstructionInfo {
-        let instrs = if !CANCUN {
-            &*INSTRUCTIONS
-        } else if eip7939 {
+        let instrs = if eip7939 {
             &*INSTRUCTIONS_EIP7939
-        } else if !cip645 {
+        } else if cip645 {
+            &*INSTRUCTIONS_CIP645
+        } else if CANCUN {
             &*INSTRUCTIONS_CANCUN
         } else {
-            &*INSTRUCTIONS_CIP645
+            &*INSTRUCTIONS
         };
 
         instrs[*self as usize].as_ref().expect("A instruction is defined in Instruction enum, but it is not found in InstructionInfo struct; this indicates a logic failure in the code.")

crates/execution/vm-interpreter/src/interpreter/mod.rs

@@ -395,18 +395,6 @@ impl<Cost: CostType, const CANCUN: bool> Interpreter<Cost, CANCUN> {
                     + *gas;
         }
 
-        // if self.do_trace {
-        //     context.trace_executed(
-        //         self.gasometer
-        //             .as_mut()
-        //             .expect(GASOMETER_PROOF)
-        //             .current_gas
-        //             .as_u256(),
-        //         self.stack.peek_top(self.last_stack_ret_len),
-        //         &self.mem,
-        //     );
-        // }
-
         // Advance
         match result {
             InstructionResult::JumpToPosition(position) => {