Remove recursive splitting

HerodotusDev · Sep 17, 2024 · 810223c · 810223c
1 parent e17befe
commit 810223c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 172 deletions.
diff --git a/src/air/layouts/recursive.cairo b/src/air/layouts/recursive.cairo
@@ -3,13 +3,12 @@ mod constants;
 mod global_values;
 mod public_input;
 mod traces;
-#[cfg(feature: 'split')]
-mod contract;
 
 use cairo_verifier::{
     air::{
         constants::{SHIFT_POINT_X, SHIFT_POINT_Y},
         layouts::recursive::{
+            autogenerated::{eval_composition_polynomial_inner, eval_oods_polynomial_inner,},
             global_values::{GlobalValues, InteractionElements, EcPoint},
             public_input::RecursivePublicInputImpl,
             constants::{
@@ -25,77 +24,6 @@ use cairo_verifier::{
 };
 use starknet::ContractAddress;
 
-#[cfg(feature: 'monolith')]
-use cairo_verifier::air::layouts::recursive::autogenerated::{
-    eval_composition_polynomial_inner as eval_composition_polynomial_inner_,
-    eval_oods_polynomial_inner as eval_oods_polynomial_inner_,
-};
-
-#[cfg(feature: 'monolith')]
-fn eval_composition_polynomial_inner(
-    mask_values: Span<felt252>,
-    constraint_coefficients: Span<felt252>,
-    point: felt252,
-    trace_generator: felt252,
-    global_values: GlobalValues,
-    contract_address: ContractAddress,
-) -> felt252 {
-    eval_composition_polynomial_inner_(
-        mask_values, constraint_coefficients, point, trace_generator, global_values
-    )
-}
-
-#[cfg(feature: 'monolith')]
-fn eval_oods_polynomial_inner(
-    column_values: Span<felt252>,
-    oods_values: Span<felt252>,
-    constraint_coefficients: Span<felt252>,
-    point: felt252,
-    oods_point: felt252,
-    trace_generator: felt252,
-    contract_address: ContractAddress,
-) -> felt252 {
-    eval_oods_polynomial_inner_(
-        column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,
-    )
-}
-
-#[cfg(feature: 'split')]
-use cairo_verifier::air::layouts::recursive::contract::{
-    ILayoutCompositionContractDispatcher, ILayoutCompositionContractDispatcherTrait,
-    ILayoutOodsContractDispatcher, ILayoutOodsContractDispatcherTrait,
-};
-
-#[cfg(feature: 'split')]
-fn eval_composition_polynomial_inner(
-    mask_values: Span<felt252>,
-    constraint_coefficients: Span<felt252>,
-    point: felt252,
-    trace_generator: felt252,
-    global_values: GlobalValues,
-    contract_address: ContractAddress,
-) -> felt252 {
-    ILayoutCompositionContractDispatcher { contract_address }
-        .eval_composition_polynomial_inner(
-            mask_values, constraint_coefficients, point, trace_generator, global_values
-        )
-}
-
-#[cfg(feature: 'split')]
-fn eval_oods_polynomial_inner(
-    column_values: Span<felt252>,
-    oods_values: Span<felt252>,
-    constraint_coefficients: Span<felt252>,
-    point: felt252,
-    oods_point: felt252,
-    trace_generator: felt252,
-    contract_address: ContractAddress,
-) -> felt252 {
-    ILayoutOodsContractDispatcher { contract_address }
-        .eval_oods_polynomial_inner(
-            column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,
-        )
-}
 
 impl RecursiveAIRCompositionImpl of AIRComposition<InteractionElements, PublicInput> {
     fn eval_composition_polynomial(
@@ -166,12 +94,7 @@ impl RecursiveAIRCompositionImpl of AIRComposition<InteractionElements, PublicIn
         };
 
         eval_composition_polynomial_inner(
-            mask_values,
-            constraint_coefficients,
-            point,
-            trace_generator,
-            global_values,
-            contract_address,
+            mask_values, constraint_coefficients, point, trace_generator, global_values,
         )
     }
 }
@@ -187,13 +110,7 @@ impl RecursiveAIROodsImpl of AIROods {
         contract_address: ContractAddress,
     ) -> felt252 {
         eval_oods_polynomial_inner(
-            column_values,
-            oods_values,
-            constraint_coefficients,
-            point,
-            oods_point,
-            trace_generator,
-            contract_address,
+            column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,
         )
     }
 }
diff --git a/src/air/layouts/recursive/contract.cairo b/src/air/layouts/recursive/contract.cairo