Merge BlockstreamResearch#272: Fix Mac

612d87a ci: Run unit tests on Mac OS (Christian Lewe)
491a88d chore: Remove outdated tests (Christian Lewe)
5954df7 fix: uint_fast types on mac os (Christian Lewe)
6bdcca9 fix: fuzz CI (Christian Lewe)

Pull request description:

  Fixes BlockstreamResearch#257

  I added a CI job to check unit tests on Windows and Mac OS.

ACKs for top commit:
  apoelstra:
    ACK 612d87a; successfully ran local tests

Tree-SHA512: a2aa0a8ce6e5a32d4e43859fc7657a0878299ec1f24b1c1d6b0a67a7d91e99bccb219c83326832dcb5b745a2ae26afcd65ef946fd551393f3c4dd7f409378603

Author: apoelstra

.github/workflows/fuzz.yml

@@ -43,7 +43,7 @@ parse_human,
           components: "llvm-tools-preview"
 
       - name: Install Dependencies
-        run: cargo update && cargo update -p cc --precise 1.0.83 && cargo install cargo-fuzz
+        run: cargo update && cargo update -p cc --precise 1.0.83 && cargo install --force cargo-fuzz
 
       - name: Run Fuzz Target
         run: ./fuzz/fuzz.sh "${{ matrix.fuzz_target }}"

.github/workflows/main.yml

@@ -101,3 +101,19 @@ jobs:
           components: clippy
       - name: Running cargo clippy
         run: cargo clippy --all-targets -- --deny warnings
+
+  test-other-platforms:
+    name: Test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest]
+    steps:
+      - name: Checkout Crate
+        uses: actions/checkout@v4
+      - name: Checkout Toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Set dependencies
+        run: cp Cargo-recent.lock Cargo.lock
+      - name: Run unit tests
+        run: cargo test --locked --workspace --all-features

fuzz/generate-files.sh

@@ -26,6 +26,9 @@ simplicity-lang = { path = "..", features = ["test-utils"] }
 
 [dev-dependencies]
 base64 = "0.22.1"
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
 EOF
 
 for targetFile in $(listTargetFiles); do
@@ -85,7 +88,7 @@ $(for name in $(listTargetNames); do echo "$name,"; done)
           components: "llvm-tools-preview"
 
       - name: Install Dependencies
-        run: cargo update && cargo update -p cc --precise 1.0.83 && cargo install cargo-fuzz
+        run: cargo update && cargo update -p cc --precise 1.0.83 && cargo install --force cargo-fuzz
 
       - name: Run Fuzz Target
         run: ./fuzz/fuzz.sh "\${{ matrix.fuzz_target }}"

simplicity-sys/src/c_jets/c_env.rs

@@ -231,13 +231,10 @@ mod tests {
     use std::mem::{align_of, size_of};
 
     use crate::c_jets::{c_env::*, frame_ffi::*};
-    use crate::ffi::*;
 
     #[test]
     fn test_sizes() {
         unsafe {
-            assert_eq!(size_of::<u32>(), c_sizeof_ubounded);
-            assert_eq!(size_of::<usize>(), c_sizeof_UWORD);
             assert_eq!(size_of::<CFrameItem>(), c_sizeof_frameItem);
             assert_eq!(size_of::<CRawBuffer>(), c_sizeof_rawBuffer);
             assert_eq!(size_of::<CRawInput>(), c_sizeof_rawInput);
@@ -251,8 +248,6 @@ mod tests {
     #[test]
     fn test_aligns() {
         unsafe {
-            assert_eq!(align_of::<u32>(), c_alignof_ubounded);
-            assert_eq!(align_of::<usize>(), c_alignof_UWORD);
             assert_eq!(align_of::<CFrameItem>(), c_alignof_frameItem);
             assert_eq!(align_of::<CRawBuffer>(), c_alignof_rawBuffer);
             assert_eq!(align_of::<CRawInput>(), c_alignof_rawInput);

simplicity-sys/src/ffi.rs

@@ -19,13 +19,13 @@ pub type c_int = i32;
 pub type c_uint = u32;
 pub type c_size_t = usize;
 pub type c_uint_fast8_t = u8;
-#[cfg(target_arch = "wasm32")]
+#[cfg(any(target_arch = "wasm32", target_arch = "aarch64"))]
 pub type c_uint_fast16_t = u16;
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(any(target_arch = "wasm32", target_arch = "aarch64")))]
 pub type c_uint_fast16_t = usize;
-#[cfg(target_arch = "wasm32")]
+#[cfg(any(target_arch = "wasm32", target_arch = "aarch64"))]
 pub type c_uint_fast32_t = u32;
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(any(target_arch = "wasm32", target_arch = "aarch64")))]
 pub type c_uint_fast32_t = usize;
 #[cfg(target_arch = "wasm32")]
 pub type c_uint_fast64_t = u64;