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

chore: support latest svm #2523

Merged
merged 6 commits into from
Jul 24, 2023
Merged

chore: support latest svm #2523

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6156627
fix: use SVM_DATA_DIR instead of SVM_HOME
Evalir Jul 24, 2023
279b308
chore: update test
Evalir Jul 24, 2023
21defc2
chore: use correct folder if exists
Evalir Jul 24, 2023
d8ca375
fix: change svm home folder detection
Evalir Jul 24, 2023
3159b6c
clippy
Evalir Jul 24, 2023
84afda0
actually check if path exists or not
Evalir Jul 24, 2023
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
6 changes: 3 additions & 3 deletions ethers-solc/src/compile/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ impl Solc {
let _lock = take_solc_installer_lock();

// load the local / remote versions
let versions = utils::installed_versions(svm::SVM_HOME.as_path()).unwrap_or_default();
let versions = utils::installed_versions(svm::SVM_DATA_DIR.as_path()).unwrap_or_default();

let local_versions = Self::find_matching_installation(&versions, sol_version);
let remote_versions = Self::find_matching_installation(&RELEASES.1, sol_version);
Expand Down Expand Up @@ -861,14 +861,14 @@ mod tests {
let _lock = LOCK.lock();
let ver = "0.8.6";
let version = Version::from_str(ver).unwrap();
if utils::installed_versions(svm::SVM_HOME.as_path())
if utils::installed_versions(svm::SVM_DATA_DIR.as_path())
.map(|versions| !versions.contains(&version))
.unwrap_or_default()
{
Solc::blocking_install(&version).unwrap();
}
let res = Solc::find_svm_installed_version(version.to_string()).unwrap().unwrap();
let expected = svm::SVM_HOME.join(ver).join(format!("solc-{ver}"));
let expected = svm::SVM_DATA_DIR.join(ver).join(format!("solc-{ver}"));
assert_eq!(res.solc, expected);
}

Expand Down