@@ -82,7 +82,12 @@ impl<S: SpartanExtensionField + 'static> Instance<S> {
8282 }
8383 }
8484
85- ( max_num_vars_padded, num_vars_padded, max_num_cons_padded, num_cons_padded)
85+ (
86+ max_num_vars_padded,
87+ num_vars_padded,
88+ max_num_cons_padded,
89+ num_cons_padded,
90+ )
8691 } ;
8792
8893 let bytes_to_scalar =
@@ -266,7 +271,7 @@ impl<S: SpartanExtensionField + 'static> Instance<S> {
266271 /// - VMR3 = r^3 * VT
267272 /// - VMC = (1 or VMC[i-1]) * (tau - VA - VMR1 - VMR2 - VMR3)
268273 /// The final product is stored in X = MC[NV - 1]
269- ///
274+ ///
270275 /// If in COMMIT_MODE, commit instance by num_vars_per_block, rounded to the nearest power of four
271276 pub fn gen_block_inst < const PRINT_SIZE : bool , const COMMIT_MODE : bool > (
272277 num_instances : usize ,
@@ -301,7 +306,15 @@ impl<S: SpartanExtensionField + 'static> Instance<S> {
301306 max_size_per_group. insert ( next_group_size ( * num_vars) , num_vars. next_power_of_two ( ) ) ;
302307 }
303308 }
304- num_vars_per_block. iter ( ) . map ( |i| max_size_per_group. get ( & next_group_size ( * i) ) . unwrap ( ) . clone ( ) ) . collect ( )
309+ num_vars_per_block
310+ . iter ( )
311+ . map ( |i| {
312+ max_size_per_group
313+ . get ( & next_group_size ( * i) )
314+ . unwrap ( )
315+ . clone ( )
316+ } )
317+ . collect ( )
305318 } else {
306319 vec ! [ num_vars; num_instances]
307320 } ;
@@ -346,19 +359,26 @@ impl<S: SpartanExtensionField + 'static> Instance<S> {
346359 2 * num_vars_padded_per_block[ b] + 2 + i
347360 }
348361 } ;
349- let V_output_dot_prod = |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 + ( num_inputs_unpadded - 1 ) + i;
362+ let V_output_dot_prod =
363+ |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 + ( num_inputs_unpadded - 1 ) + i;
350364 // in BLOCK_W2 / PHY_W2
351- let V_PMR = |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * i;
352- let V_PMC = |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * i + 1 ;
365+ let V_PMR =
366+ |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * i;
367+ let V_PMC =
368+ |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * i + 1 ;
353369 // in BLOCK_W2 / VIR_W2
354- let V_VMR1 =
355- |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * num_phy_ops[ b] + 4 * i;
356- let V_VMR2 =
357- |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * num_phy_ops[ b] + 4 * i + 1 ;
358- let V_VMR3 =
359- |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * num_phy_ops[ b] + 4 * i + 2 ;
360- let V_VMC =
361- |b : usize , i : usize | 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * num_phy_ops[ b] + 4 * i + 3 ;
370+ let V_VMR1 = |b : usize , i : usize | {
371+ 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * num_phy_ops[ b] + 4 * i
372+ } ;
373+ let V_VMR2 = |b : usize , i : usize | {
374+ 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * num_phy_ops[ b] + 4 * i + 1
375+ } ;
376+ let V_VMR3 = |b : usize , i : usize | {
377+ 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * num_phy_ops[ b] + 4 * i + 2
378+ } ;
379+ let V_VMC = |b : usize , i : usize | {
380+ 2 * num_vars_padded_per_block[ b] + 2 * num_inputs_unpadded + 2 * num_phy_ops[ b] + 4 * i + 3
381+ } ;
362382 // in BLOCK_W3
363383 let V_v = |b : usize | 3 * num_vars_padded_per_block[ b] ;
364384 let V_x = |b : usize | 3 * num_vars_padded_per_block[ b] + 1 ;
@@ -724,7 +744,10 @@ impl<S: SpartanExtensionField + 'static> Instance<S> {
724744 max_cons_per_group. insert ( num_vars_padded_per_block[ i] , block_num_cons[ i] ) ;
725745 }
726746 }
727- num_vars_padded_per_block. iter ( ) . map ( |i| max_cons_per_group. get ( i) . unwrap ( ) . clone ( ) ) . collect ( )
747+ num_vars_padded_per_block
748+ . iter ( )
749+ . map ( |i| max_cons_per_group. get ( i) . unwrap ( ) . clone ( ) )
750+ . collect ( )
728751 } else {
729752 block_num_cons
730753 }
@@ -736,7 +759,10 @@ impl<S: SpartanExtensionField + 'static> Instance<S> {
736759 block_max_num_cons,
737760 num_cons_padded_per_block,
738761 block_num_vars,
739- num_vars_padded_per_block. into_iter ( ) . map ( |i| 8 * i) . collect ( ) ,
762+ num_vars_padded_per_block
763+ . into_iter ( )
764+ . map ( |i| 8 * i)
765+ . collect ( ) ,
740766 & A_list ,
741767 & B_list ,
742768 & C_list ,
0 commit comments