fix: conflicts after rebase

starkware-libs · Oct 28, 2024 · bf0b41c · bf0b41c
1 parent 4643dec
commit bf0b41c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/crates/blockifier/src/execution/errors.rs b/crates/blockifier/src/execution/errors.rs
@@ -91,8 +91,6 @@ pub enum EntryPointExecutionError {
     #[error(transparent)]
     NativeUnexpectedError(#[from] NativeError),
     #[error(transparent)]
-    NativeUnexpectedError(#[from] NativeError),
-    #[error(transparent)]
     PostExecutionError(#[from] PostExecutionError),
     #[error(transparent)]
     PreExecutionError(#[from] PreExecutionError),

diff --git a/crates/blockifier/src/execution/native/entry_point_execution.rs b/crates/blockifier/src/execution/native/entry_point_execution.rs
@@ -11,7 +11,6 @@ use crate::execution::entry_point::{
 };
 use crate::execution::errors::{EntryPointExecutionError, PostExecutionError};
 use crate::execution::native::syscall_handler::NativeSyscallHandler;
-use crate::execution::native::utils::decode_felts_as_str;
 use crate::state::state_api::State;
 
 pub fn execute_entry_point_call(