refactor(evm): executor API, merge evm result types (#7422)

* refactor(evm): executor API, merge evm result types * chore: MSRV * fix: persist cheatcode state * log * fix: setup revert
foundry-rs · Mar 18, 2024 · 04fca21 · 04fca21
1 parent dfefc0f
commit 04fca21
Show file tree

Hide file tree

Showing 10 changed files with 381 additions and 543 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ resolver = "2"
 [workspace.package]
 version = "0.2.0"
 edition = "2021"
-rust-version = "1.75" # Remember to update clippy.toml as well
+rust-version = "1.76" # Remember to update clippy.toml as well
 authors = ["Foundry Contributors"]
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/foundry-rs/foundry"

diff --git a/clippy.toml b/clippy.toml
@@ -1 +1 @@
-msrv = "1.75"
+msrv = "1.76"
diff --git a/crates/cli/src/utils/cmd.rs b/crates/cli/src/utils/cmd.rs
@@ -13,7 +13,7 @@ use foundry_config::{error::ExtractConfigError, figment::Figment, Chain, Config,
 use foundry_debugger::Debugger;
 use foundry_evm::{
     debug::DebugArena,
-    executors::{DeployResult, EvmError, ExecutionErr, RawCallResult},
+    executors::{DeployResult, EvmError, RawCallResult},
     opts::EvmOpts,
     traces::{
         identifier::{EtherscanIdentifier, SignaturesIdentifier},
@@ -339,8 +339,7 @@ impl From<RawCallResult> for TraceResult {
 
 impl From<DeployResult> for TraceResult {
     fn from(result: DeployResult) -> Self {
-        let DeployResult { gas_used, traces, debug, .. } = result;
-
+        let RawCallResult { gas_used, traces, debug, .. } = result.raw;
         Self {
             success: true,
             traces: vec![(TraceKind::Execution, traces.expect("traces is None"))],
@@ -356,7 +355,7 @@ impl TryFrom<EvmError> for TraceResult {
     fn try_from(err: EvmError) -> Result<Self, Self::Error> {
         match err {
             EvmError::Execution(err) => {
-                let ExecutionErr { reverted, gas_used, traces, debug: run_debug, .. } = *err;
+                let RawCallResult { reverted, gas_used, traces, debug: run_debug, .. } = err.raw;
                 Ok(TraceResult {
                     success: !reverted,
                     traces: vec![(TraceKind::Execution, traces.expect("traces is None"))],

diff --git a/crates/common/src/abi.rs b/crates/common/src/abi.rs
@@ -68,41 +68,6 @@ pub fn abi_decode_calldata(
     Ok(res)
 }
 
-/// Helper trait for converting types to Functions. Helpful for allowing the `call`
-/// function on the EVM to be generic over `String`, `&str` and `Function`.
-pub trait IntoFunction {
-    /// Consumes self and produces a function
-    ///
-    /// # Panics
-    ///
-    /// This function does not return a Result, so it is expected that the consumer
-    /// uses it correctly so that it does not panic.
-    fn into(self) -> Function;
-}
-
-impl IntoFunction for Function {
-    fn into(self) -> Function {
-        self
-    }
-}
-
-impl IntoFunction for String {
-    #[track_caller]
-    fn into(self) -> Function {
-        IntoFunction::into(self.as_str())
-    }
-}
-
-impl<'a> IntoFunction for &'a str {
-    #[track_caller]
-    fn into(self) -> Function {
-        match get_func(self) {
-            Ok(func) => func,
-            Err(e) => panic!("could not parse function: {e}"),
-        }
-    }
-}
-
 /// Given a function signature string, it tries to parse it as a `Function`
 pub fn get_func(sig: &str) -> Result<Function> {
     Function::parse(sig).wrap_err("could not parse function signature")

diff --git a/crates/config/src/macros.rs b/crates/config/src/macros.rs
@@ -59,12 +59,10 @@ macro_rules! impl_figment_convert {
     ($name:ty) => {
         impl<'a> From<&'a $name> for $crate::figment::Figment {
             fn from(args: &'a $name) -> Self {
-                if let Some(root) = args.root.clone() {
-                    $crate::Config::figment_with_root(root)
-                } else {
-                    $crate::Config::figment_with_root($crate::find_project_root_path(None).unwrap())
-                }
-                .merge(args)
+                let root = args.root.clone()
+                    .unwrap_or_else(|| $crate::find_project_root_path(None)
+                        .unwrap_or_else(|e| panic!("could not find project root: {e}")));
+                $crate::Config::figment_with_root(root).merge(args)
             }
         }
 
@@ -79,8 +77,8 @@ macro_rules! impl_figment_convert {
         impl<'a> From<&'a $name> for $crate::figment::Figment {
             fn from(args: &'a $name) -> Self {
                 let mut figment: $crate::figment::Figment = From::from(&args.$start);
-                $ (
-                  figment =  figment.merge(&args.$more);
+                $(
+                    figment = figment.merge(&args.$more);
                 )*
                 figment
             }
@@ -97,8 +95,8 @@ macro_rules! impl_figment_convert {
         impl<'a> From<&'a $name> for $crate::figment::Figment {
             fn from(args: &'a $name) -> Self {
                 let mut figment: $crate::figment::Figment = From::from(&args.$start);
-                $ (
-                  figment =  figment.merge(&args.$more);
+                $(
+                    figment = figment.merge(&args.$more);
                 )*
                 figment = figment.merge(args);
                 figment