Browse Source

Update build

- Use default github rust version
- Stop using clippy action, it has been unmaintained since 2020
- No longer enforce nightly fmt rules in CI (they can still be enforced
  in commit hooks or nix
- No longer use cargo test unstable options
- Run `cargo clippy --fix` to fix new errors
main
ancient123 1 year ago
parent
commit
b13a607b51
4 changed files with 13 additions and 38 deletions
  1. +6
    -28
      .github/workflows/build.yml
  2. +2
    -3
      hyperplonk/src/snark.rs
  3. +1
    -1
      scripts/run_tests.sh
  4. +4
    -6
      subroutines/src/pcs/univariate_kzg/mod.rs

+ 6
- 28
.github/workflows/build.yml

@ -24,39 +24,17 @@ jobs:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: stable
override: true
default: true
components: rustfmt, clippy
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: false
default: false
components: rustfmt
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
name: Enable Rust Caching name: Enable Rust Caching
- name: Format Check - name: Format Check
run: cargo +nightly fmt -- --check
run: cargo fmt -- --check
- name: Clippy
uses: actions-rs/clippy-check@v1
with:
token: ${{ github.token }}
- name: Clippy Check
run: cargo clippy --workspace -- -D warnings
- name: Audit
uses: actions-rs/audit-check@v1
with:
token: ${{ github.token }}
- name: Audit Check
run: cargo audit
- name: Check Bench - name: Check Bench
run: cargo bench --no-run run: cargo bench --no-run
@ -65,7 +43,7 @@ jobs:
run: cargo test --no-run -- --ignored run: cargo test --no-run -- --ignored
- name: Test - name: Test
run: bash ./scripts/run_tests.sh
run: bash ./scripts/run_tests.sh
- name: Generate Documentation - name: Generate Documentation
run: | run: |

+ 2
- 3
hyperplonk/src/snark.rs

@ -453,7 +453,7 @@ where
&mut transcript, &mut transcript,
)?; )?;
let zero_check_point = zero_check_sub_claim.point.clone();
let zero_check_point = zero_check_sub_claim.point;
// check zero check subclaim // check zero check subclaim
let f_eval = eval_f(&vk.params.gate_func, selector_evals, witness_gate_evals)?; let f_eval = eval_f(&vk.params.gate_func, selector_evals, witness_gate_evals)?;
@ -485,8 +485,7 @@ where
let perm_check_point = perm_check_sub_claim let perm_check_point = perm_check_sub_claim
.product_check_sub_claim .product_check_sub_claim
.zero_check_sub_claim .zero_check_sub_claim
.point
.clone();
.point;
let alpha = perm_check_sub_claim.product_check_sub_claim.alpha; let alpha = perm_check_sub_claim.product_check_sub_claim.alpha;
let (beta, gamma) = perm_check_sub_claim.challenges; let (beta, gamma) = perm_check_sub_claim.challenges;

+ 1
- 1
scripts/run_tests.sh

@ -6,6 +6,6 @@ set -e
# We want the code to panic if there is an integer overflow # We want the code to panic if there is an integer overflow
export RUSTFLAGS="-C overflow-checks=on" export RUSTFLAGS="-C overflow-checks=on"
cargo test --release --all -- -Zunstable-options --report-time
cargo test --release --all
cargo test --no-run --features=print-trace cargo test --no-run --features=print-trace
cargo bench --no-run cargo bench --no-run

+ 4
- 6
subroutines/src/pcs/univariate_kzg/mod.rs

@ -106,11 +106,9 @@ impl PolynomialCommitmentScheme for UnivariateKzgPCS {
let (num_leading_zeros, plain_coeffs) = skip_leading_zeros(poly); let (num_leading_zeros, plain_coeffs) = skip_leading_zeros(poly);
let msm_time = start_timer!(|| "MSM to compute commitment to plaintext poly"); let msm_time = start_timer!(|| "MSM to compute commitment to plaintext poly");
let commitment = E::G1::msm_unchecked(
&prover_param.powers_of_g[num_leading_zeros..],
&plain_coeffs,
)
.into_affine();
let commitment =
E::G1::msm_unchecked(&prover_param.powers_of_g[num_leading_zeros..], plain_coeffs)
.into_affine();
end_timer!(msm_time); end_timer!(msm_time);
end_timer!(commit_time); end_timer!(commit_time);
@ -136,7 +134,7 @@ impl PolynomialCommitmentScheme for UnivariateKzgPCS {
let proof = E::G1::msm_unchecked( let proof = E::G1::msm_unchecked(
&prover_param.borrow().powers_of_g[num_leading_zeros..], &prover_param.borrow().powers_of_g[num_leading_zeros..],
&witness_coeffs,
witness_coeffs,
) )
.into_affine(); .into_affine();

Loading…
Cancel
Save