Unify interpreter::call_create and interpreter::trap

rust-ethereum · Dec 6, 2023 · 675195e · 675195e
1 parent d2a21ce
commit 675195e
Show file tree

Hide file tree

Showing 8 changed files with 491 additions and 493 deletions.
diff --git a/interpreter/src/call_create.rs b/interpreter/src/call_create.rs
diff --git a/interpreter/src/etable.rs b/interpreter/src/etable.rs
@@ -1,5 +1,5 @@
 use crate::{
-	call_create::CallCreateTrap, eval::*, ExitResult, GasState, Machine, Opcode, RuntimeBackend,
+	eval::*, trap::CallCreateTrap, ExitResult, GasState, Machine, Opcode, RuntimeBackend,
 	RuntimeEnvironment, RuntimeState, TrapConstruct,
 };
 use core::marker::PhantomData;

diff --git a/interpreter/src/eval/mod.rs b/interpreter/src/eval/mod.rs
@@ -6,7 +6,7 @@ mod misc;
 mod system;
 
 use crate::{
-	call_create::CallCreateTrap, Control, ExitException, ExitSucceed, GasState, Machine, Opcode,
+	trap::CallCreateTrap, Control, ExitException, ExitSucceed, GasState, Machine, Opcode,
 	RuntimeBackend, RuntimeEnvironment, RuntimeState, TrapConstruct,
 };
 use core::ops::{BitAnd, BitOr, BitXor};

diff --git a/interpreter/src/lib.rs b/interpreter/src/lib.rs
@@ -6,7 +6,6 @@
 
 extern crate alloc;
 
-pub mod call_create;
 mod error;
 mod etable;
 pub mod eval;
@@ -15,7 +14,7 @@ mod memory;
 mod opcode;
 mod runtime;
 mod stack;
-mod trap;
+pub mod trap;
 pub mod utils;
 mod valids;