fix: filter for universal macos (#121)

add missing checks for macos aarch64
alloy-rs · Mar 20, 2024 · 653ad68 · 653ad68
1 parent 5fdc922
commit 653ad68
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/crates/svm-rs/src/install.rs b/crates/svm-rs/src/install.rs
@@ -275,6 +275,19 @@ mod tests {
             .contains("0.8.10"));
     }
 
+    #[cfg(feature = "blocking")]
+    #[serial_test::serial]
+    #[test]
+    fn blocking_test_latest() {
+        blocking_install(&LATEST).unwrap();
+        let solc_path = version_binary(LATEST.to_string().as_str());
+        let output = Command::new(solc_path).arg("--version").output().unwrap();
+
+        assert!(String::from_utf8_lossy(&output.stdout)
+            .as_ref()
+            .contains(&LATEST.to_string()));
+    }
+
     #[cfg(feature = "blocking")]
     #[serial_test::serial]
     #[test]

diff --git a/crates/svm-rs/src/releases.rs b/crates/svm-rs/src/releases.rs
@@ -151,9 +151,12 @@ pub fn blocking_all_releases(platform: Platform) -> Result<Releases, SvmError> {
                 Platform::MacOsAmd64,
             ))?
             .json::<Releases>()?;
+            releases.builds.retain(|b| {
+                b.version < MACOS_AARCH64_NATIVE || b.version > UNIVERSAL_MACOS_BINARIES
+            });
             releases
-                .builds
-                .retain(|b| b.version.lt(&MACOS_AARCH64_NATIVE));
+                .releases
+                .retain(|v, _| *v < MACOS_AARCH64_NATIVE || *v > UNIVERSAL_MACOS_BINARIES);
             releases.builds.extend_from_slice(&native.builds);
 
             releases.releases.append(&mut native.releases);