perf: remove redundant config usage (#1908)

* fix: remove redundant config usage

* test: adjust fixture to have correct line number

Co-authored-by: Georgios Konstantopoulos <me@gakonst.com>

Author: mattsse

Cargo.lock

@@ -32,6 +32,7 @@ use std::{
     thread,
     time::Duration,
 };
+use tracing::trace;
 use watchexec::config::{InitConfig, RuntimeConfig};
 use yansi::Paint;
 
@@ -100,26 +101,26 @@ pub struct Filter {
 }
 
 impl Filter {
-    pub fn with_merged_config(&self) -> Self {
-        let config = Config::load();
+    pub fn with_merged_config(&self, config: &Config) -> Self {
         let mut filter = self.clone();
         if filter.test_pattern.is_none() {
-            filter.test_pattern = config.test_pattern.map(|p| p.into());
+            filter.test_pattern = config.test_pattern.clone().map(|p| p.into());
         }
         if filter.test_pattern_inverse.is_none() {
-            filter.test_pattern_inverse = config.test_pattern_inverse.map(|p| p.into());
+            filter.test_pattern_inverse = config.test_pattern_inverse.clone().map(|p| p.into());
         }
         if filter.contract_pattern.is_none() {
-            filter.contract_pattern = config.contract_pattern.map(|p| p.into());
+            filter.contract_pattern = config.contract_pattern.clone().map(|p| p.into());
         }
         if filter.contract_pattern_inverse.is_none() {
-            filter.contract_pattern_inverse = config.contract_pattern_inverse.map(|p| p.into());
+            filter.contract_pattern_inverse =
+                config.contract_pattern_inverse.clone().map(|p| p.into());
         }
         if filter.path_pattern.is_none() {
-            filter.path_pattern = config.path_pattern;
+            filter.path_pattern = config.path_pattern.clone();
         }
         if filter.path_pattern_inverse.is_none() {
-            filter.path_pattern_inverse = config.path_pattern_inverse;
+            filter.path_pattern_inverse = config.path_pattern_inverse.clone();
         }
         filter
     }
@@ -281,8 +282,8 @@ impl TestArgs {
     }
 
     /// Returns the flattened [`Filter`] arguments merged with [`Config`]
-    pub fn filter(&self) -> Filter {
-        self.filter.with_merged_config()
+    pub fn filter(&self, config: &Config) -> Filter {
+        self.filter.with_merged_config(config)
     }
 
     /// Returns the currently configured [Config] and the extracted [EvmOpts] from that config
@@ -318,6 +319,7 @@ impl Cmd for TestArgs {
     type Output = TestOutcome;
 
     fn run(self) -> eyre::Result<Self::Output> {
+        trace!(target: "forge::test", "executing test command");
         custom_run(self, true)
     }
 }
@@ -468,7 +470,7 @@ pub fn custom_run(args: TestArgs, include_fuzz_tests: bool) -> eyre::Result<Test
         ..Default::default()
     };
     let fuzzer = proptest::test_runner::TestRunner::new(cfg);
-    let mut filter = args.filter();
+    let mut filter = args.filter(&config);
 
     // Set up the project
     let project = config.project()?;
@@ -589,6 +591,7 @@ fn test(
     include_fuzz_tests: bool,
     gas_reporting: bool,
 ) -> eyre::Result<TestOutcome> {
+    trace!(target: "forge::test", "running all tests");
     if runner.count_filtered_tests(&filter) == 0 {
         let filter_str = filter.to_string();
         if filter_str.is_empty() {

cli/src/cmd/forge/test.rs

@@ -18,7 +18,7 @@ use ethers::{
     },
 };
 use eyre::{eyre, Context};
-use foundry_config::{Chain, Config, SolcReq};
+use foundry_config::{find_project_root_path, Chain, Config, SolcReq};
 use foundry_utils::Retry;
 use futures::FutureExt;
 use once_cell::sync::Lazy;
@@ -198,7 +198,7 @@ impl VerifyArgs {
         };
 
         let project = build_args.project()?;
-        let config = Config::load();
+        let config = Config::load_with_root(find_project_root_path().unwrap());
 
         if self.contract.path.is_none() && !config.cache {
             eyre::bail!(

cli/src/cmd/forge/verify.rs

@@ -132,15 +132,17 @@ pub async fn watch_test(args: TestArgs) -> eyre::Result<()> {
     runtime.command(cmd.clone());
     let wx = Watchexec::new(init, runtime.clone())?;
 
-    let filter = args.filter();
+    let config: Config = args.build_args().into();
+
+    let filter = args.filter(&config);
+
     // marker to check whether to override the command
     let no_reconfigure = filter.pattern.is_some() ||
         filter.test_pattern.is_some() ||
         filter.path_pattern.is_some() ||
         filter.contract_pattern.is_some() ||
         args.watch.run_all;
 
-    let config: Config = args.build_args().into();
     let state = WatchTestState {
         project_root: config.__root.0,
         no_reconfigure,

cli/src/cmd/forge/watch.rs

@@ -138,14 +138,15 @@ If you are in a subdirectory in a Git repository, try adding `--root .`"#,
         }
 
         let now = std::time::Instant::now();
-        tracing::trace!(target : "forge_compile", "start compiling project");
+        tracing::trace!(target : "forge::compile", "start compiling project");
 
         let output = term::with_spinner_reporter(|| f(project))?;
 
         let elapsed = now.elapsed();
-        tracing::trace!(target : "forge_compile", "finished compiling after {:?}", elapsed);
+        tracing::trace!(target : "forge::compile", "finished compiling after {:?}", elapsed);
 
         if output.has_compiler_errors() {
+            tracing::warn!(target: "forge::compile", "compiled with errors");
             eyre::bail!(output.to_string())
         } else if output.is_unchanged() {
             println!("No files changed, compilation skipped");

cli/src/compile.rs

@@ -10,7 +10,7 @@ Error:
    0: 
 
 Location:
-   cli/src/compile.rs:149
+   cli/src/compile.rs:150
 
 Backtrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.
 Run with RUST_BACKTRACE=full to include source snippets.

cli/tests/fixtures/can_set_yul_optimizer.stderr

@@ -25,6 +25,7 @@ regex = "1.5.5"
 globset = "0.4.8"
 walkdir = "2.3.2"
 toml_edit = "0.14.3"
+tracing = "0.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 path-slash = "0.1.4"

config/Cargo.toml

@@ -46,6 +46,7 @@ pub use chain::Chain;
 // reexport so cli types can implement `figment::Provider` to easily merge compiler arguments
 pub use figment;
 use regex::Regex;
+use tracing::trace;
 
 /// Foundry configuration
 ///
@@ -343,6 +344,7 @@ impl Config {
     /// let config = Config::from_provider(figment);
     /// ```
     pub fn from_provider<T: Provider>(provider: T) -> Self {
+        trace!("load config with provider: {:?}", provider.metadata());
         match Self::try_from(provider) {
             Ok(config) => config,
             Err(errors) => {
@@ -1805,6 +1807,7 @@ impl<'a> RemappingsProvider<'a> {
     /// - Environment variables
     /// - CLI parameters
     fn get_remappings(&self, remappings: Vec<Remapping>) -> Result<Vec<Remapping>, Error> {
+        trace!("get all remappings from {:?}", self.root);
         /// prioritizes remappings that are closer: shorter `path`
         ///   - ("a", "1/2") over ("a", "1/2/3")
         fn insert_closest(mappings: &mut HashMap<String, PathBuf>, key: String, path: PathBuf) {
@@ -1848,7 +1851,14 @@ impl<'a> RemappingsProvider<'a> {
             insert_closest(&mut lib_remappings, r.name, r.path.into());
         }
         // use auto detection for all libs
-        for r in self.lib_paths.iter().map(|lib| self.root.join(lib)).flat_map(Remapping::find_many)
+        for r in self
+            .lib_paths
+            .iter()
+            .map(|lib| self.root.join(lib))
+            .inspect(|lib| {
+                trace!("find all remappings in lib path: {:?}", lib);
+            })
+            .flat_map(Remapping::find_many)
         {
             // this is an additional safety check for weird auto-detected remappings
             if ["lib/", "src/", "contracts/"].contains(&r.name.as_str()) {
@@ -1872,8 +1882,14 @@ impl<'a> RemappingsProvider<'a> {
 
     /// Returns all remappings declared in foundry.toml files of libraries
     fn lib_foundry_toml_remappings(&self) -> impl Iterator<Item = Remapping> + '_ {
-        self.lib_paths.iter().map(|p| self.root.join(p)).flat_map(foundry_toml_dirs).flat_map(
-            |lib: PathBuf| {
+        self.lib_paths
+            .iter()
+            .map(|p| self.root.join(p))
+            .flat_map(foundry_toml_dirs)
+            .inspect(|lib| {
+                trace!("find all remappings of nested foundry.toml lib: {:?}", lib);
+            })
+            .flat_map(|lib: PathBuf| {
                 // load config, of the nested lib if it exists
                 let config = Config::load_with_root(&lib).sanitized();
 
@@ -1903,8 +1919,7 @@ impl<'a> RemappingsProvider<'a> {
                     remappings.push(r);
                 }
                 remappings
-            },
-        )
+            })
     }
 }