Merge compatible to develop (20 May 2025)

src/lib/pickles/plonk_checks/gen_scalars/gen_scalars.ml

@@ -113,8 +113,6 @@ end
 
 module type S = sig
   val constant_term : 'a Env.t -> 'a
-
-  val index_terms : 'a Env.t -> 'a Lazy.t Column.Table.t
 end
 
 (* The constraints are basically the same, but the literals in them differ. *)
@@ -150,32 +148,11 @@ module Tick : S = struct
 external fp_linearization : unit -> string * (string * string) array
   = "fp_linearization_strings"
 
-let fp_constant_term, fp_index_terms = fp_linearization ()
+let fp_constant_term, _fp_index_terms = fp_linearization ()
 
 let () = output_string fp_constant_term
 
-let () =
-  output_string
-    {ocaml|
-
-  let index_terms (type a) (_ : a Env.t) =
-    Column.Table.of_alist_exn
-    [
-|ocaml}
-
-let is_first = ref true
-
-let () =
-  Array.iter fp_index_terms ~f:(fun (col, expr) ->
-      if !is_first then is_first := false else output_string " ;\n" ;
-      output_string "(" ;
-      output_string col ;
-      output_string ", lazy (" ;
-      output_string expr ;
-      output_string "))" )
-
 let () = output_string {ocaml|
-      ]
 end
 |ocaml}
 
@@ -214,31 +191,10 @@ module Tock : S = struct
 external fq_linearization : unit -> string * (string * string) array
   = "fq_linearization_strings"
 
-let fq_constant_term, fq_index_terms = fq_linearization ()
+let fq_constant_term, _fq_index_terms = fq_linearization ()
 
 let () = output_string fq_constant_term
 
-let () =
-  output_string
-    {ocaml|
-
-  let index_terms (type a) (_ : a Env.t) =
-    Column.Table.of_alist_exn
-    [
-|ocaml}
-
-let is_first = ref true
-
-let () =
-  Array.iter fq_index_terms ~f:(fun (col, expr) ->
-      if !is_first then is_first := false else output_string " ;\n" ;
-      output_string "(" ;
-      output_string col ;
-      output_string ", lazy (" ;
-      output_string expr ;
-      output_string "))" )
-
 let () = output_string {ocaml|
-      ]
 end
 |ocaml}

src/lib/pickles/plonk_checks/scalars.ml

@@ -101,8 +101,6 @@ end
 
 module type S = sig
   val constant_term : 'a Env.t -> 'a
-
-  val index_terms : 'a Env.t -> 'a Lazy.t Column.Table.t
 end
 
 (* The constraints are basically the same, but the literals in them differ. *)
@@ -3379,8 +3377,6 @@ module Tick : S = struct
             field
               "0x0000000000000000000000000000000000000000000000000000000000000000"
         )
-
-  let index_terms (type a) (_ : a Env.t) = Column.Table.of_alist_exn []
 end
 
 module Tock : S = struct
@@ -4227,6 +4223,4 @@ module Tock : S = struct
               * cell (var (Witness 3, Curr))
               * cell (var (Witness 4, Curr))
             + cell (var (Coefficient 9, Curr)) ) )
-
-  let index_terms (type a) (_ : a Env.t) = Column.Table.of_alist_exn []
 end

src/lib/pickles/step_verifier.ml

@@ -784,8 +784,6 @@ struct
         (Shifted_value.Type1)
         (struct
           let constant_term = Plonk_checks.Scalars.Tick.constant_term
-
-          let index_terms = Plonk_checks.Scalars.Tick.index_terms
         end)
   end
 

src/lib/pickles/wrap.ml

@@ -17,8 +17,6 @@ module Type1 =
     (Shifted_value.Type1)
     (struct
       let constant_term = Plonk_checks.Scalars.Tick.constant_term
-
-      let index_terms = Plonk_checks.Scalars.Tick.index_terms
     end)
 
 let _vector_of_list (type a t)