Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

chore(solc): remove async feature requirement #1181

Merged
merged 1 commit into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ethers-solc/src/compile/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ impl Solc {

/// Returns the list of all versions that are available to download and marking those which are
/// already installed.
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn all_versions() -> Vec<SolcVersion> {
let mut all_versions = Self::installed_versions();
let mut uniques = all_versions
Expand Down Expand Up @@ -285,7 +285,7 @@ impl Solc {
/// to build it, and returns it.
///
/// If the required compiler version is not installed, it also proceeds to install it.
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn detect_version(source: &Source) -> Result<Version> {
// detects the required solc version
let sol_version = Self::source_version_req(source)?;
Expand All @@ -296,7 +296,7 @@ impl Solc {
/// used to build it, and returns it.
///
/// If the required compiler version is not installed, it also proceeds to install it.
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn ensure_installed(sol_version: &VersionReq) -> Result<Version> {
#[cfg(any(test, feature = "tests"))]
let _lock = take_solc_installer_lock();
Expand Down Expand Up @@ -371,7 +371,7 @@ impl Solc {
}

/// Blocking version of `Self::install`
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn blocking_install(version: &Version) -> std::result::Result<Self, svm::SolcVmError> {
tracing::trace!("blocking installing solc version \"{}\"", version);
crate::report::solc_installation_start(version);
Expand All @@ -389,7 +389,7 @@ impl Solc {

/// Verify that the checksum for this version of solc is correct. We check against the SHA256
/// checksum from the build information published by binaries.soliditylang
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn verify_checksum(&self) -> Result<()> {
let version = self.version_short()?;
let mut version_path = svm::version_path(version.to_string().as_str());
Expand Down Expand Up @@ -733,7 +733,7 @@ mod tests {

#[test]
// This test might be a bit hard to maintain
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
fn test_detect_version() {
for (pragma, expected) in [
// pinned
Expand Down
4 changes: 2 additions & 2 deletions ethers-solc/src/compile/project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ impl<'a, T: ArtifactOutput> ProjectCompiler<'a, T> {
/// let project = Project::builder().build().unwrap();
/// let output = project.compile().unwrap();
/// ```
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn new(project: &'a Project<T>) -> Result<Self> {
Self::with_sources(project, project.paths.read_input_files()?)
}
Expand All @@ -151,7 +151,7 @@ impl<'a, T: ArtifactOutput> ProjectCompiler<'a, T> {
///
/// Multiple (`Solc` -> `Sources`) pairs can be compiled in parallel if the `Project` allows
/// multiple `jobs`, see [`crate::Project::set_solc_jobs()`].
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn with_sources(project: &'a Project<T>, sources: Sources) -> Result<Self> {
let graph = Graph::resolve_sources(&project.paths, sources)?;
let (versions, edges) = graph.into_sources_by_version(project.offline)?;
Expand Down
12 changes: 6 additions & 6 deletions ethers-solc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ impl<T: ArtifactOutput> Project<T> {
let sources = self.paths.read_input_files()?;
tracing::trace!("found {} sources to compile: {:?}", sources.len(), sources.keys());

#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
if self.auto_detect {
tracing::trace!("using solc auto detection to compile sources");
return self.svm_compile(sources)
Expand Down Expand Up @@ -243,7 +243,7 @@ impl<T: ArtifactOutput> Project<T> {
/// let output = project.svm_compile(sources).unwrap();
/// # }
/// ```
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn svm_compile(&self, sources: Sources) -> Result<ProjectCompileOutput<T>> {
project::ProjectCompiler::with_sources(self, sources)?.compile()
}
Expand All @@ -260,7 +260,7 @@ impl<T: ArtifactOutput> Project<T> {
/// let output = project.compile_file("example/Greeter.sol").unwrap();
/// # }
/// ```
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn compile_file(&self, file: impl Into<PathBuf>) -> Result<ProjectCompileOutput<T>> {
let file = file.into();
let source = Source::read(&file)?;
Expand All @@ -282,7 +282,7 @@ impl<T: ArtifactOutput> Project<T> {
/// ).unwrap();
/// # }
/// ```
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn compile_files<P, I>(&self, files: I) -> Result<ProjectCompileOutput<T>>
where
I: IntoIterator<Item = P>,
Expand Down Expand Up @@ -321,7 +321,7 @@ impl<T: ArtifactOutput> Project<T> {
/// ).unwrap();
/// # }
/// ```
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
pub fn compile_sparse<F: FileFilter + 'static>(
&self,
filter: F,
Expand Down Expand Up @@ -807,7 +807,7 @@ impl<T: ArtifactOutput> ArtifactOutput for Project<T> {
}

#[cfg(test)]
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
mod tests {
use crate::remappings::Remapping;

Expand Down
6 changes: 3 additions & 3 deletions ethers-solc/src/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ impl Graph {
}
}

#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
impl Graph {
/// Consumes the nodes of the graph and returns all input files together with their appropriate
/// version and the edges of the graph
Expand Down Expand Up @@ -689,14 +689,14 @@ impl<'a> Iterator for NodesIter<'a> {
}

/// Container type for solc versions and their compatible sources
#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
#[derive(Debug)]
pub struct VersionedSources {
inner: HashMap<crate::SolcVersion, Sources>,
offline: bool,
}

#[cfg(all(feature = "svm-solc", feature = "async"))]
#[cfg(all(feature = "svm-solc"))]
impl VersionedSources {
/// Resolves or installs the corresponding `Solc` installation.
pub fn get(
Expand Down