From bb07377b5399fdc6f41ee45515716e027e819d36 Mon Sep 17 00:00:00 2001 From: Piotr Roslaniec Date: Thu, 31 Aug 2023 22:16:38 +0200 Subject: [PATCH 1/3] chore(ci): set msrv for wasm tools on ci --- .github/workflows/workspace.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index fe55f073..12e1708a 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -15,6 +15,8 @@ on: env: CARGO_INCREMENTAL: 0 RUSTFLAGS: "-Dwarnings" + WASM_PACK_VERSION: 0.12.0 + WASM_OPT_VERSION: 0.114.1 jobs: check: @@ -94,7 +96,7 @@ jobs: strategy: matrix: rust: - - 1.67 # MSRV, `cargo msrv` + - 1.71 # MSRV for wasm-opt & wasm-pack - stable target: - wasm32-unknown-unknown @@ -106,7 +108,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo install wasm-pack + - run: cargo install wasm-opt@${{ env.WASM_OPT_VERSION }} wasm-pack@${{ env.WASM_PACK_VERSION }} - run: wasm-pack test --node working-directory: ferveo-wasm @@ -126,7 +128,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo install wasm-pack + - run: cargo install wasm-opt@${{ env.WASM_OPT_VERSION }} wasm-pack@${{ env.WASM_PACK_VERSION }} - run: wasm-pack build --target nodejs working-directory: ferveo-wasm - uses: borales/actions-yarn@v3.0.0 From 99632e8af6477a1e8d46d198fb7144a5c015a49f Mon Sep 17 00:00:00 2001 From: Piotr Roslaniec Date: Thu, 31 Aug 2023 22:38:09 +0200 Subject: [PATCH 2/3] chore(clippy): fix linter on stable --- ferveo/src/pvss.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ferveo/src/pvss.rs b/ferveo/src/pvss.rs index 547bb16c..e4bf1c7c 100644 --- a/ferveo/src/pvss.rs +++ b/ferveo/src/pvss.rs @@ -477,7 +477,7 @@ pub fn aggregate_for_decryption( // We're assuming that in every PVSS instance, the shares are in the same order .fold(first_share, |acc, shares| { acc.into_iter() - .zip_eq(shares.into_iter()) + .zip_eq(shares) .map(|(a, b)| (a + b).into()) .collect() }) From a8125138974d193a8eec7edac194867d5b123fa1 Mon Sep 17 00:00:00 2001 From: Piotr Roslaniec Date: Fri, 1 Sep 2023 09:38:14 +0200 Subject: [PATCH 3/3] chore(ci): use binary wasm-pack distribution --- .github/workflows/workspace.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index 12e1708a..c8d43415 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -15,8 +15,6 @@ on: env: CARGO_INCREMENTAL: 0 RUSTFLAGS: "-Dwarnings" - WASM_PACK_VERSION: 0.12.0 - WASM_OPT_VERSION: 0.114.1 jobs: check: @@ -96,7 +94,7 @@ jobs: strategy: matrix: rust: - - 1.71 # MSRV for wasm-opt & wasm-pack + - 1.67 # MSRV - stable target: - wasm32-unknown-unknown @@ -108,7 +106,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo install wasm-opt@${{ env.WASM_OPT_VERSION }} wasm-pack@${{ env.WASM_PACK_VERSION }} + - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - run: wasm-pack test --node working-directory: ferveo-wasm @@ -128,7 +126,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo install wasm-opt@${{ env.WASM_OPT_VERSION }} wasm-pack@${{ env.WASM_PACK_VERSION }} + - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - run: wasm-pack build --target nodejs working-directory: ferveo-wasm - uses: borales/actions-yarn@v3.0.0