Merge pull request #14259 from MinaProtocol/fix/rm-dhall-ppx-develop

MinaProtocol · Oct 3, 2023 · 0208a1e · 0208a1e
2 parents 1c6a448 + 434dbb1
commit 0208a1e
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 288 deletions.
diff --git a/src/dune-project b/src/dune-project
@@ -147,7 +147,6 @@
 (package (name pipe_lib))
 (package (name pokolog))
 (package (name ppx_annot))
-(package (name ppx_dhall_type))
 (package (name ppx_mina))
 (package (name ppx_register_event))
 (package (name ppx_representatives))

diff --git a/src/lib/currency/currency.ml b/src/lib/currency/currency.ml
@@ -95,9 +95,6 @@ module Make_str (A : Wire_types.Concrete) = struct
 
     type t = Unsigned.t [@@deriving sexp, compare, hash]
 
-    (* can't be automatically derived *)
-    let dhall_type = Ppx_dhall_type.Dhall_type.Text
-
     [%%define_locally
     Unsigned.(to_uint64, of_uint64, of_int, to_int, of_string, to_string)]
 
@@ -945,7 +942,7 @@ module Make_str (A : Wire_types.Concrete) = struct
         type t = Unsigned_extended.UInt64.Stable.V1.t
         [@@deriving sexp, compare, hash, equal]
 
-        [%%define_from_scope to_yojson, of_yojson, dhall_type]
+        [%%define_from_scope to_yojson, of_yojson]
 
         let to_latest = Fn.id
       end
@@ -976,9 +973,6 @@ module Make_str (A : Wire_types.Concrete) = struct
             [@@@with_all_version_tags]
 
             type t = A.t [@@deriving sexp, compare, hash, equal, yojson]
-
-            (* not automatically derived *)
-            val dhall_type : Ppx_dhall_type.Dhall_type.t
           end
         end]
 
@@ -1092,7 +1086,7 @@ module Make_str (A : Wire_types.Concrete) = struct
           type t = Unsigned_extended.UInt64.Stable.V1.t
           [@@deriving sexp, compare, hash, equal, yojson]
 
-          [%%define_from_scope to_yojson, of_yojson, dhall_type]
+          [%%define_from_scope to_yojson, of_yojson]
 
           let to_latest = Fn.id
         end
@@ -1137,9 +1131,6 @@ module Make_str (A : Wire_types.Concrete) = struct
         [@@deriving sexp, compare, equal, hash, yojson]
 
         let to_latest = Fn.id
-
-        (* can't be automatically derived *)
-        let dhall_type = Ppx_dhall_type.Dhall_type.Text
       end
     end]
 

diff --git a/src/lib/currency/dune b/src/lib/currency/dune
@@ -20,7 +20,6 @@
    ;; local libraries
    bignum_bigint
    bitstring_lib
-   ppx_dhall_type
    codable
    test_util
    unsigned_extended

diff --git a/src/lib/currency/intf.ml b/src/lib/currency/intf.ml
@@ -11,9 +11,6 @@ module type Basic = sig
 
   type magnitude = t [@@deriving sexp, compare]
 
-  (* not automatically derived *)
-  val dhall_type : Ppx_dhall_type.Dhall_type.t
-
   val max_int : t
 
   val length_in_bits : int
@@ -307,9 +304,6 @@ module type Full = sig
         [@@@with_all_version_tags]
 
         type t [@@deriving sexp, compare, hash, yojson, equal]
-
-        (* not automatically derived *)
-        val dhall_type : Ppx_dhall_type.Dhall_type.t
       end
     end]
 
@@ -367,9 +361,6 @@ module type Full = sig
         [@@@with_all_version_tags]
 
         type t [@@deriving sexp, compare, hash, equal, yojson]
-
-        (* not automatically derived *)
-        val dhall_type : Ppx_dhall_type.Dhall_type.t
       end
     end]
 
@@ -439,9 +430,6 @@ module type Full = sig
     module Stable : sig
       module V1 : sig
         type t [@@deriving sexp, compare, hash, yojson, equal]
-
-        (* not automatically derived *)
-        val dhall_type : Ppx_dhall_type.Dhall_type.t
       end
     end]
 

diff --git a/src/lib/mina_numbers/dune b/src/lib/mina_numbers/dune
@@ -20,7 +20,6 @@
    bignum_bigint
    pickles
    codable
-   ppx_dhall_type
    snarky.backendless
    fold_lib
    tuple_lib

diff --git a/src/lib/mina_numbers/global_slot.ml b/src/lib/mina_numbers/global_slot.ml
@@ -75,8 +75,6 @@ module Make (M : S) = struct
     let%map.Quickcheck u32 = T.gen_incl u32_1 u32_2 in
     of_uint32 u32
 
-  let dhall_type = Ppx_dhall_type.Dhall_type.Text
-
   let zero = of_uint32 T.zero
 
   let one = of_uint32 T.one

diff --git a/src/lib/mina_numbers/global_slot_intf.ml b/src/lib/mina_numbers/global_slot_intf.ml
@@ -18,8 +18,6 @@ module type S_base = sig
 
   val gen_incl : t -> t -> t Core_kernel.Quickcheck.Generator.t
 
-  val dhall_type : Ppx_dhall_type.Dhall_type.t
-
   val zero : t
 
   val one : t

diff --git a/src/lib/mina_numbers/global_slot_span.ml b/src/lib/mina_numbers/global_slot_span.ml
@@ -82,8 +82,6 @@ module Make_str (_ : Wire_types.Concrete) = struct
     let%map.Quickcheck u32 = T.gen_incl u32_1 u32_2 in
     of_uint32 u32
 
-  let dhall_type = Ppx_dhall_type.Dhall_type.Text
-
   let zero = of_uint32 T.zero
 
   let one = of_uint32 T.one

diff --git a/src/lib/mina_numbers/intf.ml b/src/lib/mina_numbers/intf.ml
@@ -14,9 +14,6 @@ module type S_unchecked = sig
 
   include Hashable.S with type t := t
 
-  (* not automatically derived *)
-  val dhall_type : Ppx_dhall_type.Dhall_type.t
-
   val max_value : t
 
   val length_in_bits : int

diff --git a/src/lib/mina_numbers/nat.ml b/src/lib/mina_numbers/nat.ml
@@ -196,9 +196,6 @@ end)
 struct
   type t = N.t [@@deriving sexp, compare, hash, yojson]
 
-  (* can't be automatically derived *)
-  let dhall_type = Ppx_dhall_type.Dhall_type.Text
-
   let max_value = N.max_int
 
   include Comparable.Make (N)

diff --git a/src/lib/ppx_dhall_type/deriving.ml b/src/lib/ppx_dhall_type/deriving.ml
diff --git a/src/lib/ppx_dhall_type/dhall_type.ml b/src/lib/ppx_dhall_type/dhall_type.ml
diff --git a/src/lib/ppx_dhall_type/dune b/src/lib/ppx_dhall_type/dune
diff --git a/src/lib/runtime_config/dune b/src/lib/runtime_config/dune
@@ -20,7 +20,6 @@
    mina_base.import
    mina_numbers
    signature_lib
-   ppx_dhall_type
    snark_params
    unsigned_extended
    pickles
@@ -30,4 +29,4 @@
    )
  (instrumentation (backend bisect_ppx))
  (preprocess (pps ppx_custom_printf ppx_sexp_conv ppx_let ppx_deriving_yojson
-                  ppx_fields_conv ppx_dhall_type ppx_version ppx_compare)))
+                  ppx_fields_conv ppx_version ppx_compare)))