chore: update svm

Author: mattsse

src/compile/mod.rs

@@ -355,7 +355,7 @@ impl Solc {
         let _lock = take_solc_installer_lock();
 
         // load the local / remote versions
-        let versions = utils::installed_versions(svm::SVM_DATA_DIR.as_path()).unwrap_or_default();
+        let versions = utils::installed_versions(svm::data_dir()).unwrap_or_default();
 
         let local_versions = Self::find_matching_installation(&versions, sol_version);
         let remote_versions = Self::find_matching_installation(&RELEASES.1, sol_version);
@@ -420,7 +420,7 @@ impl Solc {
     /// # }
     /// ```
     #[cfg(feature = "svm-solc")]
-    pub async fn install(version: &Version) -> std::result::Result<Self, svm::SolcVmError> {
+    pub async fn install(version: &Version) -> std::result::Result<Self, svm::SvmError> {
         trace!("installing solc version \"{}\"", version);
         crate::report::solc_installation_start(version);
         match svm::install(version).await {
@@ -437,7 +437,7 @@ impl Solc {
 
     /// Blocking version of `Self::install`
     #[cfg(feature = "svm-solc")]
-    pub fn blocking_install(version: &Version) -> std::result::Result<Self, svm::SolcVmError> {
+    pub fn blocking_install(version: &Version) -> std::result::Result<Self, svm::SvmError> {
         use crate::utils::RuntimeOrHandle;
 
         trace!("blocking installing solc version \"{}\"", version);
@@ -892,14 +892,14 @@ mod tests {
         let _lock = take_solc_installer_lock();
         let ver = "0.8.6";
         let version = Version::from_str(ver).unwrap();
-        if utils::installed_versions(svm::SVM_DATA_DIR.as_path())
+        if utils::installed_versions(svm::data_dir())
             .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_DATA_DIR.join(ver).join(format!("solc-{ver}"));
+        let expected = svm::data_dir().join(ver).join(format!("solc-{ver}"));
         assert_eq!(res.solc, expected);
     }
 

src/error.rs

@@ -58,7 +58,7 @@ pub enum SolcError {
     FailedResolveImport(Box<SolcError>, PathBuf, PathBuf),
     #[cfg(feature = "svm-solc")]
     #[error(transparent)]
-    SvmError(#[from] svm::SolcVmError),
+    SvmError(#[from] svm::SvmError),
     #[error("no contracts found at \"{0}\"")]
     NoContracts(String),
     /// General purpose message.