diff --git a/src/circuit_data.rs b/src/circuit_data.rs index 4d9a7110..466779da 100644 --- a/src/circuit_data.rs +++ b/src/circuit_data.rs @@ -7,7 +7,7 @@ use crate::gates::gate::GateRef; use crate::generator::WitnessGenerator; use crate::polynomial::commitment::ListPolynomialCommitment; use crate::proof::{Hash, HashTarget, Proof}; -use crate::prover::prove; +use crate::prover::{prove, PLONK_BLINDING}; use crate::verifier::verify; use crate::witness::PartialWitness; @@ -48,6 +48,23 @@ impl CircuitConfig { pub fn num_advice_wires(&self) -> usize { self.num_wires - self.num_routed_wires } + + pub fn large_config() -> Self { + Self { + num_wires: 134, + num_routed_wires: 12, + security_bits: 128, + rate_bits: 3, + num_challenges: 3, + fri_config: FriConfig { + proof_of_work_bits: 1, + rate_bits: 3, + reduction_arity_bits: vec![1], + num_query_rounds: 1, + blinding: PLONK_BLINDING.to_vec(), + }, + } + } } /// Circuit data required by the prover or the verifier. diff --git a/src/gadgets/arithmetic.rs b/src/gadgets/arithmetic.rs index 2ea7c882..9c35d251 100644 --- a/src/gadgets/arithmetic.rs +++ b/src/gadgets/arithmetic.rs @@ -366,20 +366,7 @@ mod tests { type FF = QuarticCrandallField; const D: usize = 4; - let config = CircuitConfig { - num_wires: 134, - num_routed_wires: 12, - security_bits: 128, - rate_bits: 0, - num_challenges: 3, - fri_config: FriConfig { - proof_of_work_bits: 1, - rate_bits: 0, - reduction_arity_bits: vec![1], - num_query_rounds: 1, - blinding: PLONK_BLINDING.to_vec(), - }, - }; + let config = CircuitConfig::large_config(); let mut builder = CircuitBuilder::::new(config); diff --git a/src/gadgets/split_base.rs b/src/gadgets/split_base.rs index 0b1d61e8..94d3c3bc 100644 --- a/src/gadgets/split_base.rs +++ b/src/gadgets/split_base.rs @@ -79,20 +79,7 @@ mod tests { #[test] fn test_split_base() { type F = CrandallField; - let config = CircuitConfig { - num_wires: 134, - num_routed_wires: 12, - security_bits: 128, - rate_bits: 3, - num_challenges: 3, - fri_config: FriConfig { - proof_of_work_bits: 1, - rate_bits: 3, - reduction_arity_bits: vec![1], - num_query_rounds: 1, - blinding: PLONK_BLINDING.to_vec(), - }, - }; + let config = CircuitConfig::large_config(); let mut builder = CircuitBuilder::::new(config); let x = F::from_canonical_usize(0b110100000); // 416 = 1532 in base 6. let xt = builder.constant(x);