Skip to content

Commit 266827b

Browse files
leo-starkwareleo-starkware
committed
fix tests.
1 parent cbe672a commit 266827b

16 files changed

Lines changed: 120 additions & 104 deletions

File tree

‎crates/cairo_air/src/statement_test.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ fn test_public_logup_sum() {
261261
assert_eq!(result_value, expected);
262262

263263
// Validate the circuit
264+
circuits::finalize_constants::finalize_constants(&mut context);
264265
context.check_vars_used();
265266
context.finalize_guessed_vars();
266267
context.circuit.check_yields();

‎crates/cairo_air/src/test.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ fn test_verify() {
140140

141141
let proof_vars = empty_proof.guess(&mut novalue_context);
142142
verify(&mut novalue_context, &proof_vars, &config, &statement);
143+
circuits::finalize_constants::finalize_constants(&mut novalue_context);
143144
novalue_context.finalize_guessed_vars();
144145
novalue_context.check_vars_used();
145146
novalue_context.circuit.check_yields();

‎crates/cairo_air/src/verify.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use cairo_air::air::PublicData;
77
use cairo_air::flat_claims::FlatClaim;
88
use circuits::blake::HashValue;
99
use circuits::context::{Context, TraceContext};
10+
use circuits::finalize_constants::finalize_constants;
1011
use circuits::ivalue::{IValue, NoValue};
1112
use circuits::ops::Guess;
1213
use circuits_stark_verifier::constraint_eval::CircuitEval;
@@ -124,6 +125,7 @@ pub fn build_fixed_cairo_circuit(
124125

125126
let proof_vars = proof.guess(&mut context);
126127
verify(&mut context, &proof_vars, config, &statement);
128+
finalize_constants(&mut context);
127129
context.finalize_guessed_vars();
128130

129131
context
@@ -155,6 +157,7 @@ pub fn build_cairo_verifier_circuit(verifier_config: &CairoVerifierConfig) -> Co
155157

156158
let proof_vars = empty_proof(config).guess(&mut context);
157159
verify(&mut context, &proof_vars, config, &statement);
160+
finalize_constants(&mut context);
158161
context.finalize_guessed_vars();
159162
context
160163
}

‎crates/circuit_air/src/verify.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
use circuits::{blake::HashValue, context::Context, ivalue::IValue, ops::Guess};
1+
use circuits::{
2+
blake::HashValue, context::Context, finalize_constants::finalize_constants, ivalue::IValue,
3+
ops::Guess,
4+
};
25
use circuits_stark_verifier::{
36
proof::{Proof, ProofConfig},
47
statement::Statement,
@@ -46,6 +49,7 @@ pub fn build_verification_circuit<Value: IValue>(
4649
let proof_vars = proof.guess(&mut context);
4750

4851
verify(&mut context, &proof_vars, &proof_config, &statement);
52+
finalize_constants(&mut context);
4953
context.finalize_guessed_vars();
5054
#[cfg(test)]
5155
context.circuit.check_yields();

‎crates/circuit_common/src/lib.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
pub mod finalize;
22
pub mod preprocessed;
33

4+
// Re-export finalize_constants from circuits crate.
5+
pub use circuits::finalize_constants;
6+
47
// TODO(Anat): Take from somewhere stable.
58
pub const N_LANES: usize = 16;
69

‎crates/circuit_prover/src/prover_test.rs‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ fn stwo_verify(circuit_proof: CircuitProof, preprocessed_circuit: &PreprocessedC
167167
#[test]
168168
fn test_prove_and_stark_verify_blake_gate_context() {
169169
let mut blake_gate_context = build_blake_gate_context();
170+
circuits::finalize_constants::finalize_constants(&mut blake_gate_context);
170171
blake_gate_context.finalize_guessed_vars();
171172
blake_gate_context.validate_circuit();
172173

@@ -183,6 +184,7 @@ fn test_prove_and_stark_verify_blake_gate_context() {
183184
#[test]
184185
fn test_prove_and_stark_verify_permutation_context() {
185186
let mut permutation_context = build_permutation_context();
187+
circuits::finalize_constants::finalize_constants(&mut permutation_context);
186188
permutation_context.finalize_guessed_vars();
187189
permutation_context.validate_circuit();
188190

@@ -199,6 +201,7 @@ fn test_prove_and_stark_verify_permutation_context() {
199201
#[test]
200202
fn test_prove_and_stark_verify_fibonacci_context() {
201203
let mut fibonacci_context = build_fibonacci_context();
204+
circuits::finalize_constants::finalize_constants(&mut fibonacci_context);
202205
fibonacci_context.finalize_guessed_vars();
203206
fibonacci_context.validate_circuit();
204207

@@ -215,6 +218,7 @@ fn test_prove_and_stark_verify_fibonacci_context() {
215218
#[test]
216219
fn test_prove_and_stark_verify_m31_to_u32_context() {
217220
let mut m31_to_u32_context = build_m31_to_u32_context();
221+
circuits::finalize_constants::finalize_constants(&mut m31_to_u32_context);
218222
m31_to_u32_context.finalize_guessed_vars();
219223
m31_to_u32_context.validate_circuit();
220224

@@ -258,11 +262,12 @@ fn circuit_verify(
258262
}
259263

260264
const FIBONACCI_CIRCUIT_PREPROCESSED_ROOT: [u32; 8] =
261-
[579827647, 460015323, 2072233139, 709693420, 371952288, 1355707807, 1645091261, 2144587918];
265+
[609397099, 1756617193, 1941377268, 2080039112, 2095406638, 3084915, 101776927, 1547274111];
262266

263267
#[test]
264268
fn test_prove_and_circuit_verify_fibonacci_context() {
265269
let mut fibonacci_context = build_fibonacci_context();
270+
circuits::finalize_constants::finalize_constants(&mut fibonacci_context);
266271
fibonacci_context.finalize_guessed_vars();
267272
fibonacci_context.validate_circuit();
268273

@@ -276,12 +281,14 @@ fn test_prove_and_circuit_verify_fibonacci_context() {
276281
circuit_verify(circuit_proof, &preprocessed_circuit, FIBONACCI_CIRCUIT_PREPROCESSED_ROOT);
277282
}
278283

279-
const M31_TO_U32_CIRCUIT_PREPROCESSED_ROOT: [u32; 8] =
280-
[270075619, 790063164, 183255611, 43064901, 229280056, 1717043326, 341216832, 2011011748];
284+
const M31_TO_U32_CIRCUIT_PREPROCESSED_ROOT: [u32; 8] = [
285+
2057150194, 1287539556, 348840330, 1316644708, 1932016463, 1332646262, 1451210563, 700919965,
286+
];
281287

282288
#[test]
283289
fn test_prove_and_circuit_verify_m31_to_u32_context() {
284290
let mut m31_to_u32_context = build_m31_to_u32_context();
291+
circuits::finalize_constants::finalize_constants(&mut m31_to_u32_context);
285292
m31_to_u32_context.finalize_guessed_vars();
286293
m31_to_u32_context.validate_circuit();
287294

‎crates/circuits/src/blake_test.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ fn test_blake(#[case] wrong_output: bool) {
4040
eq(&mut context, output.0, out0);
4141
eq(&mut context, output.1, out1);
4242

43-
assert_eq!(context.stats, Stats { blake_updates: 2, guess: 9, equals: 2, ..Stats::default() });
43+
assert_eq!(context.stats, Stats { blake_updates: 2, guess: 7, equals: 2, ..Stats::default() });
4444

45+
crate::finalize_constants::finalize_constants(&mut context);
4546
context.finalize_guessed_vars();
46-
assert_eq!(context.circuit.compute_multiplicities().0, vec![13, 1, 2, 2, 2, 2, 2, 1, 1, 2, 2]);
4747
context.circuit.check_yields();
4848

4949
assert_eq!(context.is_circuit_valid(), !wrong_output);

‎crates/circuits/src/context_test.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@ fn test_constants() {
1111
let c = context.constant(x);
1212
assert_eq!(a.idx, c.idx);
1313

14-
assert_eq!(context.values(), &vec![0.into(), 1.into(), x, x + x]);
14+
let u = qm31_from_u32s(0, 0, 1, 0);
15+
assert_eq!(context.values(), &vec![0.into(), 1.into(), u, x, x + x]);
1516

17+
crate::finalize_constants::finalize_constants(&mut context);
1618
context.finalize_guessed_vars();
17-
assert_eq!(
18-
format!("{:?}", context.circuit),
19-
"[0] = [0] + [0]\n[1] = [1] + [0]\n[2] = [2] + [0]\n[3] = [3] + [0]\n"
20-
);
21-
2219
context.validate_circuit();
2320
}
2421

‎crates/circuits/src/finalize_constants.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ mod test;
3636
/// rebuilding them, so each distinct M31 value gets at most one yield gate.
3737
///
3838
/// `IndexMap` is used (rather than `HashMap`) so that iteration order is deterministic.
39-
// TODO(Leo): remove allow once integrated in the main flow.
40-
#[allow(unused)]
41-
fn finalize_constants(context: &mut Context<impl IValue>) {
39+
pub fn finalize_constants(context: &mut Context<impl IValue>) {
4240
const MIN_BASE: usize = 256;
4341

4442
let mut m31_constants = IndexMap::<M31, Var>::new();
@@ -278,4 +276,4 @@ fn decompose_qm31_constants(
278276
out: qm31_var.idx,
279277
});
280278
}
281-
}
279+
}

‎crates/circuits/src/finalize_constants_test.rs‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,69 +4,57 @@ use crate::context::TraceContext;
44
#[test]
55
fn test_no_constants_beyond_defaults() {
66
let mut context = TraceContext::default();
7-
// Add `u`.
8-
// TODO(Leo): remove this once `u` is added to the default constants.
9-
context.constant(qm31_from_u32s(0, 0, 1, 0));
107
finalize_constants(&mut context);
8+
context.finalize_guessed_vars();
119
context.circuit.check_yields();
1210
context.validate_circuit();
1311
}
1412

1513
#[test]
1614
fn test_small_consecutive_m31_constants() {
1715
let mut context = TraceContext::default();
18-
// Add `u`.
19-
// TODO(Leo): remove this once `u` is added to the default constants.
20-
context.constant(qm31_from_u32s(0, 0, 1, 0));
2116
for i in 0u32..10 {
2217
context.constant(i.into());
2318
}
2419
finalize_constants(&mut context);
20+
context.finalize_guessed_vars();
2521
context.circuit.check_yields();
2622
context.validate_circuit();
2723
}
2824

2925
#[test]
3026
fn test_large_m31_decomposition() {
3127
let mut context = TraceContext::default();
32-
// Add `u`.
33-
// TODO(Leo): remove this once `u` is added to the default constants.
34-
context.constant(qm31_from_u32s(0, 0, 1, 0));
3528
for i in 0u32..100 {
3629
context.constant(i.into());
3730
}
3831
// Add constants that need decomposition.
3932
context.constant(5000u32.into());
4033
context.constant(100000u32.into());
4134
finalize_constants(&mut context);
35+
context.finalize_guessed_vars();
4236
context.circuit.check_yields();
4337
context.validate_circuit();
4438
}
4539

4640
#[test]
4741
fn test_broadcast_constants() {
4842
let mut context = TraceContext::default();
49-
// Add `u`.
50-
// TODO(Leo): remove this once `u` is added to the default constants.
51-
context.constant(qm31_from_u32s(0, 0, 1, 0));
5243
for i in 0u32..20 {
5344
context.constant(i.into());
5445
}
5546
// (5, 5, 5, 5) should use broadcast path: 5 * (1,1,1,1)
5647
context.constant(qm31_from_u32s(5, 5, 5, 5));
5748
context.constant(qm31_from_u32s(12, 12, 12, 12));
5849
finalize_constants(&mut context);
59-
println!("{:?}", context.guessed_vars);
50+
context.finalize_guessed_vars();
6051
context.circuit.check_yields();
6152
context.validate_circuit();
6253
}
6354

6455
#[test]
6556
fn test_mixed_m31_and_qm31_constants() {
6657
let mut context = TraceContext::default();
67-
// Add `u`.
68-
// TODO(Leo): remove this once `u` is added to the default constants.
69-
context.constant(qm31_from_u32s(0, 0, 1, 0));
7058
for i in 0u32..10 {
7159
context.constant(i.into());
7260
}
@@ -75,6 +63,7 @@ fn test_mixed_m31_and_qm31_constants() {
7563
context.constant(qm31_from_u32s(100, 100, 100, 100));
7664
context.constant(qm31_from_u32s(101, 101, 101, 101));
7765
finalize_constants(&mut context);
66+
context.finalize_guessed_vars();
7867
context.circuit.check_yields();
7968
context.validate_circuit();
80-
}
69+
}

0 commit comments

Comments
 (0)