Merge pull request #231 from LLFourn/actions-spring-cleaning

[ci] Spring cleaning

Author: nickfarrow

.github/workflows/test.yml

@@ -6,6 +6,11 @@ on:
       - master
   pull_request:
 
+# Cancel in-progress jobs when a new commit is pushed to the same PR or branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 # Make sure CI fails on all warnings, including Clippy lints
 env:
   RUSTFLAGS: "-Dwarnings"
@@ -23,6 +28,7 @@ jobs:
       - run: cargo fmt --all -- --check
 
   clippy_check:
+    name: Clippy
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -33,40 +39,45 @@ jobs:
       - run: cargo clippy --all-targets --all-features --tests
 
   build:
+    name: Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/[email protected]
       - uses: Swatinem/rust-cache@v2
-      - run: cargo tree --all-features # to debug deps issues
       - run: cargo build --release --all-features
 
   # We want to test stable on multiple platforms with --all-features
   test:
+    name: Test on ${{ matrix.target }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         target: ["x86_64-unknown-linux-gnu", "armv7-unknown-linux-gnueabihf"]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          target: ${{ matrix.target }}
-          override: true
-      - uses: Swatinem/[email protected]
+          targets: ${{ matrix.target }}
+      - uses: Swatinem/rust-cache@v2
 
-      - name: test-on-target
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ matrix.target != 'x86_64-unknown-linux-gnu' }}
-          command: test
-          args: --all-features --release --target ${{ matrix.target }}
+      # Use cross for non-x86_64 targets
+      - name: Install cross
+        if: matrix.target != 'x86_64-unknown-linux-gnu'
+        uses: taiki-e/install-action@cross
+
+      - name: Test
+        run: |
+          if [ "${{ matrix.target }}" = "x86_64-unknown-linux-gnu" ]; then
+            cargo test --all-features --release --target ${{ matrix.target }}
+          else
+            cross test --all-features --release --target ${{ matrix.target }}
+          fi
 
   # test nightly build/test
   test-nightly:
+    name: Test Nightly
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -76,30 +87,33 @@ jobs:
 
   # test without default features
   test-minimal:
