modify proof and vk structure to support fri proof (step 1) #359
Clippy (beta)
23 errors, 13 warnings
Details
Results
Message level | Amount |
---|---|
Internal compiler error | 0 |
Error | 23 |
Warning | 13 |
Note | 0 |
Help | 0 |
Versions
- rustc 1.73.0-nightly (a6f8aa5a0 2023-08-11)
- cargo 1.73.0-nightly (d78bbf4bd 2023-08-03)
- clippy 0.1.73 (a6f8aa5 2023-08-11)
Annotations
Check warning on line 7 in halo2_proofs/src/poly/commitment.rs
github-actions / Clippy (beta)
unused import: `CurveRead`
warning: unused import: `CurveRead`
--> halo2_proofs/src/poly/commitment.rs:7:22
|
7 | use crate::helpers::{CurveRead, SerdeCurveAffine, SerdePrimeField};
| ^^^^^^^^^
Check warning on line 2 in halo2_proofs/src/plonk/verifier.rs
github-actions / Clippy (beta)
unused import: `group::Curve`
warning: unused import: `group::Curve`
--> halo2_proofs/src/plonk/verifier.rs:2:5
|
2 | use group::Curve;
| ^^^^^^^^^^^^
Check warning on line 1 in halo2_proofs/src/plonk/vanishing/verifier.rs
github-actions / Clippy (beta)
unused import: `std::io::Read`
warning: unused import: `std::io::Read`
--> halo2_proofs/src/plonk/vanishing/verifier.rs:1:5
|
1 | use std::io::Read;
| ^^^^^^^^^^^^^
Check warning on line 1 in halo2_proofs/src/plonk/shuffle/verifier.rs
github-actions / Clippy (beta)
unused import: `std::io::Read`
warning: unused import: `std::io::Read`
--> halo2_proofs/src/plonk/shuffle/verifier.rs:1:5
|
1 | use std::io::Read;
| ^^^^^^^^^^^^^
Check warning on line 4 in halo2_proofs/src/plonk/permutation/prover.rs
github-actions / Clippy (beta)
unused import: `Curve`
warning: unused import: `Curve`
--> halo2_proofs/src/plonk/permutation/prover.rs:4:5
|
4 | Curve,
| ^^^^^
Check warning on line 2 in halo2_proofs/src/plonk/permutation/keygen.rs
github-actions / Clippy (beta)
unused import: `group::Curve`
warning: unused import: `group::Curve`
--> halo2_proofs/src/plonk/permutation/keygen.rs:2:5
|
2 | use group::Curve;
| ^^^^^^^^^^^^
Check warning on line 16 in halo2_proofs/src/plonk/mv_lookup/prover.rs
github-actions / Clippy (beta)
unused import: `Curve`
warning: unused import: `Curve`
--> halo2_proofs/src/plonk/mv_lookup/prover.rs:16:24
|
16 | use group::{ff::Field, Curve};
| ^^^^^
Check warning on line 7 in halo2_proofs/src/plonk/keygen.rs
github-actions / Clippy (beta)
unused import: `group::Curve`
warning: unused import: `group::Curve`
--> halo2_proofs/src/plonk/keygen.rs:7:5
|
7 | use group::Curve;
| ^^^^^^^^^^^^
Check failure on line 417 in halo2_proofs/src/plonk/verifier.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/verifier.rs:417:41
|
416 | ... VerifierQuery::new_commitment(
| ----------------------------- arguments to this function are incorrect
417 | ... &instance_commitments[column.index()],
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&CommitmentItem<_, _>`, found `&<... as CommitmentScheme>::Curve`
|
= note: expected reference `&poly::commitment::CommitmentItem<_, _>`
found reference `&<Scheme as poly::commitment::CommitmentScheme>::Curve`
= help: consider constraining the associated type `<Scheme as poly::commitment::CommitmentScheme>::Curve` to `poly::commitment::CommitmentItem<_, _>`
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
note: associated function defined here
--> halo2_proofs/src/poly/query.rs:76:12
|
76 | pub fn new_commitment(
| ^^^^^^^^^^^^^^
77 | commitment: &'com CommitmentItem<C::Scalar, C>,
| ----------------------------------------------
Check failure on line 62 in halo2_proofs/src/plonk/verifier.rs
github-actions / Clippy (beta)
no method named `to_affine` found for struct `Vec<CommitmentItem<<Scheme as CommitmentScheme>::Scalar, <... as CurveAffine>::CurveExt>>` in the current scope
error[E0599]: no method named `to_affine` found for struct `Vec<CommitmentItem<<Scheme as CommitmentScheme>::Scalar, <... as CurveAffine>::CurveExt>>` in the current scope
--> halo2_proofs/src/plonk/verifier.rs:62:76
|
62 | Ok(params.commit_lagrange(&poly, Blind::default()).to_affine())
| ^^^^^^^^^ method not found in `Vec<CommitmentItem<<Scheme as CommitmentScheme>::Scalar, <... as CurveAffine>::CurveExt>>`
|
= note: the full type name has been written to '/home/runner/work/halo2/halo2/target/debug/deps/halo2_proofs-e0ad73aba3e489fa.long-type-6981292291282557375.txt'
Check failure on line 519 in halo2_proofs/src/plonk/prover.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/prover.rs:519:21
|
518 | <Scheme::Curve as CurveAffine>::CurveExt::batch_normalize(
| --------------------------------------------------------- arguments to this function are incorrect
519 | &advice_commitments_projective,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&[<... as CurveAffine>::CurveExt]`, found `&Vec<Vec<CommitmentItem<..., ...>>>`
|
= note: expected reference `&[<<Scheme as poly::commitment::CommitmentScheme>::Curve as halo2curves::CurveAffine>::CurveExt]`
found reference `&Vec<Vec<CommitmentItem<<Scheme as CommitmentScheme>::Scalar, <... as CurveAffine>::CurveExt>>>`
the full type name has been written to '/home/runner/work/halo2/halo2/target/debug/deps/halo2_proofs-e0ad73aba3e489fa.long-type-5717879058478036254.txt'
note: associated function defined here
--> /home/runner/.cargo/git/checkouts/group-48b3e020e985d9ba/9d51c33/src/lib.rs:106:8
|
106 | fn batch_normalize(p: &[Self], q: &mut [Self::AffineRepr]) {
| ^^^^^^^^^^^^^^^
Check failure on line 118 in halo2_proofs/src/plonk/prover.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/prover.rs:118:21
|
117 | <Scheme::Curve as CurveAffine>::CurveExt::batch_normalize(
| --------------------------------------------------------- arguments to this function are incorrect
118 | &instance_commitments_projective,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&[<... as CurveAffine>::CurveExt]`, found `&Vec<Vec<CommitmentItem<..., ...>>>`
|
= note: expected reference `&[<<Scheme as poly::commitment::CommitmentScheme>::Curve as halo2curves::CurveAffine>::CurveExt]`
found reference `&Vec<Vec<CommitmentItem<<Scheme as CommitmentScheme>::Scalar, <... as CurveAffine>::CurveExt>>>`
the full type name has been written to '/home/runner/work/halo2/halo2/target/debug/deps/halo2_proofs-e0ad73aba3e489fa.long-type-14196022774966160805.txt'
note: associated function defined here
--> /home/runner/.cargo/git/checkouts/group-48b3e020e985d9ba/9d51c33/src/lib.rs:106:8
|
106 | fn batch_normalize(p: &[Self], q: &mut [Self::AffineRepr]) {
| ^^^^^^^^^^^^^^^
Check failure on line 122 in halo2_proofs/src/plonk/vanishing/verifier.rs
github-actions / Clippy (beta)
missing field `_marker` in initializer of `plonk::vanishing::verifier::Evaluated<_, _>`
error[E0063]: missing field `_marker` in initializer of `plonk::vanishing::verifier::Evaluated<_, _>`
--> halo2_proofs/src/plonk/vanishing/verifier.rs:122:9
|
122 | Evaluated {
| ^^^^^^^^^ missing `_marker`
Check failure on line 75 in halo2_proofs/src/plonk/vanishing/verifier.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/vanishing/verifier.rs:75:13
|
62 | impl<C: CurveAffine> Committed<C> {
| - this type parameter
...
75 | h_commitments,
| ^^^^^^^^^^^^^ expected `Vec<CommitmentItem<..., ...>>`, found `Vec<C>`
|
= note: expected struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, C>>`
found struct `std::vec::Vec<C>`
Check failure on line 57 in halo2_proofs/src/plonk/vanishing/verifier.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/vanishing/verifier.rs:57:13
|
47 | impl<C: CurveAffine> Argument<C> {
| - this type parameter
...
57 | random_poly_commitment,
| ^^^^^^^^^^^^^^^^^^^^^^ expected `Vec<CommitmentItem<..., ...>>`, found type parameter `C`
|
= note: expected struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, C>>`
found type parameter `C`
Check failure on line 107 in halo2_proofs/src/plonk/vanishing/prover.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/vanishing/prover.rs:107:35
|
107 | C::Curve::batch_normalize(&h_commitments_projective, &mut h_commitments);
| ------------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&[<C as CurveAffine>::CurveExt]`, found `&Vec<Vec<CommitmentItem<..., ...>>>`
| |
| arguments to this function are incorrect
|
= note: expected reference `&[<C as halo2curves::CurveAffine>::CurveExt]`
found reference `&std::vec::Vec<std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, <C as halo2curves::CurveAffine>::CurveExt>>>`
note: associated function defined here
--> /home/runner/.cargo/git/checkouts/group-48b3e020e985d9ba/9d51c33/src/lib.rs:106:8
|
106 | fn batch_normalize(p: &[Self], q: &mut [Self::AffineRepr]) {
| ^^^^^^^^^^^^^^^
Check failure on line 56 in halo2_proofs/src/plonk/vanishing/prover.rs
github-actions / Clippy (beta)
no method named `to_affine` found for struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, <C as halo2curves::CurveAffine>::CurveExt>>` in the current scope
error[E0599]: no method named `to_affine` found for struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, <C as halo2curves::CurveAffine>::CurveExt>>` in the current scope
--> halo2_proofs/src/plonk/vanishing/prover.rs:56:59
|
56 | let c = params.commit(&random_poly, random_blind).to_affine();
| ^^^^^^^^^ method not found in `Vec<CommitmentItem<<C as CurveAffine>::ScalarExt, <C as CurveAffine>::CurveExt>>`
Check failure on line 37 in halo2_proofs/src/plonk/shuffle/verifier.rs
github-actions / Clippy (beta)
the trait bound `C: group::Curve` is not satisfied
error[E0277]: the trait bound `C: group::Curve` is not satisfied
--> halo2_proofs/src/plonk/shuffle/verifier.rs:37:57
|
37 | product_commitment: vec![product_commitment.into()],
| ^^^^ the trait `group::Curve` is not implemented for `C`
|
note: required for `poly::commitment::CommitmentItem<F, C>` to implement `std::convert::From<C>`
--> halo2_proofs/src/poly/commitment.rs:31:16
|
31 | impl<C: Curve> From<C> for CommitmentItem<C::Scalar, C> {
| ----- ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| |
| unsatisfied trait bound introduced here
= note: required for `C` to implement `std::convert::Into<poly::commitment::CommitmentItem<F, C>>`
help: consider further restricting this bound
|
27 | C: CurveAffine<ScalarExt = F> + group::Curve,
| ++++++++++++++
Check failure on line 121 in halo2_proofs/src/plonk/permutation.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/permutation.rs:121:27
|
93 | impl<C: CurveAffine> VerifyingKey<C> {
| - this type parameter
...
121 | Ok(VerifyingKey { commitments })
| ^^^^^^^^^^^ expected `Vec<CommitmentItem<..., ...>>`, found `Vec<C>`
|
= note: expected struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, C>>`
found struct `std::vec::Vec<C>`
Check failure on line 95 in halo2_proofs/src/plonk/permutation/verifier.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/permutation/verifier.rs:95:17
|
95 | permutation_product_commitment,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Vec<CommitmentItem<_, _>>`, found `CommitmentItem<<... as CurveAffine>::ScalarExt, ...>`
|
= note: expected struct `std::vec::Vec<poly::commitment::CommitmentItem<_, _>>`
found enum `poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, C>`
Check failure on line 56 in halo2_proofs/src/plonk/permutation/verifier.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/permutation/verifier.rs:56:13
|
39 | C: CurveAffine,
| - this type parameter
...
56 | permutation_product_commitments,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Vec<CommitmentItem<..., ...>>`, found `Vec<C>`
|
= note: expected struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, C>>`
found struct `std::vec::Vec<C>`
Check failure on line 176 in halo2_proofs/src/plonk/permutation/prover.rs
github-actions / Clippy (beta)
no method named `to_affine` found for struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, <C as halo2curves::CurveAffine>::CurveExt>>` in the current scope
error[E0599]: no method named `to_affine` found for struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, <C as halo2curves::CurveAffine>::CurveExt>>` in the current scope
--> halo2_proofs/src/plonk/permutation/prover.rs:176:59
|
176 | permutation_product_commitment_projective.to_affine();
| ^^^^^^^^^ method not found in `Vec<CommitmentItem<<C as CurveAffine>::ScalarExt, <C as CurveAffine>::CurveExt>>`
Check failure on line 480 in halo2_proofs/src/plonk/permutation/keygen.rs
github-actions / Clippy (beta)
no method named `to_affine` found for struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, <C as halo2curves::CurveAffine>::CurveExt>>` in the current scope
error[E0599]: no method named `to_affine` found for struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, <C as halo2curves::CurveAffine>::CurveExt>>` in the current scope
--> halo2_proofs/src/plonk/permutation/keygen.rs:480:18
|
478 | / params
479 | | .commit_lagrange(permutation, Blind::default())
480 | | .to_affine(),
| | -^^^^^^^^^ method not found in `Vec<CommitmentItem<<C as CurveAffine>::ScalarExt, <C as CurveAffine>::CurveExt>>`
| |_________________|
|
Check failure on line 57 in halo2_proofs/src/plonk/mv_lookup/verifier.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/mv_lookup/verifier.rs:57:13
|
45 | impl<C: CurveAffine> PreparedCommitments<C> {
| - this type parameter
...
57 | phi_commitment,
| ^^^^^^^^^^^^^^ expected `Vec<CommitmentItem<..., ...>>`, found type parameter `C`
|
= note: expected struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, C>>`
found type parameter `C`
Check failure on line 41 in halo2_proofs/src/plonk/mv_lookup/verifier.rs
github-actions / Clippy (beta)
mismatched types
error[E0308]: mismatched types
--> halo2_proofs/src/plonk/mv_lookup/verifier.rs:41:34
|
32 | C: CurveAffine,
| - this type parameter
...
41 | Ok(PreparedCommitments { m_commitment })
| ^^^^^^^^^^^^ expected `Vec<CommitmentItem<..., ...>>`, found type parameter `C`
|
= note: expected struct `std::vec::Vec<poly::commitment::CommitmentItem<<C as halo2curves::CurveAffine>::ScalarExt, C>>`
found type parameter `C`