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

chore(source_tree): add .sol extension when missing #1077

Merged
merged 1 commit into from
Mar 24, 2022
Merged
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
22 changes: 11 additions & 11 deletions ethers-etherscan/src/source_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ impl SourceTree {
pub fn write_to(&self, dir: &Path) -> Result<()> {
create_dir_all(&dir)?;
for entry in &self.entries {
let sanitized_path = sanitize_path(&entry.path);
let mut sanitized_path = sanitize_path(&entry.path);
if sanitized_path.extension().is_none() {
sanitized_path.set_extension("sol");
}
let joined = dir.join(sanitized_path);
if let Some(parent) = joined.parent() {
create_dir_all(parent)?;
Expand All @@ -45,25 +48,22 @@ mod tests {
use super::*;
use std::fs::read_dir;

/// Ensure that the source tree is written correctly and .sol extension is added to a path with
/// no extension.
#[test]
fn test_source_tree_write() {
let tempdir = tempfile::tempdir().unwrap();
let st = SourceTree {
entries: vec![
SourceTreeEntry { path: PathBuf::from("a/a.sol"), contents: String::from("Test") },
SourceTreeEntry {
path: PathBuf::from("b/b.sol"),
contents: String::from("Test 2"),
},
SourceTreeEntry { path: PathBuf::from("b/b"), contents: String::from("Test 2") },
],
};
st.write_to(tempdir.path()).unwrap();
let written_paths = read_dir(tempdir.path()).unwrap();
let paths: Vec<PathBuf> =
written_paths.into_iter().filter_map(|x| x.ok()).map(|x| x.path()).collect();
assert_eq!(paths.len(), 2);
assert!(paths.contains(&tempdir.path().join("a")));
assert!(paths.contains(&tempdir.path().join("b")));
let a_sol_path = PathBuf::new().join(&tempdir).join("a").join("a.sol");
let b_sol_path = PathBuf::new().join(&tempdir).join("b").join("b.sol");
assert!(a_sol_path.exists());
assert!(b_sol_path.exists());
}

/// Ensure that the .. are ignored when writing the source tree to disk because of
Expand Down