fix(features): remove ethers-solc for foundry-compilers (#3)

* fix(features): remove ethers-solc for foundry-compilers * chore: imports
foundry-rs · Oct 18, 2023 · c9c3470 · c9c3470
1 parent e218510
commit c9c3470
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/contract.rs b/src/contract.rs
@@ -11,6 +11,9 @@ use semver::Version;
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, path::Path};
 
+#[cfg(feature = "foundry-compilers")]
+use foundry_compilers::{artifacts::Settings, EvmVersion, Project, ProjectBuilder, SolcConfig};
+
 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
 pub enum SourceCodeLanguage {
     #[default]
@@ -85,7 +88,7 @@ impl SourceCodeMetadata {
         }
     }
 
-    #[cfg(feature = "ethers-solc")]
+    #[cfg(feature = "foundry-compilers")]
     pub fn settings(&self) -> Result<Option<Settings>> {
         match self {
             Self::Metadata { settings, .. } => match settings {
@@ -103,7 +106,7 @@ impl SourceCodeMetadata {
         }
     }
 
-    #[cfg(not(feature = "ethers-solc"))]
+    #[cfg(not(feature = "foundry-compilers"))]
     pub fn settings(&self) -> Option<&serde_json::Value> {
         match self {
             Self::Metadata { settings, .. } => settings.as_ref(),
@@ -246,7 +249,7 @@ impl Metadata {
     }
 
     /// Returns the contract's compiler settings.
-    #[cfg(feature = "ethers-solc")]
+    #[cfg(feature = "foundry-compilers")]
     pub fn settings(&self) -> Result<Settings> {
         let mut settings = self.source_code.settings()?.unwrap_or_default();
 
@@ -261,15 +264,15 @@ impl Metadata {
     }
 
     /// Creates a Solc [ProjectBuilder] with this contract's settings.
-    #[cfg(feature = "ethers-solc")]
+    #[cfg(feature = "foundry-compilers")]
     pub fn project_builder(&self) -> Result<ProjectBuilder> {
         let solc_config = SolcConfig::builder().settings(self.settings()?).build();
 
         Ok(Project::builder().solc_config(solc_config))
     }
 
     /// Parses the EVM version.
-    #[cfg(feature = "ethers-solc")]
+    #[cfg(feature = "foundry-compilers")]
     pub fn evm_version(&self) -> Result<Option<EvmVersion>> {
         match self.evm_version.as_str() {
             "" | "Default" => {

diff --git a/src/utils.rs b/src/utils.rs
@@ -277,7 +277,7 @@ mod tests {
             de.source_code.sources().get("Contract").unwrap().content,
             src
         );
-        #[cfg(feature = "ethers-solc")]
+        #[cfg(feature = "foundry-compilers")]
         assert!(de.source_code.settings().unwrap().is_none());
 
         // Stringified JSON
@@ -294,7 +294,7 @@ mod tests {
             de.source_code.sources().get("Contract").unwrap().content,
             src
         );
-        #[cfg(feature = "ethers-solc")]
+        #[cfg(feature = "foundry-compilers")]
         assert!(de.source_code.settings().unwrap().is_none());
 
         let json = r#"{"source_code": "source code text"}"#;