Error-monad: fewer names, more explicit names

src/lib_error_monad/TzCore.mli

@@ -28,6 +28,4 @@ type error = ..
 
 include Sig.CORE with type error := error
 
-include Sig.EXT with type error := error
-
 include Sig.WITH_WRAPPED with type error := error

src/lib_error_monad/TzMonad.ml

@@ -27,4 +27,4 @@
 type error = TzCore.error = ..
 
 include TzLwtreslib.Monad
-include Monad_ext_maker.Make (TzCore) (TzTrace) (TzLwtreslib.Monad)
+include Monad_extension_maker.Make (TzCore) (TzTrace) (TzLwtreslib.Monad)

src/lib_error_monad/TzMonad.mli

@@ -31,6 +31,6 @@ include
     with type 'error trace := 'error TzTrace.trace
 
 include
-  Sig.MONAD_EXT
+  Sig.MONAD_EXTENSION
     with type error := error
      and type 'error trace := 'error TzTrace.trace

src/lib_error_monad/core_maker.ml

@@ -41,8 +41,6 @@ module Make (Prefix : Sig.PREFIX) : sig
 
   include Sig.CORE with type error := error
 
-  include Sig.EXT with type error := error
-
   include Sig.WITH_WRAPPED with type error := error
 end = struct
   type error = ..
@@ -55,8 +53,6 @@ end = struct
 
     include Sig.CORE with type error := unwrapped
 
-    include Sig.EXT with type error := unwrapped
-
     val unwrap : error -> unwrapped option
 
     val wrap : unwrapped -> error

src/lib_error_monad/core_maker.mli

@@ -28,7 +28,5 @@ module Make (Prefix : Sig.PREFIX) : sig
 
   include Sig.CORE with type error := error
 
-  include Sig.EXT with type error := error
-
   include Sig.WITH_WRAPPED with type error := error
 end

src/lib_error_monad/error_monad.mli

@@ -42,8 +42,6 @@ type error = TzCore.error = ..
 
 include Sig.CORE with type error := error
 
-include Sig.EXT with type error := error
-
 include Sig.WITH_WRAPPED with type error := error
 
 module TzTrace : Sig.TRACE with type 'error trace = 'error list
@@ -55,7 +53,7 @@ include
     with type 'error trace := 'error TzTrace.trace
 
 include
-  Sig.MONAD_EXT
+  Sig.MONAD_EXTENSION
     with type error := error
      and type 'error trace := 'error TzTrace.trace
 

src/lib_error_monad/monad_ext_maker.ml → src/lib_error_monad/monad_extension_maker.ml

@@ -27,13 +27,11 @@ module Make (Error : sig
   type error = ..
 
   include Sig.CORE with type error := error
-
-  include Sig.EXT with type error := error
 end)
 (Trace : Sig.TRACE)
 (Monad : Tezos_lwt_result_stdlib.Lwtreslib.TRACED_MONAD
            with type 'error trace := 'error Trace.trace) :
-  Sig.MONAD_EXT
+  Sig.MONAD_EXTENSION
     with type error := Error.error
      and type 'error trace := 'error Trace.trace = struct
   open Monad

src/lib_error_monad/monad_ext_maker.mli → src/lib_error_monad/monad_extension_maker.mli

@@ -27,12 +27,10 @@ module Make (Error : sig
   type error = ..
 
   include Sig.CORE with type error := error
-
-  include Sig.EXT with type error := error
 end)
 (Trace : Sig.TRACE)
 (Monad : Tezos_lwt_result_stdlib.Lwtreslib.TRACED_MONAD
            with type 'error trace := 'error Trace.trace) :
-  Sig.MONAD_EXT
+  Sig.MONAD_EXTENSION
     with type error := Error.error
      and type 'error trace := 'error Trace.trace

src/lib_error_monad/sig.ml

@@ -50,18 +50,11 @@ module type PREFIX = sig
 end
 
 module type CORE = sig
-  type error
+  type error = ..
 
   val error_encoding : error Data_encoding.t
 
   val pp : Format.formatter -> error -> unit