+    name: Test Minimal (${{ matrix.package }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        package: ["secp256kfun", "sigma_fun", "ecdsa_fun", "schnorr_fun"]
+        package:
+          ["secp256kfun", "sigma_fun", "ecdsa_fun", "schnorr_fun", "vrf_fun"]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2.0.0
+      - uses: Swatinem/rust-cache@v2
       - run: cargo test --release --no-default-features -p ${{ matrix.package }}
 
   # test with alloc feature only
   test-alloc:
+    name: Test Alloc (${{ matrix.package }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
         package: ["secp256kfun", "sigma_fun", "ecdsa_fun", "schnorr_fun"]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2.0.0
+      - uses: Swatinem/rust-cache@v2
       - run: cargo test --release --no-default-features --features alloc -p ${{ matrix.package }}
 
   doc-build:
-    name: doc-build
+    name: Documentation
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -11,4 +11,13 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-bincode = { version = "2",  default-features = false, features = ["derive"] }
+# External dependencies
+bincode = { version = "2", default-features = false, features = ["derive"] }
+rand_chacha = { version = "0.3", default-features = false }
+
+# Local crates
+secp256kfun = { path = "./secp256kfun", version = "0.11", default-features = false }
+schnorr_fun = { path = "./schnorr_fun", version = "0.11", default-features = false }
+ecdsa_fun = { path = "./ecdsa_fun", version = "0.11", default-features = false }
+sigma_fun = { path = "./sigma_fun", version = "0.8", default-features = false }
+vrf_fun = { path = "./vrf_fun", version = "0.11", default-features = false }

ecdsa_fun/Cargo.toml

@@ -14,9 +14,9 @@ categories = ["cryptography", "cryptography::cryptocurrencies"]
 keywords = ["bitcoin", "ecdsa", "secp256k1"]
 
 [dependencies]
-secp256kfun = { path = "../secp256kfun", version = "0.11", default-features = false }
-sigma_fun = { path = "../sigma_fun", version = "0.8", features = ["secp256k1"], default-features = false, optional = true }
-rand_chacha = {  version = "0.3", optional = true }  # needed for adaptor signatures atm but would be nice to get rid of
+secp256kfun = { workspace = true }
+sigma_fun = { workspace = true, features = ["secp256k1"], optional = true }
+rand_chacha = { workspace = true, optional = true }  # needed for adaptor signatures atm but would be nice to get rid of
 bincode  = { workspace = true, optional = true }
 
 [dev-dependencies]

schnorr_fun/Cargo.toml

@@ -14,19 +14,19 @@ categories = ["cryptography", "cryptography::cryptocurrencies"]
 keywords = ["bitcoin", "schnorr"]
 
 [dependencies]
-secp256kfun = { path = "../secp256kfun", version = "0.11",  default-features = false }
+secp256kfun = { workspace = true }
 bech32 = { version = "0.11", optional = true, default-features = false, features = ["alloc"] }
 bincode = { workspace =  true, optional = true }
-vrf_fun = { path = "../vrf_fun", version = "0.11", optional = true, default-features = false }
+vrf_fun = { workspace = true, optional = true }
 sha2 = { version = "0.10", optional = true, default-features = false }
 
 [dev-dependencies]
-secp256kfun = { path = "../secp256kfun", version = "0.11",  features = ["proptest", "bincode", "alloc"] }
+secp256kfun = { workspace = true, features = ["proptest", "bincode", "alloc"] }
 rand = { version = "0.8" }
 lazy_static = "1.4"
 sha2 = "0.10"
 serde_json = "1"
-rand_chacha = { version = "0.3" }
+rand_chacha = { workspace = true }
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 criterion = "0.4"
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]

sigma_fun/Cargo.toml

@@ -16,18 +16,18 @@ readme = "README.md"
 [dependencies]
 generic-array = "0.14"
 digest = "0.10"
-secp256kfun = { path = "../secp256kfun", version = "0.11", default-features = false, optional = true }
+secp256kfun = { workspace = true, optional = true }
 curve25519-dalek = { package = "curve25519-dalek-ng", version = "4", default-features = false, optional = true, features = ["u64_backend"] }
 serde = { package = "serde", version = "1.0", optional = true, default-features = false, features = ["derive"] }
 bincode = { workspace = true, optional = true }
 rand_core = "0.6"
 
 [dev-dependencies]
-secp256kfun = { path = "../secp256kfun", version = "0.11", default-features = false, features = ["proptest"] }
+secp256kfun = { workspace = true, features = ["proptest"] }
 rand = "0.8"
 sha2 = "0.10"
 proptest = "1"
-rand_chacha = "0.3"
+rand_chacha = { workspace = true }
 
 [features]
 default = ["alloc", "secp256k1"]

vrf_fun/Cargo.toml

@@ -11,9 +11,9 @@ serde = ["dep:serde", "secp256kfun/serde", "sigma_fun/serde", "generic-array/ser
 bincode = ["secp256kfun/bincode", "sigma_fun/bincode", "dep:bincode"]
 
 [dependencies]
-secp256kfun = { path = "../secp256kfun", default-features = false }
-sigma_fun = { path = "../sigma_fun", default-features = false, features = ["secp256k1"] }
-rand_chacha = { version = "0.3", default-features = false }
+secp256kfun = { workspace = true }
+sigma_fun = { workspace = true, features = ["secp256k1"] }
+rand_chacha = { workspace = true }
 serde = { version = "1.0", optional = true, default-features = false, features = ["derive"] }
 generic-array = { version = "0.14", default-features = false }
 bincode = { workspace = true, optional = true }

vrf_fun/tests/codec.rs

@@ -1,3 +1,5 @@
+#![cfg(feature = "bincode")]
+
 use secp256kfun::{KeyPair, prelude::*};
 use vrf_fun::VrfProof;