From 5ea632f2a866745440cd33323ace7f55e8fac020 Mon Sep 17 00:00:00 2001 From: wborgeaud Date: Mon, 22 Nov 2021 17:30:13 +0100 Subject: [PATCH] Fix size optimized test --- src/gates/gate_testing.rs | 3 --- src/gates/low_degree_interpolation.rs | 2 -- src/plonk/circuit_data.rs | 13 +++++++++++++ src/plonk/recursive_verifier.rs | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/gates/gate_testing.rs b/src/gates/gate_testing.rs index 15c17ba7..9fe8e835 100644 --- a/src/gates/gate_testing.rs +++ b/src/gates/gate_testing.rs @@ -51,9 +51,7 @@ pub(crate) fn test_low_degree, G: Gate, const ); let expected_eval_degree = WITNESS_DEGREE * gate.degree(); - dbg!(WITNESS_DEGREE, gate.degree()); - dbg!(&constraint_eval_degrees); assert!( constraint_eval_degrees .iter() @@ -153,7 +151,6 @@ pub(crate) fn test_eval_fns, G: Gate, const D let evals_t = gate.eval_unfiltered_recursively(&mut builder, vars_t); pw.set_extension_targets(&evals_t, &evals); - dbg!(builder.num_gates()); let data = builder.build(); let proof = data.prove(pw)?; verify(proof, &data.verifier_only, &data.common) diff --git a/src/gates/low_degree_interpolation.rs b/src/gates/low_degree_interpolation.rs index 1a869941..c79a2a37 100644 --- a/src/gates/low_degree_interpolation.rs +++ b/src/gates/low_degree_interpolation.rs @@ -490,8 +490,6 @@ mod tests { let coeffs = PolynomialCoeffs::new(FF::rand_vec(1 << subgroup_bits)); let eval_point = FF::rand(); let gate = LowDegreeInterpolationGate::::new(subgroup_bits); - dbg!(gate.end_coeffs()); - dbg!(gate.powers_eval(15)); let vars = EvaluationVars { local_constants: &[], local_wires: &get_wires(&gate, shift, coeffs, eval_point), diff --git a/src/plonk/circuit_data.rs b/src/plonk/circuit_data.rs index d1b03570..41e89ea2 100644 --- a/src/plonk/circuit_data.rs +++ b/src/plonk/circuit_data.rs @@ -76,6 +76,19 @@ impl CircuitConfig { } } + pub fn size_optimized_recursion_config() -> Self { + Self { + security_bits: 93, + cap_height: 3, + fri_config: FriConfig { + reduction_strategy: FriReductionStrategy::ConstantArityBits(3, 5), + num_query_rounds: 26, + ..CircuitConfig::standard_recursion_config().fri_config + }, + ..CircuitConfig::standard_recursion_config() + } + } + pub fn standard_recursion_zk_config() -> Self { CircuitConfig { zero_knowledge: true, diff --git a/src/plonk/recursive_verifier.rs b/src/plonk/recursive_verifier.rs index 2dc0223b..98c866f8 100644 --- a/src/plonk/recursive_verifier.rs +++ b/src/plonk/recursive_verifier.rs @@ -408,7 +408,7 @@ mod tests { type F = GoldilocksField; const D: usize = 2; - let standard_config = CircuitConfig::standard_recursion_config(); + let standard_config = CircuitConfig::size_optimized_recursion_config(); // An initial dummy proof. let (proof, vd, cd) = dummy_proof::(&standard_config, 4_000)?; @@ -456,7 +456,7 @@ mod tests { num_routed_wires: 25, fri_config: FriConfig { proof_of_work_bits: 21, - reduction_strategy: FriReductionStrategy::MinSize(None), + reduction_strategy: FriReductionStrategy::MinSize(Some(3)), num_query_rounds: 9, }, ..high_rate_config