Skip to content

Commit

Permalink
Merge pull request #18 from scroll-tech/fix/replace-assert-satisfied-…
Browse files Browse the repository at this point in the history
…with-par

fix: replace `assert_satisfied` with `assert_satisfied_par`
  • Loading branch information
lispc authored Aug 1, 2023
2 parents 6eeba77 + ae4b2f8 commit 514f457
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion snark-verifier-sdk/src/aggregation/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ impl AggregationConfig {
pub fn ecc_chip(&self) -> BaseFieldEccChip<G1Affine> {
EccChip::construct(self.base_field_config.clone())
}
}
}
2 changes: 1 addition & 1 deletion snark-verifier-sdk/src/evm_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ where
#[cfg(debug_assertions)]
{
use halo2_base::halo2_proofs::{dev::MockProver, poly::commitment::Params};
MockProver::run(params.k(), &circuit, instances.clone()).unwrap().assert_satisfied();
MockProver::run(params.k(), &circuit, instances.clone()).unwrap().assert_satisfied_par();
}

let instances = instances.iter().map(|instances| instances.as_slice()).collect_vec();
Expand Down
2 changes: 1 addition & 1 deletion snark-verifier-sdk/src/halo2_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ where
use halo2_proofs::poly::commitment::Params;
halo2_proofs::dev::MockProver::run(params.k(), &circuit, instances.clone())
.unwrap()
.assert_satisfied();
.assert_satisfied_par();
}

if let Some((instance_path, proof_path)) = path {
Expand Down
4 changes: 2 additions & 2 deletions snark-verifier-sdk/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ mod snark;
pub mod types;

pub use aggregation::aggregation_circuit::AggregationCircuit;
pub use aggregation::multi_aggregation_circuit::PublicAggregationCircuit;
pub use aggregation::load_verify_circuit_degree;
pub use aggregation::multi_aggregation_circuit::PublicAggregationCircuit;
pub use aggregation::{aggregate, flatten_accumulator};
pub use circuit_ext::CircuitExt;
pub use param::{BITS, LIMBS};
pub use snark::{Snark, SnarkWitness};
pub use snark::gen_dummy_snark;
pub use snark::{Snark, SnarkWitness};

pub use file_io::{
// read instances from disk
Expand Down
2 changes: 1 addition & 1 deletion snark-verifier/examples/evm-verifier-with-accumulator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ fn gen_proof<
circuit: C,
instances: Vec<Vec<Fr>>,
) -> Vec<u8> {
MockProver::run(params.k(), &circuit, instances.clone()).unwrap().assert_satisfied();
MockProver::run(params.k(), &circuit, instances.clone()).unwrap().assert_satisfied_par();

let instances = instances.iter().map(|instances| instances.as_slice()).collect_vec();
let proof = {
Expand Down
2 changes: 1 addition & 1 deletion snark-verifier/examples/evm-verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ fn gen_proof<C: Circuit<Fr>>(
circuit: C,
instances: Vec<Vec<Fr>>,
) -> Vec<u8> {
MockProver::run(params.k(), &circuit, instances.clone()).unwrap().assert_satisfied();
MockProver::run(params.k(), &circuit, instances.clone()).unwrap().assert_satisfied_par();

let instances = instances.iter().map(|instances| instances.as_slice()).collect_vec();
let proof = {
Expand Down
4 changes: 3 additions & 1 deletion snark-verifier/examples/recursion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ mod common {
) -> Vec<u8> {
if params.k() > 3 {
let mock = start_timer!(|| "Mock prover");
MockProver::run(params.k(), &circuit, instances.clone()).unwrap().assert_satisfied();
MockProver::run(params.k(), &circuit, instances.clone())
.unwrap()
.assert_satisfied_par();
end_timer!(mock);
}

Expand Down
2 changes: 1 addition & 1 deletion snark-verifier/src/system/halo2/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ where
instances.iter().map(|instance| instance.to_vec()).collect(),
)
.unwrap()
.assert_satisfied();
.assert_satisfied_par();
}

let proof = {
Expand Down

0 comments on commit 514f457

Please sign in to comment.