@@ -20,7 +20,7 @@ use crate::{
2020 } ,
2121 test_utils:: {
2222 CachedFixture11 , FibFixture , InteractionsFixture11 , PreprocessedFibFixture , TestFixture ,
23- test_engine_small,
23+ prove_up_to_batch_constraints , test_engine_small,
2424 } ,
2525 verifier:: {
2626 batch_constraints:: { BatchConstraintError , verify_zerocheck_and_logup} ,
@@ -159,9 +159,8 @@ fn test_batch_sumcheck_zero_interactions(
159159
160160 let pvs = vec ! [ ctx. per_trace[ 0 ] . 1 . public_values. clone( ) ] ;
161161 let ( ( gkr_proof, batch_proof) , _) =
162- engine
163- . device ( )
164- . prove_rap_constraints ( & mut prover_sponge, & pk, ctx) ;
162+ prove_up_to_batch_constraints ( & engine, & mut prover_sponge, & pk, ctx) ;
163+
165164 let r = verify_zerocheck_and_logup (
166165 & mut verifier_sponge,
167166 & vk. inner ,
@@ -211,8 +210,12 @@ fn test_stacked_opening_reduction(log_trace_degree: usize) -> Result<(), Stacked
211210
212211 let device = engine. device ( ) ;
213212 // We need batch_proof to obtain the column openings
214- let ( ( _, batch_proof) , r) =
215- device. prove_rap_constraints ( & mut DuplexSponge :: default ( ) , & pk, ctx) ;
213+ let ( ( _, batch_proof) , r) = device. prove_rap_constraints (
214+ & mut DuplexSponge :: default ( ) ,
215+ & pk,
216+ ctx,
217+ & common_main_pcs_data,
218+ ) ;
216219
217220 let ( stacking_proof, _) = prove_stacked_opening_reduction :: < _ , _ , _ , StackedReductionCpu > (
218221 device,
@@ -237,7 +240,6 @@ fn test_stacked_opening_reduction(log_trace_degree: usize) -> Result<(), Stacked
237240 assert_eq ! ( u_prism. len( ) , params. n_stack + 1 ) ;
238241 Ok ( ( ) )
239242}
240-
241243#[ test_case( 3 ) ]
242244#[ test_case( 2 ; "when fib log_height equals l_skip" ) ]
243245#[ test_case( 1 ; "when fib log_height less than l_skip" ) ]
@@ -299,41 +301,8 @@ fn test_single_fib_and_dummy_trace_stark(log_trace_degree: usize) {
299301 per_trace. push ( ( per_trace. len ( ) , fib_ctx) ) ;
300302 let combined_ctx = ProvingContextV2 :: new ( per_trace) . into_sorted ( ) ;
301303
302- let l_skip = engine. config ( ) . l_skip ;
303- let mut pvs = vec ! [ vec![ ] ; 3 ] ;
304- let ( trace_id_to_air_ids, ns) : ( Vec < _ > , Vec < _ > ) = combined_ctx
305- . per_trace
306- . iter ( )
307- . map ( |( air_idx, air_ctx) | {
308- pvs[ * air_idx] = air_ctx. public_values . clone ( ) ;
309- (
310- * air_idx,
311- log2_strict_usize ( air_ctx. common_main . height ( ) ) as isize - l_skip as isize ,
312- )
313- } )
314- . multiunzip ( ) ;
315- let omega_pows = F :: two_adic_generator ( l_skip)
316- . powers ( )
317- . take ( 1 << l_skip)
318- . collect_vec ( ) ;
319-
320- let mut transcript = DuplexSponge :: default ( ) ;
321- let ( ( gkr_proof, batch_proof) , _) =
322- engine
323- . device ( )
324- . prove_rap_constraints ( & mut transcript, & combined_pk, combined_ctx) ;
325- let mut transcript = DuplexSponge :: default ( ) ;
326- verify_zerocheck_and_logup (
327- & mut transcript,
328- & combined_pk. get_vk ( ) . inner ,
329- & pvs,
330- & gkr_proof,
331- & batch_proof,
332- & trace_id_to_air_ids,
333- & ns,
334- & omega_pows,
335- )
336- . unwrap ( ) ;
304+ let proof = engine. prove ( & combined_pk, combined_ctx) ;
305+ engine. verify ( & combined_pk. get_vk ( ) , & proof) . unwrap ( ) ;
337306}
338307
339308#[ test]
@@ -380,9 +349,7 @@ fn test_gkr_verify_zero_interactions() -> eyre::Result<()> {
380349 let pk = engine. device ( ) . transport_pk_to_device ( & pk) ;
381350 let ctx = fx. generate_proving_ctx ( ) . into_sorted ( ) ;
382351 let mut transcript = DuplexSponge :: default ( ) ;
383- let ( ( gkr_proof, _) , _) = engine
384- . device ( )
385- . prove_rap_constraints ( & mut transcript, & pk, ctx) ;
352+ let ( ( gkr_proof, _) , _) = prove_up_to_batch_constraints ( & engine, & mut transcript, & pk, ctx) ;
386353
387354 let mut transcript = DuplexSponge :: default ( ) ;
388355 assert ! ( transcript. check_witness( params. logup_pow_bits, gkr_proof. logup_pow_witness) ) ;
@@ -425,9 +392,7 @@ fn test_batch_constraints_with_interactions() -> eyre::Result<()> {
425392
426393 let mut transcript = DuplexSponge :: default ( ) ;
427394 let ( ( gkr_proof, batch_proof) , _) =
428- engine
429- . device ( )
430- . prove_rap_constraints ( & mut transcript, & pk, ctx) ;
395+ prove_up_to_batch_constraints ( & engine, & mut transcript, & pk, ctx) ;
431396 let mut transcript = DuplexSponge :: default ( ) ;
432397 verify_zerocheck_and_logup (
433398 & mut transcript,
0 commit comments