Address code review feedback

crates/edr_napi/src/solidity_tests.rs

@@ -3,11 +3,11 @@ mod config;
 mod runner;
 mod test_results;
 
-use std::{path::Path, sync::Arc};
+use std::{collections::BTreeMap, path::Path, sync::Arc};
 
 use artifact::Artifact;
 use forge::TestFilter;
-use foundry_common::ContractsByArtifact;
+use foundry_common::{ContractData, ContractsByArtifact};
 use napi::{
     threadsafe_function::{
         ErrorStrategy, ThreadSafeCallContext, ThreadsafeFunction, ThreadsafeFunctionCallMode,
@@ -44,11 +44,11 @@ pub fn run_solidity_tests(
             |ctx: ThreadSafeCallContext<SuiteResult>| Ok(vec![ctx.value]),
         )?;
 
-    let artifacts = artifacts
+    let known_contracts: ContractsByArtifact = artifacts
         .into_iter()
         .map(|item| Ok((item.id.try_into()?, item.contract.try_into()?)))
-        .collect::<Result<_, napi::Error>>()?;
-    let known_contracts = ContractsByArtifact::new(artifacts);
+        .collect::<Result<BTreeMap<foundry_common::ArtifactId, ContractData>, napi::Error>>()?
+        .into();
 
     let test_suites = test_suites
         .into_iter()

crates/foundry/common/src/contracts.rs

@@ -65,11 +65,6 @@ type ArtifactWithContractRef<'a> = (&'a ArtifactId, &'a ContractData);
 pub struct ContractsByArtifact(BTreeMap<ArtifactId, ContractData>);
 
 impl ContractsByArtifact {
-    /// Creates a new instance with the given map.
-    pub fn new(values: BTreeMap<ArtifactId, ContractData>) -> Self {
-        Self(values)
-    }
-
     /// Creates a new instance by collecting all artifacts with present bytecode
     /// from an iterator.
     ///
@@ -164,6 +159,12 @@ impl ContractsByArtifact {
     }
 }
 
+impl From<BTreeMap<ArtifactId, ContractData>> for ContractsByArtifact {
+    fn from(value: BTreeMap<ArtifactId, ContractData>) -> Self {
+        Self(value)
+    }
+}
+
 /// Wrapper type that maps an address to a contract identifier and contract ABI.
 pub type ContractsByAddress = BTreeMap<Address, (String, JsonAbi)>;
 

crates/foundry/forge/src/lib.rs

@@ -96,7 +96,7 @@ impl TestOptions {
         })
     }
 
-    /// Create a new test options configuration for Hardhat.
+    /// Creates a new test options configuration for Hardhat.
     /// As opposed to Foundry, Hardhat doesn't support inline configuration.
     pub fn new_hardhat(
         base_fuzz: FuzzConfig,