Fix tests

This commit is contained in:
wborgeaud 2021-08-06 15:14:38 +02:00
parent 7d11d0f8a1
commit db236e4824
13 changed files with 27 additions and 18 deletions

View File

@ -34,6 +34,7 @@ fn bench_prove<F: Field + Extendable<D>, const D: usize>() -> Result<()> {
},
};
let inputs = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, D>::new(config);
let zero = builder.zero();
@ -49,7 +50,6 @@ fn bench_prove<F: Field + Extendable<D>, const D: usize>() -> Result<()> {
builder.add_extension(zero_ext, zero_ext);
let circuit = builder.build();
let inputs = PartialWitness::new(0, 0, 0);
let proof_with_pis = circuit.prove(inputs)?;
let proof_bytes = serde_cbor::to_vec(&proof_with_pis).unwrap();
info!("Proof length: {} bytes", proof_bytes.len());

View File

@ -603,8 +603,8 @@ mod tests {
let config = CircuitConfig::large_config();
let mut pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, D>::new(config);
let mut pw = PartialWitness::new(0, 0, 0);
let vs = FF::rand_vec(3);
let ts = builder.add_virtual_extension_targets(3);
@ -640,6 +640,7 @@ mod tests {
let config = CircuitConfig::large_config();
let pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, D>::new(config);
let x = FF::rand();
@ -654,7 +655,7 @@ mod tests {
builder.assert_equal_extension(zt, comp_zt_unsafe);
let data = builder.build();
let proof = data.prove(PartialWitness::new(0, 0, 0))?;
let proof = data.prove(pw)?;
verify(proof, &data.verifier_only, &data.common)
}

View File

@ -64,6 +64,7 @@ mod tests {
type FF = QuarticCrandallField;
let len = 1 << len_log;
let config = CircuitConfig::large_config();
let pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, 4>::new(config);
let v = (0..len - 1)
.map(|_| builder.constant_extension(FF::rand()))
@ -83,7 +84,7 @@ mod tests {
}
let data = builder.build();
let proof = data.prove(PartialWitness::new(0, 0, 0))?;
let proof = data.prove(pw)?;
verify(proof, &data.verifier_only, &data.common)
}

View File

@ -70,6 +70,7 @@ mod tests {
type F = CrandallField;
type FF = QuarticCrandallField;
let config = CircuitConfig::large_config();
let pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, 4>::new(config);
let len = 4;
@ -99,7 +100,7 @@ mod tests {
builder.assert_equal_extension(eval, true_eval_target);
let data = builder.build();
let proof = data.prove(PartialWitness::new(0, 0, 0))?;
let proof = data.prove(pw)?;
verify(proof, &data.verifier_only, &data.common)
}
@ -109,6 +110,7 @@ mod tests {
type F = CrandallField;
type FF = QuarticCrandallField;
let config = CircuitConfig::large_config();
let pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, 4>::new(config);
let len = 2;
@ -133,7 +135,7 @@ mod tests {
builder.assert_equal_extension(eval, true_eval_target);
let data = builder.build();
let proof = data.prove(PartialWitness::new(0, 0, 0))?;
let proof = data.prove(pw)?;
verify(proof, &data.verifier_only, &data.common)
}

View File

@ -50,6 +50,7 @@ mod tests {
type FF = QuarticCrandallField;
let len = 1 << len_log;
let config = CircuitConfig::large_config();
let pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, 4>::new(config);
let vec = FF::rand_vec(len);
let v: Vec<_> = vec.iter().map(|x| builder.constant_extension(*x)).collect();
@ -61,7 +62,7 @@ mod tests {
}
let data = builder.build();
let proof = data.prove(PartialWitness::new(0, 0, 0))?;
let proof = data.prove(pw)?;
verify(proof, &data.verifier_only, &data.common)
}

View File

@ -48,8 +48,8 @@ mod tests {
type F = CrandallField;
type FF = QuarticCrandallField;
let config = CircuitConfig::large_config();
let mut pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, 4>::new(config);
let mut pw = PartialWitness::new(0, 0, 0);
let (x, y) = (FF::rand(), FF::rand());
let xt = builder.add_virtual_extension_target();

View File

@ -99,6 +99,7 @@ mod tests {
fn test_split_base() -> Result<()> {
type F = CrandallField;
let config = CircuitConfig::large_config();
let pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, 4>::new(config);
let x = F::from_canonical_usize(0b110100000); // 416 = 1532 in base 6.
let xt = builder.constant(x);
@ -115,7 +116,7 @@ mod tests {
builder.assert_leading_zeros(xt, 64 - 9);
let data = builder.build();
let proof = data.prove(PartialWitness::new(0, 0, 0))?;
let proof = data.prove(pw)?;
verify(proof, &data.verifier_only, &data.common)
}
@ -124,6 +125,7 @@ mod tests {
fn test_base_sum() -> Result<()> {
type F = CrandallField;
let config = CircuitConfig::large_config();
let pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, 4>::new(config);
let n = thread_rng().gen_range(0, 1 << 10);
@ -147,7 +149,7 @@ mod tests {
let data = builder.build();
let proof = data.prove(PartialWitness::new(0, 0, 0))?;
let proof = data.prove(pw)?;
verify(proof, &data.verifier_only, &data.common)
}

View File

@ -124,8 +124,8 @@ pub(crate) fn test_eval_fns<F: Extendable<D>, G: Gate<F, D>, const D: usize>(
let constants = F::Extension::rand_vec(gate.num_constants());
let config = CircuitConfig::large_config();
let mut pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, D>::new(config);
let mut pw = PartialWitness::new(0, 0, 0);
let wires_t = builder.add_virtual_extension_targets(wires.len());
let constants_t = builder.add_virtual_extension_targets(constants.len());

View File

@ -345,7 +345,7 @@ mod tests {
let permutation_inputs = (0..W).map(F::from_canonical_usize).collect::<Vec<_>>();
let mut witness = PartialWitness::new(0, 0, 0);
let mut witness = PartialWitness::new(1 << 14, 126, 1000);
witness.set_wire(
Wire {
gate: 0,

View File

@ -154,8 +154,8 @@ mod tests {
fn test_recursive_merkle_proof() -> Result<()> {
type F = CrandallField;
let config = CircuitConfig::large_config();
let mut pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, 4>::new(config);
let mut pw = PartialWitness::new(0, 0, 0);
let log_n = 8;
let n = 1 << log_n;

View File

@ -399,6 +399,7 @@ mod tests {
num_routed_wires: 27,
..CircuitConfig::default()
};
let mut witness = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, 4>::new(config);
let mut recursive_challenger = RecursiveChallenger::new(&mut builder);
let mut recursive_outputs_per_round: Vec<Vec<Target>> = Vec::new();
@ -409,7 +410,6 @@ mod tests {
);
}
let circuit = builder.build();
let mut witness = PartialWitness::new(0, 0, 0);
generate_partial_witness(
&mut witness,
&circuit.prover_only.generators,

View File

@ -387,7 +387,7 @@ mod tests {
}
let data = builder.build();
(
data.prove(PartialWitness::new(0, 0, 0))?,
data.prove(PartialWitness::new(1 << 14, config.num_wires, 1000))?,
data.verifier_only,
data.common,
)
@ -395,7 +395,7 @@ mod tests {
verify(proof_with_pis.clone(), &vd, &cd)?;
let mut builder = CircuitBuilder::<F, D>::new(config.clone());
let mut pw = PartialWitness::new(0, 0, 0);
let mut pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let pt = proof_to_proof_target(&proof_with_pis, &mut builder);
set_proof_target(&proof_with_pis, &pt, &mut pw);

View File

@ -249,6 +249,7 @@ mod tests {
let config = CircuitConfig::large_config();
let pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, D>::new(config);
let alpha = FF::rand();
@ -264,7 +265,7 @@ mod tests {
builder.assert_equal_extension(manual_reduce, circuit_reduce);
let data = builder.build();
let proof = data.prove(PartialWitness::new(0, 0, 0))?;
let proof = data.prove(pw)?;
verify(proof, &data.verifier_only, &data.common)
}
@ -276,6 +277,7 @@ mod tests {
let config = CircuitConfig::large_config();
let pw = PartialWitness::new(1 << 14, config.num_wires, 1000);
let mut builder = CircuitBuilder::<F, D>::new(config);
let alpha = FF::rand();
@ -294,7 +296,7 @@ mod tests {
builder.assert_equal_extension(manual_reduce, circuit_reduce);
let data = builder.build();
let proof = data.prove(PartialWitness::new(0, 0, 0))?;
let proof = data.prove(pw)?;
verify(proof, &data.verifier_only, &data.common)
}