-end
-
-(** [EXT] is the extensions on top of a [CORE]. The separation is largely
-    artificial and will most likely disappear with the next round of
-    refactoring. See https://gitlab.com/tezos/tezos/-/issues/1579 *)
-module type EXT = sig
-  type error = ..
 
   (** The error data type is extensible. Each module can register specialized
       error serializers
@@ -164,8 +157,6 @@ module type WITH_WRAPPED = sig
 
     include CORE with type error := unwrapped
 
-    include EXT with type error := unwrapped
-
     (** [unwrap e] returns [Some] when [e] matches variant constructor [C]
         and [None] otherwise *)
     val unwrap : error -> unwrapped option
@@ -216,12 +207,12 @@ module type TRACE = sig
   val fold : ('a -> 'error -> 'a) -> 'a -> 'error trace -> 'a
 end
 
-(** [MONAD_EXT] is the Tezos-specific extension to the generic monad provided by
-    Lwtreslib. It sets some defaults (e.g., it defaults traced failures), it
-    brings some qualified identifiers into the main unqualified part (e.g.,
-    [return_unit]), it provides some tracing helpers and some in-monad assertion
-    checks. *)
-module type MONAD_EXT = sig
+(** [MONAD_EXTENSION] is the Tezos-specific extension to the generic monad
+    provided by Lwtreslib. It sets some defaults (e.g., it defaults traced
+    failures), it brings some qualified identifiers into the main unqualified
+    part (e.g., [return_unit]), it provides some tracing helpers and some
+    in-monad assertion checks. *)
+module type MONAD_EXTENSION = sig
   (** for substitution *)
   type error
 

src/lib_protocol_environment/environment_V0.ml

@@ -353,8 +353,6 @@ struct
       Error_core :
         sig
           include Tezos_error_monad.Sig.CORE with type error := unwrapped
-
-          include Tezos_error_monad.Sig.EXT with type error := unwrapped
         end)
 
     let unwrap = function Ecoproto_error ecoerror -> Some ecoerror | _ -> None
@@ -372,7 +370,7 @@ struct
     include Error_core
     include Tezos_error_monad.TzLwtreslib.Monad
     include
-      Tezos_error_monad.Monad_ext_maker.Make (Error_core) (TzTrace)
+      Tezos_error_monad.Monad_extension_maker.Make (Error_core) (TzTrace)
         (Tezos_error_monad.TzLwtreslib.Monad)
 
     (* below is for backward compatibility *)

src/lib_protocol_environment/environment_V1.ml

@@ -540,8 +540,6 @@ struct
       Error_core :
         sig
           include Tezos_error_monad.Sig.CORE with type error := unwrapped
-
-          include Tezos_error_monad.Sig.EXT with type error := unwrapped
         end)
 
     let unwrap = function Ecoproto_error ecoerror -> Some ecoerror | _ -> None
@@ -559,7 +557,7 @@ struct
     include Error_core
     include Tezos_error_monad.TzLwtreslib.Monad
     include
-      Tezos_error_monad.Monad_ext_maker.Make (Error_core) (TzTrace)
+      Tezos_error_monad.Monad_extension_maker.Make (Error_core) (TzTrace)
         (Tezos_error_monad.TzLwtreslib.Monad)
 
     (* Backwards compatibility additions (traversors, dont_wait, trace) *)

src/lib_protocol_environment/environment_V2.ml

@@ -548,8 +548,6 @@ struct
       Error_core :
         sig
           include Tezos_error_monad.Sig.CORE with type error := unwrapped
-
-          include Tezos_error_monad.Sig.EXT with type error := unwrapped
         end)
 
     let unwrap = function Ecoproto_error ecoerror -> Some ecoerror | _ -> None
@@ -567,7 +565,7 @@ struct
     include Error_core
     include Tezos_error_monad.TzLwtreslib.Monad
     include
-      Tezos_error_monad.Monad_ext_maker.Make (Error_core) (TzTrace)
+      Tezos_error_monad.Monad_extension_maker.Make (Error_core) (TzTrace)
         (Tezos_error_monad.TzLwtreslib.Monad)
 
     (* Backwards compatibility additions (traversors, dont_wait, trace helpers) *)

src/lib_protocol_environment/environment_V3.ml

@@ -612,8 +612,6 @@ struct
       Error_core :
         sig
           include Tezos_error_monad.Sig.CORE with type error := unwrapped
-
-          include Tezos_error_monad.Sig.EXT with type error := unwrapped
         end)
 
     let unwrap = function Ecoproto_error ecoerror -> Some ecoerror | _ -> None
@@ -631,7 +629,7 @@ struct
     include Error_core
     include Tezos_error_monad.TzLwtreslib.Monad
     include
-      Tezos_error_monad.Monad_ext_maker.Make (Error_core) (TzTrace)
+      Tezos_error_monad.Monad_extension_maker.Make (Error_core) (TzTrace)
         (Tezos_error_monad.TzLwtreslib.Monad)
 
     (* Backwards compatibility additions (dont_wait, trace helpers) *)

src/lib_protocol_environment/environment_V4.ml

@@ -624,8 +624,6 @@ struct
       Error_core :
         sig
           include Tezos_error_monad.Sig.CORE with type error := unwrapped
-
-          include Tezos_error_monad.Sig.EXT with type error := unwrapped
         end)
 
     let unwrap = function Ecoproto_error ecoerror -> Some ecoerror | _ -> None
@@ -643,7 +641,7 @@ struct
     include Error_core
     include Tezos_error_monad.TzLwtreslib.Monad
     include
-      Tezos_error_monad.Monad_ext_maker.Make (Error_core) (TzTrace)
+      Tezos_error_monad.Monad_extension_maker.Make (Error_core) (TzTrace)
         (Tezos_error_monad.TzLwtreslib.Monad)
 
     (* Backwards compatibility additions (dont_wait, trace helpers) *)