From 26dbf5a81c91cc675b0df88ff906bdb5080caaf6 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Mon, 27 Jun 2022 12:13:16 +0200 Subject: [PATCH] Proto-env: reduce lib interface --- manifest/main.ml | 2 +- .../environment_V0.ml | 4 +- .../environment_V0.mli | 6 +-- .../environment_V1.ml | 4 +- .../environment_V1.mli | 6 +-- .../environment_V2.ml | 4 +- .../environment_V2.mli | 6 +-- .../environment_V3.ml | 4 +- .../environment_V3.mli | 6 +-- .../environment_V4.ml | 4 +- .../environment_V4.mli | 6 +-- .../environment_V5.ml | 4 +- .../environment_V5.mli | 6 +-- .../environment_V6.ml | 4 +- .../environment_V6.mli | 6 +-- .../tezos_protocol_environment.ml | 40 ++++++++++++---- .../tezos_protocol_environment.mli | 46 ------------------- .../registered_protocol.ml | 28 +++++------ .../registered_protocol.mli | 14 +++--- src/proto_000_Ps9mPmXa/lib_protocol/dune | 2 +- src/proto_001_PtCJ7pwo/lib_protocol/dune | 2 +- src/proto_002_PsYLVpVv/lib_protocol/dune | 2 +- src/proto_003_PsddFKi3/lib_protocol/dune | 2 +- src/proto_004_Pt24m4xi/lib_protocol/dune | 2 +- src/proto_005_PsBABY5H/lib_protocol/dune | 2 +- src/proto_005_PsBabyM1/lib_protocol/dune | 2 +- src/proto_006_PsCARTHA/lib_protocol/dune | 2 +- src/proto_007_PsDELPH1/lib_protocol/dune | 2 +- src/proto_008_PtEdo2Zk/lib_protocol/dune | 2 +- src/proto_008_PtEdoTez/lib_protocol/dune | 2 +- src/proto_009_PsFLoren/lib_protocol/dune | 2 +- src/proto_010_PtGRANAD/lib_protocol/dune | 2 +- src/proto_011_PtHangz2/lib_protocol/dune | 2 +- src/proto_012_Psithaca/lib_protocol/dune | 2 +- src/proto_013_PtJakart/lib_protocol/dune | 2 +- src/proto_alpha/lib_protocol/dune | 2 +- src/proto_demo_counter/lib_protocol/dune | 2 +- src/proto_demo_noops/lib_protocol/dune | 2 +- src/proto_genesis/lib_protocol/dune | 2 +- 39 files changed, 108 insertions(+), 132 deletions(-) delete mode 100644 src/lib_protocol_environment/tezos_protocol_environment.mli diff --git a/manifest/main.ml b/manifest/main.ml index c407d36ae4b3..91c26e28cb9d 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3313,7 +3313,7 @@ end = struct S (sf {|module Name = struct let name = "%s" end -include Tezos_protocol_environment.MakeV%d(Name)() +include Tezos_protocol_environment.V%d.Make(Name)() module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end |} name_dash diff --git a/src/lib_protocol_environment/environment_V0.ml b/src/lib_protocol_environment/environment_V0.ml index c9802445a9a5..4332005a6863 100644 --- a/src/lib_protocol_environment/environment_V0.ml +++ b/src/lib_protocol_environment/environment_V0.ml @@ -27,7 +27,7 @@ open Environment_context open Environment_protocol_T -module type V0 = sig +module type T = sig include Tezos_protocol_environment_sigs.V0.T with type Format.formatter = Format.formatter @@ -98,7 +98,7 @@ module type V0 = sig -> ['block] RPC_context.simple end -module MakeV0 (Param : sig +module Make (Param : sig val name : string end) () = diff --git a/src/lib_protocol_environment/environment_V0.mli b/src/lib_protocol_environment/environment_V0.mli index 31e5fe313b9e..22040dbebf73 100644 --- a/src/lib_protocol_environment/environment_V0.mli +++ b/src/lib_protocol_environment/environment_V0.mli @@ -27,7 +27,7 @@ open Environment_context open Environment_protocol_T -module type V0 = sig +module type T = sig include Tezos_protocol_environment_sigs.V0.T with type Format.formatter = Format.formatter @@ -98,11 +98,11 @@ module type V0 = sig -> ['block] RPC_context.simple end -module MakeV0 (Param : sig +module Make (Param : sig val name : string end) () : - V0 + T with type Updater.validation_result = validation_result and type Updater.quota = quota and type Updater.rpc_context = rpc_context diff --git a/src/lib_protocol_environment/environment_V1.ml b/src/lib_protocol_environment/environment_V1.ml index 4be32436548e..b3fd5f80b628 100644 --- a/src/lib_protocol_environment/environment_V1.ml +++ b/src/lib_protocol_environment/environment_V1.ml @@ -28,7 +28,7 @@ open Environment_context open Environment_protocol_T -module type V1 = sig +module type T = sig include Tezos_protocol_environment_sigs.V1.T with type Format.formatter = Format.formatter @@ -105,7 +105,7 @@ module type V1 = sig -> ['block] RPC_context.simple end -module MakeV1 (Param : sig +module Make (Param : sig val name : string end) () = diff --git a/src/lib_protocol_environment/environment_V1.mli b/src/lib_protocol_environment/environment_V1.mli index 67a41a853c07..261027f3973b 100644 --- a/src/lib_protocol_environment/environment_V1.mli +++ b/src/lib_protocol_environment/environment_V1.mli @@ -27,7 +27,7 @@ open Environment_context open Environment_protocol_T -module type V1 = sig +module type T = sig include Tezos_protocol_environment_sigs.V1.T with type Format.formatter = Format.formatter @@ -104,11 +104,11 @@ module type V1 = sig -> ['block] RPC_context.simple end -module MakeV1 (Param : sig +module Make (Param : sig val name : string end) () : - V1 + T with type Updater.validation_result = validation_result and type Updater.quota = quota and type Updater.rpc_context = rpc_context diff --git a/src/lib_protocol_environment/environment_V2.ml b/src/lib_protocol_environment/environment_V2.ml index 10b04749a21b..ed59a9318553 100644 --- a/src/lib_protocol_environment/environment_V2.ml +++ b/src/lib_protocol_environment/environment_V2.ml @@ -28,7 +28,7 @@ open Environment_context open Environment_protocol_T -module type V2 = sig +module type T = sig include Tezos_protocol_environment_sigs.V2.T with type Format.formatter = Format.formatter @@ -110,7 +110,7 @@ module type V2 = sig -> ['block] RPC_context.simple end -module MakeV2 (Param : sig +module Make (Param : sig val name : string end) () = diff --git a/src/lib_protocol_environment/environment_V2.mli b/src/lib_protocol_environment/environment_V2.mli index fcc55222b84f..97de47e51e7b 100644 --- a/src/lib_protocol_environment/environment_V2.mli +++ b/src/lib_protocol_environment/environment_V2.mli @@ -27,7 +27,7 @@ open Environment_context open Environment_protocol_T -module type V2 = sig +module type T = sig include Tezos_protocol_environment_sigs.V2.T with type Format.formatter = Format.formatter @@ -133,11 +133,11 @@ module type V2 = sig -> ['block] RPC_context.simple end -module MakeV2 (Param : sig +module Make (Param : sig val name : string end) () : - V2 + T with type Updater.validation_result = validation_result and type Updater.quota = quota and type Updater.rpc_context = rpc_context diff --git a/src/lib_protocol_environment/environment_V3.ml b/src/lib_protocol_environment/environment_V3.ml index df1879a36ae5..d6c8c7899b0e 100644 --- a/src/lib_protocol_environment/environment_V3.ml +++ b/src/lib_protocol_environment/environment_V3.ml @@ -28,7 +28,7 @@ open Environment_context open Environment_protocol_T -module type V3 = sig +module type T = sig include Tezos_protocol_environment_sigs.V3.T with type Format.formatter = Format.formatter @@ -116,7 +116,7 @@ module type V3 = sig -> ['block] RPC_context.simple end -module MakeV3 (Param : sig +module Make (Param : sig val name : string end) () = diff --git a/src/lib_protocol_environment/environment_V3.mli b/src/lib_protocol_environment/environment_V3.mli index bd1adae97c80..163f8ac743d1 100644 --- a/src/lib_protocol_environment/environment_V3.mli +++ b/src/lib_protocol_environment/environment_V3.mli @@ -27,7 +27,7 @@ open Environment_context open Environment_protocol_T -module type V3 = sig +module type T = sig include Tezos_protocol_environment_sigs.V3.T with type Format.formatter = Format.formatter @@ -139,11 +139,11 @@ module type V3 = sig -> ['block] RPC_context.simple end -module MakeV3 (Param : sig +module Make (Param : sig val name : string end) () : - V3 + T with type Updater.validation_result = validation_result and type Updater.quota = quota and type Updater.rpc_context = rpc_context diff --git a/src/lib_protocol_environment/environment_V4.ml b/src/lib_protocol_environment/environment_V4.ml index 69efa042fef5..d636baa119d4 100644 --- a/src/lib_protocol_environment/environment_V4.ml +++ b/src/lib_protocol_environment/environment_V4.ml @@ -32,7 +32,7 @@ type shell_error = error = .. open Environment_context open Environment_protocol_T -module type V4 = sig +module type T = sig include Tezos_protocol_environment_sigs.V4.T with type Format.formatter = Format.formatter @@ -122,7 +122,7 @@ module type V4 = sig -> ['block] RPC_context.simple end -module MakeV4 (Param : sig +module Make (Param : sig val name : string end) () = diff --git a/src/lib_protocol_environment/environment_V4.mli b/src/lib_protocol_environment/environment_V4.mli index ccceff6c1fe5..f37d475da3dd 100644 --- a/src/lib_protocol_environment/environment_V4.mli +++ b/src/lib_protocol_environment/environment_V4.mli @@ -27,7 +27,7 @@ open Environment_context open Environment_protocol_T -module type V4 = sig +module type T = sig include Tezos_protocol_environment_sigs.V4.T with type Format.formatter = Format.formatter @@ -141,11 +141,11 @@ module type V4 = sig -> ['block] RPC_context.simple end -module MakeV4 (Param : sig +module Make (Param : sig val name : string end) () : - V4 + T with type Updater.validation_result = validation_result and type Updater.quota = quota and type Updater.rpc_context = rpc_context diff --git a/src/lib_protocol_environment/environment_V5.ml b/src/lib_protocol_environment/environment_V5.ml index d2c6d167c57b..171f40886826 100644 --- a/src/lib_protocol_environment/environment_V5.ml +++ b/src/lib_protocol_environment/environment_V5.ml @@ -32,7 +32,7 @@ type shell_error = error = .. open Environment_context open Environment_protocol_T -module type V5 = sig +module type T = sig include Tezos_protocol_environment_sigs.V5.T with type Format.formatter = Format.formatter @@ -129,7 +129,7 @@ module type V5 = sig -> ['block] RPC_context.simple end -module MakeV5 (Param : sig +module Make (Param : sig val name : string end) () = diff --git a/src/lib_protocol_environment/environment_V5.mli b/src/lib_protocol_environment/environment_V5.mli index e1d08b2fb33b..de76e0cef942 100644 --- a/src/lib_protocol_environment/environment_V5.mli +++ b/src/lib_protocol_environment/environment_V5.mli @@ -27,7 +27,7 @@ open Environment_context open Environment_protocol_T -module type V5 = sig +module type T = sig include Tezos_protocol_environment_sigs.V5.T with type Format.formatter = Format.formatter @@ -154,11 +154,11 @@ module type V5 = sig -> ['block] RPC_context.simple end -module MakeV5 (Param : sig +module Make (Param : sig val name : string end) () : - V5 + T with type Updater.validation_result = validation_result and type Updater.quota = quota and type Updater.rpc_context = rpc_context diff --git a/src/lib_protocol_environment/environment_V6.ml b/src/lib_protocol_environment/environment_V6.ml index 12e3fc0f6492..52cbeefd0f2b 100644 --- a/src/lib_protocol_environment/environment_V6.ml +++ b/src/lib_protocol_environment/environment_V6.ml @@ -32,7 +32,7 @@ type shell_error = error = .. open Environment_context open Environment_protocol_T -module type V6 = sig +module type T = sig include Tezos_protocol_environment_sigs.V6.T with type Format.formatter = Format.formatter @@ -134,7 +134,7 @@ module type V6 = sig -> ['block] RPC_context.simple end -module MakeV6 (Param : sig +module Make (Param : sig val name : string end) () = diff --git a/src/lib_protocol_environment/environment_V6.mli b/src/lib_protocol_environment/environment_V6.mli index a5e6a6c6ff3b..2768b599c2df 100644 --- a/src/lib_protocol_environment/environment_V6.mli +++ b/src/lib_protocol_environment/environment_V6.mli @@ -27,7 +27,7 @@ open Environment_context open Environment_protocol_T -module type V6 = sig +module type T = sig include Tezos_protocol_environment_sigs.V6.T with type Format.formatter = Format.formatter @@ -159,11 +159,11 @@ module type V6 = sig -> ['block] RPC_context.simple end -module MakeV6 (Param : sig +module Make (Param : sig val name : string end) () : - V6 + T with type Updater.validation_result = validation_result and type Updater.quota = quota and type Updater.rpc_context = rpc_context diff --git a/src/lib_protocol_environment/tezos_protocol_environment.ml b/src/lib_protocol_environment/tezos_protocol_environment.ml index b7429a0fc38d..d1f8d11ca0b1 100644 --- a/src/lib_protocol_environment/tezos_protocol_environment.ml +++ b/src/lib_protocol_environment/tezos_protocol_environment.ml @@ -24,15 +24,37 @@ (* *) (*****************************************************************************) -include Environment_context -include Environment_protocol_T -include Environment_V0 -include Environment_V1 -include Environment_V2 -include Environment_V3 -include Environment_V4 -include Environment_V5 -include Environment_V6 +module Context = Environment_context.Context +module Register = Environment_context.Register + +let err_implementation_mismatch = + Environment_context.err_implementation_mismatch + +type validation_result = Environment_context.validation_result = { + context : Context.t; + fitness : Fitness.t; + message : string option; + max_operations_ttl : int; + last_allowed_fork_level : Int32.t; +} + +type quota = Environment_context.quota = {max_size : int; max_op : int option} + +type rpc_context = Environment_context.rpc_context = { + block_hash : Block_hash.t; + block_header : Block_header.shell_header; + context : Context.t; +} + +module type PROTOCOL = Environment_protocol_T.PROTOCOL + +module V0 = Environment_V0 +module V1 = Environment_V1 +module V2 = Environment_V2 +module V3 = Environment_V3 +module V4 = Environment_V4 +module V5 = Environment_V5 +module V6 = Environment_V6 module Memory_context = Memory_context module Proxy_context = Proxy_context module Proxy_delegate = Proxy_delegate diff --git a/src/lib_protocol_environment/tezos_protocol_environment.mli b/src/lib_protocol_environment/tezos_protocol_environment.mli deleted file mode 100644 index e326a8bf1f4f..000000000000 --- a/src/lib_protocol_environment/tezos_protocol_environment.mli +++ /dev/null @@ -1,46 +0,0 @@ -(*****************************************************************************) -(* *) -(* Open Source License *) -(* Copyright (c) 2018 Dynamic Ledger Solutions, Inc. *) -(* Copyright (c) 2018 Nomadic Labs. *) -(* *) -(* Permission is hereby granted, free of charge, to any person obtaining a *) -(* copy of this software and associated documentation files (the "Software"),*) -(* to deal in the Software without restriction, including without limitation *) -(* the rights to use, copy, modify, merge, publish, distribute, sublicense, *) -(* and/or sell copies of the Software, and to permit persons to whom the *) -(* Software is furnished to do so, subject to the following conditions: *) -(* *) -(* The above copyright notice and this permission notice shall be included *) -(* in all copies or substantial portions of the Software. *) -(* *) -(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*) -(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *) -(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL *) -(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*) -(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING *) -(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *) -(* DEALINGS IN THE SOFTWARE. *) -(* *) -(*****************************************************************************) - -include module type of struct - include Environment_context - include Environment_protocol_T - include Environment_V0 - include Environment_V1 - include Environment_V2 - include Environment_V3 - include Environment_V4 - include Environment_V5 - include Environment_V6 -end - -module Memory_context = Memory_context -module Proxy_context = Proxy_context -module Proxy_delegate = Proxy_delegate - -module Internal_for_tests : sig - module Environment_protocol_T_test = Environment_protocol_T_test - module Environment_cache = Environment_cache -end diff --git a/src/lib_protocol_updater/registered_protocol.ml b/src/lib_protocol_updater/registered_protocol.ml index 68c3ccbb02ee..5dcb0ce196c4 100644 --- a/src/lib_protocol_updater/registered_protocol.ml +++ b/src/lib_protocol_updater/registered_protocol.ml @@ -48,7 +48,7 @@ let build hash = let module Name = struct let name = Protocol_hash.to_b58check hash end in - let module Env = Tezos_protocol_environment.MakeV0 (Name) () in + let module Env = Tezos_protocol_environment.V0.Make (Name) () in Some (module struct module Raw = F (Env) @@ -68,7 +68,7 @@ let build hash = let module Name = struct let name = Protocol_hash.to_b58check hash end in - let module Env = Tezos_protocol_environment.MakeV1 (Name) () in + let module Env = Tezos_protocol_environment.V1.Make (Name) () in Some (module struct module Raw = F (Env) @@ -88,7 +88,7 @@ let build hash = let module Name = struct let name = Protocol_hash.to_b58check hash end in - let module Env = Tezos_protocol_environment.MakeV2 (Name) () in + let module Env = Tezos_protocol_environment.V2.Make (Name) () in Some (module struct module Raw = F (Env) @@ -108,7 +108,7 @@ let build hash = let module Name = struct let name = Protocol_hash.to_b58check hash end in - let module Env = Tezos_protocol_environment.MakeV3 (Name) () in + let module Env = Tezos_protocol_environment.V3.Make (Name) () in Some (module struct module Raw = F (Env) @@ -128,7 +128,7 @@ let build hash = let module Name = struct let name = Protocol_hash.to_b58check hash end in - let module Env = Tezos_protocol_environment.MakeV4 (Name) () in + let module Env = Tezos_protocol_environment.V4.Make (Name) () in Some (module struct module Raw = F (Env) @@ -148,7 +148,7 @@ let build hash = let module Name = struct let name = Protocol_hash.to_b58check hash end in - let module Env = Tezos_protocol_environment.MakeV5 (Name) () in + let module Env = Tezos_protocol_environment.V5.Make (Name) () in Some (module struct module Raw = F (Env) @@ -168,7 +168,7 @@ let build hash = let module Name = struct let name = Protocol_hash.to_b58check hash end in - let module Env = Tezos_protocol_environment.MakeV6 (Name) () in + let module Env = Tezos_protocol_environment.V6.Make (Name) () in Some (module struct module Raw = F (Env) @@ -241,7 +241,7 @@ module type Source_sig = sig end module Register_embedded_V0 - (Env : Tezos_protocol_environment.V0) + (Env : Tezos_protocol_environment.V0.T) (Proto : Env.Updater.PROTOCOL) (Source : Source_sig) = struct @@ -270,7 +270,7 @@ struct end module Register_embedded_V1 - (Env : Tezos_protocol_environment.V1) + (Env : Tezos_protocol_environment.V1.T) (Proto : Env.Updater.PROTOCOL) (Source : Source_sig) = struct @@ -299,7 +299,7 @@ struct end module Register_embedded_V2 - (Env : Tezos_protocol_environment.V2) + (Env : Tezos_protocol_environment.V2.T) (Proto : Env.Updater.PROTOCOL) (Source : Source_sig) = struct @@ -328,7 +328,7 @@ struct end module Register_embedded_V3 - (Env : Tezos_protocol_environment.V3) + (Env : Tezos_protocol_environment.V3.T) (Proto : Env.Updater.PROTOCOL) (Source : Source_sig) = struct @@ -357,7 +357,7 @@ struct end module Register_embedded_V4 - (Env : Tezos_protocol_environment.V4) + (Env : Tezos_protocol_environment.V4.T) (Proto : Env.Updater.PROTOCOL) (Source : Source_sig) = struct @@ -386,7 +386,7 @@ struct end module Register_embedded_V5 - (Env : Tezos_protocol_environment.V5) + (Env : Tezos_protocol_environment.V5.T) (Proto : Env.Updater.PROTOCOL) (Source : Source_sig) = struct @@ -415,7 +415,7 @@ struct end module Register_embedded_V6 - (Env : Tezos_protocol_environment.V6) + (Env : Tezos_protocol_environment.V6.T) (Proto : Env.Updater.PROTOCOL) (Source : Source_sig) = struct diff --git a/src/lib_protocol_updater/registered_protocol.mli b/src/lib_protocol_updater/registered_protocol.mli index 64bd4577110d..7f283b280def 100644 --- a/src/lib_protocol_updater/registered_protocol.mli +++ b/src/lib_protocol_updater/registered_protocol.mli @@ -53,7 +53,7 @@ val seq_embedded : unit -> Protocol_hash.t Seq.t val get_embedded_sources : Protocol_hash.t -> Protocol.t option module Register_embedded_V0 - (Env : Tezos_protocol_environment.V0) + (Env : Tezos_protocol_environment.V0.T) (Proto : Env.Updater.PROTOCOL) (Source : sig val hash : Protocol_hash.t option @@ -66,7 +66,7 @@ module Register_embedded_V0 and type P.validation_state = Proto.validation_state module Register_embedded_V1 - (Env : Tezos_protocol_environment.V1) + (Env : Tezos_protocol_environment.V1.T) (Proto : Env.Updater.PROTOCOL) (Source : sig val hash : Protocol_hash.t option @@ -79,7 +79,7 @@ module Register_embedded_V1 and type P.validation_state = Proto.validation_state module Register_embedded_V2 - (Env : Tezos_protocol_environment.V2) + (Env : Tezos_protocol_environment.V2.T) (Proto : Env.Updater.PROTOCOL) (Source : sig val hash : Protocol_hash.t option @@ -93,7 +93,7 @@ module Register_embedded_V2 and type P.validation_state = Proto.validation_state module Register_embedded_V3 - (Env : Tezos_protocol_environment.V3) + (Env : Tezos_protocol_environment.V3.T) (Proto : Env.Updater.PROTOCOL) (Source : sig val hash : Protocol_hash.t option @@ -107,7 +107,7 @@ module Register_embedded_V3 and type P.validation_state = Proto.validation_state module Register_embedded_V4 - (Env : Tezos_protocol_environment.V4) + (Env : Tezos_protocol_environment.V4.T) (Proto : Env.Updater.PROTOCOL) (Source : sig val hash : Protocol_hash.t option @@ -121,7 +121,7 @@ module Register_embedded_V4 and type P.validation_state = Proto.validation_state module Register_embedded_V5 - (Env : Tezos_protocol_environment.V5) + (Env : Tezos_protocol_environment.V5.T) (Proto : Env.Updater.PROTOCOL) (Source : sig val hash : Protocol_hash.t option @@ -135,7 +135,7 @@ module Register_embedded_V5 and type P.validation_state = Proto.validation_state module Register_embedded_V6 - (Env : Tezos_protocol_environment.V6) + (Env : Tezos_protocol_environment.V6.T) (Proto : Env.Updater.PROTOCOL) (Source : sig val hash : Protocol_hash.t option diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index 600f2aad0816..ff2beba78c39 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"000-Ps9mPmXa\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"000-Ps9mPmXa\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_000_Ps9mPmXa) diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index 5878a7dd5d9d..2bfc0d185f49 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"001-PtCJ7pwo\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"001-PtCJ7pwo\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_001_PtCJ7pwo) diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index 1dc454d7d456..2cff4225a114 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"002-PsYLVpVv\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"002-PsYLVpVv\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_002_PsYLVpVv) diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index 3946b3af9e9a..0b5ca183f1be 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"003-PsddFKi3\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"003-PsddFKi3\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_003_PsddFKi3) diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index c9aef4a19ea0..a6b3d86c3578 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"004-Pt24m4xi\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"004-Pt24m4xi\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_004_Pt24m4xi) diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index 16da9173c0df..04e6b67f5caa 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"005-PsBABY5H\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"005-PsBABY5H\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_005_PsBABY5H) diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index 2672d3f1c847..1f13de717979 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"005-PsBabyM1\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"005-PsBabyM1\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_005_PsBabyM1) diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index ad66066b5a58..fae51b09976b 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"006-PsCARTHA\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"006-PsCARTHA\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_006_PsCARTHA) diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index ececfa3136cf..13a2da1675d0 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"007-PsDELPH1\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"007-PsDELPH1\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_007_PsDELPH1) diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index afd5118cd074..c88a1d018831 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"008-PtEdo2Zk\" end\ninclude Tezos_protocol_environment.MakeV1(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"008-PtEdo2Zk\" end\ninclude Tezos_protocol_environment.V1.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_008_PtEdo2Zk) diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index 99749c278239..8220a26dc2b4 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"008-PtEdoTez\" end\ninclude Tezos_protocol_environment.MakeV1(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"008-PtEdoTez\" end\ninclude Tezos_protocol_environment.V1.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_008_PtEdoTez) diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index be40efad8460..ba13bb6347fd 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"009-PsFLoren\" end\ninclude Tezos_protocol_environment.MakeV2(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"009-PsFLoren\" end\ninclude Tezos_protocol_environment.V2.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_009_PsFLoren) diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index d014fc0940ba..56e9727a1ff5 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"010-PtGRANAD\" end\ninclude Tezos_protocol_environment.MakeV2(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"010-PtGRANAD\" end\ninclude Tezos_protocol_environment.V2.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_010_PtGRANAD) diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index 93c52754f3a9..5e2d9e879ff8 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"011-PtHangz2\" end\ninclude Tezos_protocol_environment.MakeV3(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"011-PtHangz2\" end\ninclude Tezos_protocol_environment.V3.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_011_PtHangz2) diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index e4dd44af0205..cf7aa6e7aa54 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"012-Psithaca\" end\ninclude Tezos_protocol_environment.MakeV4(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"012-Psithaca\" end\ninclude Tezos_protocol_environment.V4.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_012_Psithaca) diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index 81f44e87c608..4687308c88be 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"013-PtJakart\" end\ninclude Tezos_protocol_environment.MakeV5(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"013-PtJakart\" end\ninclude Tezos_protocol_environment.V5.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_013_PtJakart) diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index 07ebb2fc5bf1..fd50f9e81e57 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"alpha\" end\ninclude Tezos_protocol_environment.MakeV6(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"alpha\" end\ninclude Tezos_protocol_environment.V6.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_alpha) diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index 2792a4894dd6..91d6016d576b 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"demo-counter\" end\ninclude Tezos_protocol_environment.MakeV6(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"demo-counter\" end\ninclude Tezos_protocol_environment.V6.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_demo_counter) diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index 350476206e83..6bec906bc260 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"demo-noops\" end\ninclude Tezos_protocol_environment.MakeV6(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"demo-noops\" end\ninclude Tezos_protocol_environment.V6.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_demo_noops) diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index 8dcdf53ca6b9..76cd7eb694ed 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -15,7 +15,7 @@ (action (write-file %{targets} - "module Name = struct let name = \"genesis\" end\ninclude Tezos_protocol_environment.MakeV0(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) + "module Name = struct let name = \"genesis\" end\ninclude Tezos_protocol_environment.V0.Make(Name)()\nmodule CamlinternalFormatBasics = struct include CamlinternalFormatBasics end\n"))) (library (name tezos_raw_protocol_genesis) -- GitLab