LumeWeb
/
ethers-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(solc): ensure std json sources are unique (#1210)

This commit is contained in:
Matthias Seitz 2022-05-03 07:51:28 +02:00 committed by GitHub
parent f074f3d614
commit e7e5abcd0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ethers-solc/src/lib.rs
View File

@ -3,7 +3,7 @@ pub mod artifacts;
pub mod sourcemap; pub mod sourcemap;
pub use artifacts::{CompilerInput, CompilerOutput, EvmVersion}; pub use artifacts::{CompilerInput, CompilerOutput, EvmVersion};
use std::collections::BTreeMap; use std::collections::{BTreeMap, HashSet};
mod artifact_output; mod artifact_output;
pub mod cache; pub mod cache;
@ -440,11 +440,17 @@ impl<T: ArtifactOutput> Project<T> {
let target_index = graph.files().get(target).ok_or_else(|| { let target_index = graph.files().get(target).ok_or_else(|| {
SolcError::msg(format!("cannot resolve file at {:?}", target.display())) SolcError::msg(format!("cannot resolve file at {:?}", target.display()))
})?; })?;
let mut sources = Vec::new(); let mut sources = Vec::new();
let mut unique_paths = HashSet::new();
let (path, source) = graph.node(*target_index).unpack(); let (path, source) = graph.node(*target_index).unpack();
unique_paths.insert(path.clone());
sources.push((path, source)); sources.push((path, source));
sources.extend( sources.extend(
graph.all_imported_nodes(*target_index).map(|index| graph.node(index).unpack()), graph
.all_imported_nodes(*target_index)
.map(|index| graph.node(index).unpack())
.filter(|(p, _)| unique_paths.insert(p.to_path_buf())),
); );
let root = self.root(); let root = self.root();