Merge pull request #16433 from MinaProtocol/feature/further-simplifie…

…d-snarky-typ Simplify snarky `Typ.t`, removing unnecessary type parameters
MinaProtocol · Dec 29, 2024 · 4c5c342 · 4c5c342
2 parents 390fb30 + bc75f95
commit 4c5c342
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/lib/pickles/step_verifier.ml b/src/lib/pickles/step_verifier.ml
@@ -11,15 +11,13 @@ module Make
     (Inputs : Intf.Step_main_inputs.S
                 with type Impl.field = Backend.Tick.Field.t
                  and type Impl.Bigint.t = Backend.Tick.Bigint.t
-                 and type ('var, 'value, 'aux, 'field, 'checked) Impl.Typ.typ' =
+                 and type ('var, 'value, 'aux) Impl.Internal_Basic.Typ.typ' =
                   ( 'var
                   , 'value
-                  , 'aux
-                  , 'field
-                  , 'checked )
-                  Step_main_inputs.Impl.Typ.typ'
-                 and type ('var, 'value, 'field, 'checked) Impl.Typ.typ =
-                  ('var, 'value, 'field, 'checked) Step_main_inputs.Impl.Typ.typ
+                  , 'aux )
+                  Step_main_inputs.Impl.Internal_Basic.Typ.typ'
+                 and type ('var, 'value) Impl.Internal_Basic.Typ.typ =
+                  ('var, 'value) Step_main_inputs.Impl.Internal_Basic.Typ.typ
                  and type Inner_curve.Constant.Scalar.t = Backend.Tock.Field.t) =
 struct
   open Inputs

diff --git a/src/lib/pickles/wrap_verifier.ml b/src/lib/pickles/wrap_verifier.ml
@@ -49,15 +49,13 @@ module Make
     (Inputs : Intf.Wrap_main_inputs.S
                 with type Impl.field = Backend.Tock.Field.t
                  and type Impl.Bigint.t = Backend.Tock.Bigint.t
-                 and type ('var, 'value, 'aux, 'field, 'checked) Impl.Typ.typ' =
+                 and type ('var, 'value, 'aux) Impl.Internal_Basic.Typ.typ' =
                   ( 'var
                   , 'value
-                  , 'aux
-                  , 'field
-                  , 'checked )
-                  Wrap_main_inputs.Impl.Typ.typ'
-                 and type ('var, 'value, 'field, 'checked) Impl.Typ.typ =
-                  ('var, 'value, 'field, 'checked) Wrap_main_inputs.Impl.Typ.typ
+                  , 'aux )
+                  Wrap_main_inputs.Impl.Internal_Basic.Typ.typ'
+                 and type ('var, 'value) Impl.Internal_Basic.Typ.typ =
+                  ('var, 'value) Wrap_main_inputs.Impl.Internal_Basic.Typ.typ
                  and type Inner_curve.Constant.Scalar.t = Backend.Tick.Field.t) =
 struct
   open Inputs

diff --git a/src/lib/snarky b/src/lib/snarky
+5 −4		.github/workflows/build.yml
+5 −8		.github/workflows/docker.yml
+30 −32		.github/workflows/docs.yml
+0 −9		Makefile
+1 −5		README.md
+1 −1		snarky_integer/integer.ml
+1 −1		sponge/sponge.ml
+63 −73		src/base/as_prover0.ml
+12 −19		src/base/as_prover_intf.ml
+8 −7		src/base/checked.ml
+45 −93		src/base/checked_intf.ml
+60 −68		src/base/checked_runner.ml
+22 −41		src/base/runners.ml
+52 −34		src/base/snark0.ml
+26 −35		src/base/snark_intf.ml
+29 −73		src/base/typ.ml
+85 −29		src/base/types.ml
+19 −21		src/base/utils.ml
+44 −107		src/base/utils.mli
+1 −5		website/docs/readme.md
+0 −9		website/docs/try-it-out.md