Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
recmo committed Nov 26, 2024
1 parent 951e126 commit 09b3383
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
17 changes: 13 additions & 4 deletions src/bin/benchmark.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use whir::{
},
parameters::*,
poly_utils::coeffs::CoefficientList,
whir::Statement,
whir::{iopattern::WhirIOPattern, Statement},
};

use serde::Serialize;
Expand Down Expand Up @@ -228,6 +228,7 @@ fn run_whir<F, MerkleConfig>(
let mv_params = MultivariateParameters::<F>::new(num_variables);

let whir_params = WhirParameters::<MerkleConfig, PowStrategy> {
initial_statement: true,
security_level,
pow_bits,
folding_factor,
Expand All @@ -253,11 +254,15 @@ fn run_whir<F, MerkleConfig>(
whir_ldt_verifier_hashes,
) = {
// Run LDT
use whir::whir_ldt::{
use whir::whir::{
committer::Committer, iopattern::WhirIOPattern, parameters::WhirConfig, prover::Prover,
verifier::Verifier, whir_proof_size,
};

let whir_params = WhirParameters::<MerkleConfig, PowStrategy> {
initial_statement: false,
..whir_params.clone()
};
let params =
WhirConfig::<F, MerkleConfig, PowStrategy>::new(mv_params, whir_params.clone());
if !params.check_pow_bits() {
Expand All @@ -280,7 +285,9 @@ fn run_whir<F, MerkleConfig>(

let prover = Prover(params.clone());

let proof = prover.prove(&mut merlin, witness).unwrap();
let proof = prover
.prove(&mut merlin, Statement::default(), witness)
.unwrap();

let whir_ldt_prover_time = whir_ldt_prover_time.elapsed();
let whir_ldt_argument_size = whir_proof_size(merlin.transcript(), &proof);
Expand All @@ -293,7 +300,9 @@ fn run_whir<F, MerkleConfig>(
let whir_ldt_verifier_time = Instant::now();
for _ in 0..reps {
let mut arthur = io.to_arthur(merlin.transcript());
verifier.verify(&mut arthur, &proof).unwrap();
verifier
.verify(&mut arthur, &Statement::default(), &proof)
.unwrap();
}

let whir_ldt_verifier_time = whir_ldt_verifier_time.elapsed();
Expand Down
1 change: 1 addition & 0 deletions src/whir/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ mod tests {
let mv_params = MultivariateParameters::<F>::new(num_variables);

let whir_params = WhirParameters::<MerkleConfig, PowStrategy> {
initial_statement: true,
security_level: 32,
pow_bits,
folding_factor,
Expand Down

0 comments on commit 09b3383

Please sign in to comment.