fix: clippy warnings and PCS API update

privacy-scaling-explorations · May 27, 2024 · def6285 · def6285
1 parent be40a51
commit def6285
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/halo2_backend/src/arithmetic.rs b/halo2_backend/src/arithmetic.rs
@@ -14,6 +14,7 @@ pub use halo2curves::{CurveAffine, CurveExt};
 /// This represents an element of a group with basic operations that can be
 /// performed. This allows an FFT implementation (for example) to operate
 /// generically over either a field or elliptic curve group.
+#[allow(dead_code)]
 pub(crate) trait FftGroup<Scalar: Field>:
     Copy + Send + Sync + 'static + GroupOpsOwned + ScalarMulOwned<Scalar>
 {

diff --git a/halo2_backend/src/poly/ipa/multiopen.rs b/halo2_backend/src/poly/ipa/multiopen.rs
@@ -131,7 +131,7 @@ where
         let mut point_index_set = BTreeSet::new();
         for (commitment, point_idx_set) in commitment_set_map.iter() {
             if query.get_commitment() == *commitment {
-                point_index_set = point_idx_set.clone();
+                point_index_set.clone_from(point_idx_set);
             }
         }
         assert!(!point_index_set.is_empty());

diff --git a/halo2_backend/src/poly/query.rs b/halo2_backend/src/poly/query.rs
@@ -132,7 +132,7 @@ pub enum CommitmentReference<'r, C: CurveAffine, M: MSM<C>> {
 impl<'r, C: CurveAffine, M: MSM<C>> Copy for CommitmentReference<'r, C, M> {}
 
 impl<'r, C: CurveAffine, M: MSM<C>> PartialEq for CommitmentReference<'r, C, M> {
-    #![allow(clippy::vtable_address_comparisons)]
+    #![allow(ambiguous_wide_pointer_comparisons)]
     fn eq(&self, other: &Self) -> bool {
         match (self, other) {
             (&CommitmentReference::Commitment(a), &CommitmentReference::Commitment(b)) => {

diff --git a/p3_frontend/tests/common/mod.rs b/p3_frontend/tests/common/mod.rs
@@ -1,4 +1,3 @@
-use halo2_backend::poly::commitment::ParamsProver;
 use halo2_backend::poly::kzg::commitment::{KZGCommitmentScheme, ParamsKZG};
 use halo2_backend::poly::kzg::multiopen::{ProverSHPLONK, VerifierSHPLONK};
 use halo2_backend::poly::kzg::strategy::SingleStrategy;
@@ -110,10 +109,10 @@ pub(crate) fn setup_prove_verify(
     println!("Verifying...");
     let mut verifier_transcript =
         Blake2bRead::<_, G1Affine, Challenge255<_>>::init(proof.as_slice());
-    let strategy = SingleStrategy::new(verifier_params);
+    let strategy = SingleStrategy::new(&verifier_params);
 
-    verify_proof_single::<KZGCommitmentScheme<Bn256>, VerifierSHPLONK<'_, Bn256>, _, _, _>(
-        &params,
+    verify_proof_single::<KZGCommitmentScheme<Bn256>, VerifierSHPLONK<Bn256>, _, _, _>(
+        &verifier_params,
         &vk,
         strategy,
         &vec_slices,