Skip to content

Commit

Permalink
refactor: verfier_params -> into_verfier_params
Browse files Browse the repository at this point in the history
  • Loading branch information
davidnevadoc committed Apr 25, 2024
1 parent 32989af commit 1d67d87
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions halo2_backend/src/poly/kzg/commitment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,10 @@ where
}
}

pub fn verifier_params(&self) -> ParamsVerifierKZG<E> {
pub fn into_verifier_params(self) -> ParamsVerifierKZG<E> {
ParamsVerifierKZG {
k: self.k,
g_lagrange: self.g_lagrange.clone(),
g_lagrange: self.g_lagrange,
s_g2: self.s_g2,
}
}
Expand Down
4 changes: 2 additions & 2 deletions halo2_backend/src/poly/multiopen_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ mod test {
&engine, &params,
);

let verifier_params = params.verifier_params();
let verifier_params = params.into_verifier_params();

verify::<_, VerifierGWC<_>, _, Blake2bRead<_, _, Challenge255<_>>, AccumulatorStrategy<_>>(
&verifier_params,
Expand Down Expand Up @@ -147,7 +147,7 @@ mod test {
Blake2bWrite<_, _, Challenge255<_>>,
>(&engine, &params);

let verifier_params = params.verifier_params();
let verifier_params = params.into_verifier_params();

verify::<
KZGCommitmentScheme<Bn256>,
Expand Down
2 changes: 1 addition & 1 deletion halo2_proofs/examples/serialization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ fn main() {
.expect("prover should not fail");
let proof = transcript.finalize();

let verifier_params = &params.verifier_params();
let verifier_params = &params.into_verifier_params();
let strategy = SingleStrategy::new(verifier_params);
let mut transcript = Blake2bRead::<_, _, Challenge255<_>>::init(&proof[..]);
assert!(verify_proof::<
Expand Down
8 changes: 4 additions & 4 deletions halo2_proofs/tests/frontend_backend_split.rs
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,6 @@ fn test_mycircuit_full_legacy() {
// Setup
let mut rng = BlockRng::new(OneNg {});
let params = ParamsKZG::<Bn256>::setup(k, &mut rng);
let verifier_params = params.verifier_params();
let start = Instant::now();
let vk = keygen_vk_legacy(&params, &circuit).expect("keygen_vk should not fail");
let pk = keygen_pk_legacy(&params, vk.clone(), &circuit).expect("keygen_pk should not fail");
Expand Down Expand Up @@ -548,10 +547,11 @@ fn test_mycircuit_full_legacy() {
let start = Instant::now();
let mut verifier_transcript =
Blake2bRead::<_, G1Affine, Challenge255<_>>::init(proof.as_slice());
let verifier_params = params.into_verifier_params();
let strategy = SingleStrategy::new(&verifier_params);

verify_proof::<KZGCommitmentScheme<Bn256>, VerifierSHPLONK<Bn256>, _, _, _>(
&params.verifier_params(),
&verifier_params,
&vk,
strategy,
&[instances_slice],
Expand Down Expand Up @@ -579,7 +579,6 @@ fn test_mycircuit_full_split() {
// Setup
let mut rng = BlockRng::new(OneNg {});
let params = ParamsKZG::<Bn256>::setup(k, &mut rng);
let verifier_params = params.verifier_params();
let start = Instant::now();
let vk = keygen_vk(&params, &compiled_circuit).expect("keygen_vk should not fail");
let pk = keygen_pk(&params, vk.clone(), &compiled_circuit).expect("keygen_pk should not fail");
Expand Down Expand Up @@ -628,10 +627,11 @@ fn test_mycircuit_full_split() {
println!("Verifying...");
let mut verifier_transcript =
Blake2bRead::<_, G1Affine, Challenge255<_>>::init(proof.as_slice());
let verifier_params = params.into_verifier_params();
let strategy = SingleStrategy::new(&verifier_params);

verify_proof_single::<KZGCommitmentScheme<Bn256>, VerifierSHPLONK<Bn256>, _, _, _>(
&params.verifier_params(),
&verifier_params,
&vk,
strategy,
instances_slice,
Expand Down
4 changes: 2 additions & 2 deletions halo2_proofs/tests/plonk_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ fn plonk_api() {
rng, &params, &pk,
);

let verifier_params = params.verifier_params();
let verifier_params = params.into_verifier_params();

verify_proof::<
_,
Expand Down Expand Up @@ -617,7 +617,7 @@ fn plonk_api() {
rng, &params, &pk,
);

let verifier_params = params.verifier_params();
let verifier_params = params.into_verifier_params();

verify_proof::<
_,
Expand Down

0 comments on commit 1d67d87

Please sign in to comment.