style

Author: 0xrusowsky

crates/config/src/fork_config.rs

@@ -12,26 +12,10 @@ use std::{collections::HashMap, ops::Deref};
 pub struct ForkConfigs(pub HashMap<String, ForkChainConfig>);
 
 impl ForkConfigs {
-    /// Resolve environment variables in all fork config fields
-    fn resolve_env_vars(&mut self) -> Result<(), ExtractConfigError> {
-        for (name, fork_config) in &mut self.0 {
-            // Take temporary ownership of the config, so that it can be consumed.
-            let config = std::mem::take(fork_config);
-
-            // Resolve the env vars and place it back into the map.
-            *fork_config = config.resolved().map_err(|e| {
-                let msg = if !e.var.is_empty() {
-                    format!("environment variable `{}` not found", e.var)
-                } else {
-                    e.to_string()
-                };
-                ExtractConfigError::new(figment::Error::from(format!(
-                    "Failed to resolve fork config [forks.{name}]: {msg}"
-                )))
-            })?;
-        }
-
-        Ok(())
+    /// Normalize fork config chain keys and resolve environment variables in all configured fields.
+    pub fn normalize_and_resolve(&mut self) -> Result<(), ExtractConfigError> {
+        self.normalize_keys()?;
+        self.resolve_env_vars()
     }
 
     /// Normalize fork config chains, so that all have `alloy_chain::NamedChain` compatible names.
@@ -68,10 +52,25 @@ impl ForkConfigs {
         Ok(())
     }
 
-    /// Normalize fork config chains and resolve environment variables in all configured fields.
-    pub fn normalize_and_resolve(&mut self) -> Result<(), ExtractConfigError> {
-        self.resolve_env_vars()?;
-        self.normalize_keys()?;
+    /// Resolve environment variables in all fork config fields
+    fn resolve_env_vars(&mut self) -> Result<(), ExtractConfigError> {
+        for (name, fork_config) in &mut self.0 {
+            // Take temporary ownership of the config, so that it can be consumed.
+            let config = std::mem::take(fork_config);
+
+            // Resolve the env vars and place it back into the map.
+            *fork_config = config.resolved().map_err(|e| {
+                let msg = if !e.var.is_empty() {
+                    format!("environment variable `{}` not found", e.var)
+                } else {
+                    e.to_string()
+                };
+                ExtractConfigError::new(figment::Error::from(format!(
+                    "Failed to resolve fork config [forks.{name}]: {msg}"
+                )))
+            })?;
+        }
+
         Ok(())
     }
 }

crates/forge/tests/cli/script.rs

@@ -3489,7 +3489,6 @@ forgetest_init!(can_derive_chain_id_access_fork_config, |prj, cmd| {
                         ("addr".into(), "0xdeadbeef00000000000000000000000000000000".into()),
                         ("bytes".into(), "0x00000000000f00".into()),
                         ("str".into(), "bar".into()),
-                        // Array configurations for testing new array cheatcodes
                         ("bool_array".into(), vec![true, false, true].into()),
                         ("int_array".into(), vec!["-100", "200", "-300"].into()),
                         ("uint_array".into(), vec!["100", "200", "300"].into()),
@@ -3524,7 +3523,6 @@ forgetest_init!(can_derive_chain_id_access_fork_config, |prj, cmd| {
                         ("addr".into(), "0x00000000000000000000000000000000deadbeef".into()),
                         ("bytes".into(), "0x00f00000000000".into()),
                         ("str".into(), "bazz".into()),
-                        // Array configurations for testing new array cheatcodes
                         ("bool_array".into(), vec![false, true, false].into()),
                         ("int_array".into(), vec!["-400", "500", "-600"].into()),
                         ("uint_array".into(), vec!["400", "500", "600"].into()),