diff --git a/manifest/main.ml b/manifest/main.ml index a62af92f3a6c522daa4e3830766e1bab051eb120..c13800cd703d10a4c22be6d277917d7608972656 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -4753,7 +4753,7 @@ module Protocol = Protocol [ octez_stdlib |> open_; octez_error_monad |> open_; - octez_crypto; + octez_crypto |> open_; octez_micheline |> open_; octez_micheline_rewriting |> open_; main |> open_; diff --git a/src/lib_benchmark/lib_micheline_rewriting/signature.ml b/src/lib_benchmark/lib_micheline_rewriting/algebraic_signature.ml similarity index 100% rename from src/lib_benchmark/lib_micheline_rewriting/signature.ml rename to src/lib_benchmark/lib_micheline_rewriting/algebraic_signature.ml diff --git a/src/lib_benchmark/lib_micheline_rewriting/micheline_with_hash_consing.ml b/src/lib_benchmark/lib_micheline_rewriting/micheline_with_hash_consing.ml index be04ebed7d829db0defdae72f403fdf5fc885c26..918f5360dbf4e240d24378bac2d4a4559f7be0b2 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/micheline_with_hash_consing.ml +++ b/src/lib_benchmark/lib_micheline_rewriting/micheline_with_hash_consing.ml @@ -32,7 +32,7 @@ open Custom_weak type hcons_info = {tag : int; hash : int} module Make - (X : Signature.S) (P : sig + (X : Algebraic_signature.S) (P : sig val initial_size : int option end) : Micheline_sig.S with type label = hcons_info and type head = X.t = struct diff --git a/src/lib_benchmark/lib_micheline_rewriting/micheline_without_hash_consing.ml b/src/lib_benchmark/lib_micheline_rewriting/micheline_without_hash_consing.ml index f194a16f0fbd9c16610ba1f401918df5693b05bc..e1d4cb8689261a995ec81a94e5a6b8c5e0517774 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/micheline_without_hash_consing.ml +++ b/src/lib_benchmark/lib_micheline_rewriting/micheline_without_hash_consing.ml @@ -24,7 +24,7 @@ (*****************************************************************************) module Make - (X : Signature.S) (Label : sig + (X : Algebraic_signature.S) (Label : sig type t val default : t diff --git a/src/lib_benchmark/lib_micheline_rewriting/pattern.ml b/src/lib_benchmark/lib_micheline_rewriting/pattern.ml index bd251ca44218b40d27014babcf197d94890fb64f..63de4dada4a6151e8206d392e323662600e0c647 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/pattern.ml +++ b/src/lib_benchmark/lib_micheline_rewriting/pattern.ml @@ -139,7 +139,7 @@ module type S = sig end module Make - (X : Signature.S) + (X : Algebraic_signature.S) (Micheline : Micheline_sig.S with type head = X.t) (Path : Path.S) = struct @@ -335,7 +335,7 @@ struct end module Make_with_hash_consing - (X : Signature.S) + (X : Algebraic_signature.S) (Micheline : Micheline_sig.S with type head = X.t and type label = Micheline_with_hash_consing.hcons_info) diff --git a/src/lib_benchmark/lib_micheline_rewriting/pattern.mli b/src/lib_benchmark/lib_micheline_rewriting/pattern.mli index 073e03b34a9869a6533441971a29975cb3beec87..35d1f9c34eeebe191250df369c711d9300017405 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/pattern.mli +++ b/src/lib_benchmark/lib_micheline_rewriting/pattern.mli @@ -99,13 +99,13 @@ module type S = sig end module Make - (X : Signature.S) + (X : Algebraic_signature.S) (Micheline : Micheline_sig.S with type head = X.t) (Path : Path.S) : S with type head = X.t and type path = Path.t and type node = Micheline.node module Make_with_hash_consing - (X : Signature.S) + (X : Algebraic_signature.S) (Micheline : Micheline_sig.S with type head = X.t and type label = Micheline_with_hash_consing.hcons_info) diff --git a/src/lib_benchmark/lib_micheline_rewriting/rewrite.ml b/src/lib_benchmark/lib_micheline_rewriting/rewrite.ml index ffd1943d23d3e9224bc6d177e52ec53fba088a53..a9af11eb02a3cffc170b458ec0762b3788b5c535 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/rewrite.ml +++ b/src/lib_benchmark/lib_micheline_rewriting/rewrite.ml @@ -48,7 +48,7 @@ module type S = sig end module Make - (X : Signature.S) + (X : Algebraic_signature.S) (M : Micheline_sig.S with type head = X.t) (Path : Path.S) (Patt : Pattern.S diff --git a/src/lib_benchmark/lib_micheline_rewriting/rewrite.mli b/src/lib_benchmark/lib_micheline_rewriting/rewrite.mli index 6b71f03dababf94de46dfa0236560e9f59b9d94d..e23281a400f9c4592e2d9cc409baf28b5748a4be 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/rewrite.mli +++ b/src/lib_benchmark/lib_micheline_rewriting/rewrite.mli @@ -49,7 +49,7 @@ module type S = sig end module Make - (X : Signature.S) + (X : Algebraic_signature.S) (M : Micheline_sig.S with type head = X.t) (Path : Path.S) (Patt : Pattern.S diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/test_rewriting.ml b/src/lib_benchmark/lib_micheline_rewriting/test/test_rewriting.ml index b4b38bab6a04fcc002f085bbd8973c23cb40c79a..1782ffdc6b1c7db9de28b25b523b33d110a4b13d 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/test/test_rewriting.ml +++ b/src/lib_benchmark/lib_micheline_rewriting/test/test_rewriting.ml @@ -34,7 +34,7 @@ open Tezos_micheline_rewriting open Tezos_protocol_alpha.Protocol module Michelson_signature : - Signature.S with type t = Michelson_v1_primitives.prim = struct + Algebraic_signature.S with type t = Michelson_v1_primitives.prim = struct type t = Michelson_v1_primitives.prim let compare (x : t) (y : t) = Stdlib.compare x y diff --git a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune index 6b76db68f888202488be7c67497e572960656f49..462224db9f000df7009bb36c2fc12594abc5b7f2 100644 --- a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/dune @@ -17,6 +17,7 @@ (:standard) -open Tezos_stdlib -open Tezos_error_monad + -open Tezos_crypto -open Tezos_micheline -open Tezos_micheline_rewriting -open Tezos_protocol_012_Psithaca)) diff --git a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml index a015381180a0f79ee7409aba31368b0b4f6e03ba..fd2f752c2ccf1ca69f05783aa1bdfa1541d13546 100644 --- a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml +++ b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml @@ -27,8 +27,8 @@ open Protocol exception Term_contains_holes -module Mikhailsky_signature : Signature.S with type t = Mikhailsky_prim.prim = -struct +module Mikhailsky_signature : + Algebraic_signature.S with type t = Mikhailsky_prim.prim = struct type t = Mikhailsky_prim.prim let compare (x : t) (y : t) = Stdlib.compare x y @@ -386,18 +386,12 @@ module Data = struct let key_hash kh = let b = - Data_encoding.Binary.to_bytes_exn - Tezos_crypto.Signature.Public_key_hash.encoding - kh + Data_encoding.Binary.to_bytes_exn Signature.Public_key_hash.encoding kh in prim A_Key_hash [bytes b] [] let key k = - let b = - Data_encoding.Binary.to_bytes_exn - Tezos_crypto.Signature.Public_key.encoding - k - in + let b = Data_encoding.Binary.to_bytes_exn Signature.Public_key.encoding k in prim A_Key [bytes b] [] let integer (i : int) = prim A_Int [int (Z.of_int i)] [] diff --git a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli index 6285f6a39555d38ac12cdf88b2b9ff3331ca090e..e1126294383886cbea2c6daea3ba7d4e2a2588f7 100644 --- a/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli +++ b/src/proto_012_Psithaca/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli @@ -65,7 +65,8 @@ open Protocol *) (** The signature of Mikhailsky terms. *) -module Mikhailsky_signature : Signature.S with type t = Mikhailsky_prim.prim +module Mikhailsky_signature : + Algebraic_signature.S with type t = Mikhailsky_prim.prim (** Elements of type [Path.t] allow to index subterms of Mikhailsky terms. *) module Path : Path.S @@ -308,9 +309,9 @@ module Data : sig val mutez : Alpha_context.Tez.t -> node - val key_hash : Tezos_crypto.Signature.Public_key_hash.t -> node + val key_hash : Signature.Public_key_hash.t -> node - val key : Tezos_crypto.Signature.Public_key.t -> node + val key : Signature.Public_key.t -> node val integer : int -> node diff --git a/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.ml b/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.ml index c772d60f1008340a40ece47a8b5446fbd7c9e4e1..e6780d5ec62200afb4fc55f6f16c500d7dcb4b54 100644 --- a/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.ml +++ b/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.ml @@ -53,7 +53,7 @@ module type S = sig val nat : Alpha_context.Script_int.n Alpha_context.Script_int.num sampler - val signature : Tezos_crypto.Signature.t sampler + val signature : Signature.t sampler val string : Alpha_context.Script_string.t sampler diff --git a/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.mli b/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.mli index 975dd002bc1fca66f1357fcccc3acd999d42485d..a4e113804cb689030bd8bc76778e5738800a39a2 100644 --- a/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.mli +++ b/src/proto_012_Psithaca/lib_benchmark/michelson_samplers_base.mli @@ -47,7 +47,7 @@ module type S = sig val nat : Alpha_context.Script_int.n Alpha_context.Script_int.num sampler - val signature : Tezos_crypto.Signature.t sampler + val signature : Signature.t sampler val string : Alpha_context.Script_string.t sampler diff --git a/src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml index c78a0174083f0b267ff481c04c8845bdfa8326b3..6c7762fea6d0c1620bc51e2c11fd29be3247754d 100644 --- a/src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml +++ b/src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml @@ -1,4 +1,3 @@ -open Tezos_benchmark open Michelson_samplers open Protocol open Internal_for_tests @@ -47,7 +46,7 @@ module Type_name = struct let hash = Stdlib.Hashtbl.hash end -module Type_name_hashtbl = Hashtbl.Make (Type_name) +module Type_name_hashtbl = Stdlib.Hashtbl.Make (Type_name) let rec tnames_of_type : type a. a Script_typed_ir.ty -> type_name list -> type_name list = diff --git a/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_code.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_code.ml index c637d3944e1fe32a3976f482b0ba50a215fb5a78..e5e8edf378d5c87a4ab171f387d082a782e2e89d 100644 --- a/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_code.ml +++ b/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_code.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Tezos_benchmark - (* Input parameter parsing *) let verbose = diff --git a/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_data.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_data.ml index a93671d4e1023440806cd90175e5887618bbf54b..fb67a046d1ef33ccfd2970c4419e48a293c74273 100644 --- a/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_data.ml +++ b/src/proto_012_Psithaca/lib_benchmark/test/test_sampling_data.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Tezos_benchmark - (* Input parameter parsing *) let verbose = diff --git a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/dune index 9e80bfe152eef83c1c6dec40794e378812a92199..54a4c7df521b033b60a283f48000243d393ea7f1 100644 --- a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/dune @@ -17,6 +17,7 @@ (:standard) -open Tezos_stdlib -open Tezos_error_monad + -open Tezos_crypto -open Tezos_micheline -open Tezos_micheline_rewriting -open Tezos_protocol_013_PtJakart)) diff --git a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml index a015381180a0f79ee7409aba31368b0b4f6e03ba..fd2f752c2ccf1ca69f05783aa1bdfa1541d13546 100644 --- a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml +++ b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml @@ -27,8 +27,8 @@ open Protocol exception Term_contains_holes -module Mikhailsky_signature : Signature.S with type t = Mikhailsky_prim.prim = -struct +module Mikhailsky_signature : + Algebraic_signature.S with type t = Mikhailsky_prim.prim = struct type t = Mikhailsky_prim.prim let compare (x : t) (y : t) = Stdlib.compare x y @@ -386,18 +386,12 @@ module Data = struct let key_hash kh = let b = - Data_encoding.Binary.to_bytes_exn - Tezos_crypto.Signature.Public_key_hash.encoding - kh + Data_encoding.Binary.to_bytes_exn Signature.Public_key_hash.encoding kh in prim A_Key_hash [bytes b] [] let key k = - let b = - Data_encoding.Binary.to_bytes_exn - Tezos_crypto.Signature.Public_key.encoding - k - in + let b = Data_encoding.Binary.to_bytes_exn Signature.Public_key.encoding k in prim A_Key [bytes b] [] let integer (i : int) = prim A_Int [int (Z.of_int i)] [] diff --git a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli index 6285f6a39555d38ac12cdf88b2b9ff3331ca090e..e1126294383886cbea2c6daea3ba7d4e2a2588f7 100644 --- a/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli +++ b/src/proto_013_PtJakart/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli @@ -65,7 +65,8 @@ open Protocol *) (** The signature of Mikhailsky terms. *) -module Mikhailsky_signature : Signature.S with type t = Mikhailsky_prim.prim +module Mikhailsky_signature : + Algebraic_signature.S with type t = Mikhailsky_prim.prim (** Elements of type [Path.t] allow to index subterms of Mikhailsky terms. *) module Path : Path.S @@ -308,9 +309,9 @@ module Data : sig val mutez : Alpha_context.Tez.t -> node - val key_hash : Tezos_crypto.Signature.Public_key_hash.t -> node + val key_hash : Signature.Public_key_hash.t -> node - val key : Tezos_crypto.Signature.Public_key.t -> node + val key : Signature.Public_key.t -> node val integer : int -> node diff --git a/src/proto_013_PtJakart/lib_benchmark/michelson_samplers_base.ml b/src/proto_013_PtJakart/lib_benchmark/michelson_samplers_base.ml index c772d60f1008340a40ece47a8b5446fbd7c9e4e1..e6780d5ec62200afb4fc55f6f16c500d7dcb4b54 100644 --- a/src/proto_013_PtJakart/lib_benchmark/michelson_samplers_base.ml +++ b/src/proto_013_PtJakart/lib_benchmark/michelson_samplers_base.ml @@ -53,7 +53,7 @@ module type S = sig val nat : Alpha_context.Script_int.n Alpha_context.Script_int.num sampler - val signature : Tezos_crypto.Signature.t sampler + val signature : Signature.t sampler val string : Alpha_context.Script_string.t sampler diff --git a/src/proto_013_PtJakart/lib_benchmark/michelson_samplers_base.mli b/src/proto_013_PtJakart/lib_benchmark/michelson_samplers_base.mli index 975dd002bc1fca66f1357fcccc3acd999d42485d..a4e113804cb689030bd8bc76778e5738800a39a2 100644 --- a/src/proto_013_PtJakart/lib_benchmark/michelson_samplers_base.mli +++ b/src/proto_013_PtJakart/lib_benchmark/michelson_samplers_base.mli @@ -47,7 +47,7 @@ module type S = sig val nat : Alpha_context.Script_int.n Alpha_context.Script_int.num sampler - val signature : Tezos_crypto.Signature.t sampler + val signature : Signature.t sampler val string : Alpha_context.Script_string.t sampler diff --git a/src/proto_013_PtJakart/lib_benchmark/test/test_distribution.ml b/src/proto_013_PtJakart/lib_benchmark/test/test_distribution.ml index 5f1a28b3161660e903703c24e17eba5420af9150..a9eadcab62f1afefa93c3a53f905f5635251385e 100644 --- a/src/proto_013_PtJakart/lib_benchmark/test/test_distribution.ml +++ b/src/proto_013_PtJakart/lib_benchmark/test/test_distribution.ml @@ -1,4 +1,3 @@ -open Tezos_benchmark open Michelson_samplers open Protocol open Internal_for_tests @@ -49,7 +48,7 @@ module Type_name = struct let hash = Stdlib.Hashtbl.hash end -module Type_name_hashtbl = Hashtbl.Make (Type_name) +module Type_name_hashtbl = Stdlib.Hashtbl.Make (Type_name) let rec tnames_of_type : type a ac. (a, ac) Script_typed_ir.ty -> type_name list -> type_name list = diff --git a/src/proto_013_PtJakart/lib_benchmark/test/test_sampling_code.ml b/src/proto_013_PtJakart/lib_benchmark/test/test_sampling_code.ml index c637d3944e1fe32a3976f482b0ba50a215fb5a78..e5e8edf378d5c87a4ab171f387d082a782e2e89d 100644 --- a/src/proto_013_PtJakart/lib_benchmark/test/test_sampling_code.ml +++ b/src/proto_013_PtJakart/lib_benchmark/test/test_sampling_code.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Tezos_benchmark - (* Input parameter parsing *) let verbose = diff --git a/src/proto_013_PtJakart/lib_benchmark/test/test_sampling_data.ml b/src/proto_013_PtJakart/lib_benchmark/test/test_sampling_data.ml index a93671d4e1023440806cd90175e5887618bbf54b..fb67a046d1ef33ccfd2970c4419e48a293c74273 100644 --- a/src/proto_013_PtJakart/lib_benchmark/test/test_sampling_data.ml +++ b/src/proto_013_PtJakart/lib_benchmark/test/test_sampling_data.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Tezos_benchmark - (* Input parameter parsing *) let verbose = diff --git a/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/dune index bf031dccb9e14bd5a39f6d2182ef2b33e63a89ef..375d3dd64dd0b37550508a42d23ef5be4470ccef 100644 --- a/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/dune @@ -17,6 +17,7 @@ (:standard) -open Tezos_stdlib -open Tezos_error_monad + -open Tezos_crypto -open Tezos_micheline -open Tezos_micheline_rewriting -open Tezos_protocol_014_PtKathma)) diff --git a/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml b/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml index e32e4fabcde27afd24ca40d00de67086c870ee59..5672070a26e740415ac526d6012b1eb3dab118fc 100644 --- a/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml +++ b/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml @@ -27,8 +27,8 @@ open Protocol exception Term_contains_holes -module Mikhailsky_signature : Signature.S with type t = Mikhailsky_prim.prim = -struct +module Mikhailsky_signature : + Algebraic_signature.S with type t = Mikhailsky_prim.prim = struct type t = Mikhailsky_prim.prim let compare (x : t) (y : t) = Stdlib.compare x y @@ -386,18 +386,12 @@ module Data = struct let key_hash kh = let b = - Data_encoding.Binary.to_bytes_exn - Tezos_crypto.Signature.Public_key_hash.encoding - kh + Data_encoding.Binary.to_bytes_exn Signature.Public_key_hash.encoding kh in prim A_Key_hash [bytes b] [] let key k = - let b = - Data_encoding.Binary.to_bytes_exn - Tezos_crypto.Signature.Public_key.encoding - k - in + let b = Data_encoding.Binary.to_bytes_exn Signature.Public_key.encoding k in prim A_Key [bytes b] [] let integer (i : int) = prim A_Int [int (Z.of_int i)] [] diff --git a/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli b/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli index e8c5b3ac5e19901d4cfe1307c00878b1be08f7c1..4cebbffb4467867f921d23f4921d00fcca564d32 100644 --- a/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli +++ b/src/proto_014_PtKathma/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli @@ -65,7 +65,8 @@ open Protocol *) (** The signature of Mikhailsky terms. *) -module Mikhailsky_signature : Signature.S with type t = Mikhailsky_prim.prim +module Mikhailsky_signature : + Algebraic_signature.S with type t = Mikhailsky_prim.prim (** Elements of type [Path.t] allow to index subterms of Mikhailsky terms. *) module Path : Path.S @@ -308,9 +309,9 @@ module Data : sig val mutez : Alpha_context.Tez.t -> node - val key_hash : Tezos_crypto.Signature.Public_key_hash.t -> node + val key_hash : Signature.Public_key_hash.t -> node - val key : Tezos_crypto.Signature.Public_key.t -> node + val key : Signature.Public_key.t -> node val integer : int -> node diff --git a/src/proto_014_PtKathma/lib_benchmark/michelson_samplers_base.ml b/src/proto_014_PtKathma/lib_benchmark/michelson_samplers_base.ml index 586c2176e626375293b53e8c80dd582daa28e6b9..92ffe284fcee334f17695bff3474870845075286 100644 --- a/src/proto_014_PtKathma/lib_benchmark/michelson_samplers_base.ml +++ b/src/proto_014_PtKathma/lib_benchmark/michelson_samplers_base.ml @@ -53,7 +53,7 @@ module type S = sig val nat : Script_int.n Script_int.num sampler - val signature : Tezos_crypto.Signature.t sampler + val signature : Signature.t sampler val string : Script_string.t sampler diff --git a/src/proto_014_PtKathma/lib_benchmark/michelson_samplers_base.mli b/src/proto_014_PtKathma/lib_benchmark/michelson_samplers_base.mli index 18a150245cfce7b351421295d52b40c6bb140116..339ad824e4cc1d4394b5d0414ce2c0ec5afc31e2 100644 --- a/src/proto_014_PtKathma/lib_benchmark/michelson_samplers_base.mli +++ b/src/proto_014_PtKathma/lib_benchmark/michelson_samplers_base.mli @@ -47,7 +47,7 @@ module type S = sig val nat : Script_int.n Script_int.num sampler - val signature : Tezos_crypto.Signature.t sampler + val signature : Signature.t sampler val string : Script_string.t sampler diff --git a/src/proto_014_PtKathma/lib_benchmark/test/test_distribution.ml b/src/proto_014_PtKathma/lib_benchmark/test/test_distribution.ml index ce8866dd7afe796e6c888a3e76f65cfc27f8f239..7822b5b6e08cd476377340106be16136c9142616 100644 --- a/src/proto_014_PtKathma/lib_benchmark/test/test_distribution.ml +++ b/src/proto_014_PtKathma/lib_benchmark/test/test_distribution.ml @@ -1,4 +1,3 @@ -open Tezos_benchmark open Michelson_samplers open Protocol open Internal_for_tests @@ -49,7 +48,7 @@ module Type_name = struct let hash = Stdlib.Hashtbl.hash end -module Type_name_hashtbl = Hashtbl.Make (Type_name) +module Type_name_hashtbl = Stdlib.Hashtbl.Make (Type_name) let rec tnames_of_type : type a ac. (a, ac) Script_typed_ir.ty -> type_name list -> type_name list = diff --git a/src/proto_014_PtKathma/lib_benchmark/test/test_sampling_code.ml b/src/proto_014_PtKathma/lib_benchmark/test/test_sampling_code.ml index c637d3944e1fe32a3976f482b0ba50a215fb5a78..e5e8edf378d5c87a4ab171f387d082a782e2e89d 100644 --- a/src/proto_014_PtKathma/lib_benchmark/test/test_sampling_code.ml +++ b/src/proto_014_PtKathma/lib_benchmark/test/test_sampling_code.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Tezos_benchmark - (* Input parameter parsing *) let verbose = diff --git a/src/proto_014_PtKathma/lib_benchmark/test/test_sampling_data.ml b/src/proto_014_PtKathma/lib_benchmark/test/test_sampling_data.ml index a93671d4e1023440806cd90175e5887618bbf54b..fb67a046d1ef33ccfd2970c4419e48a293c74273 100644 --- a/src/proto_014_PtKathma/lib_benchmark/test/test_sampling_data.ml +++ b/src/proto_014_PtKathma/lib_benchmark/test/test_sampling_data.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Tezos_benchmark - (* Input parameter parsing *) let verbose = diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune index 59ed88cf18f41e491a20547728e5e3c5c1dce001..d77fee8c6414e0612c6a3cd3ced8f46be6e0de73 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune @@ -17,6 +17,7 @@ (:standard) -open Tezos_stdlib -open Tezos_error_monad + -open Tezos_crypto -open Tezos_micheline -open Tezos_micheline_rewriting -open Tezos_protocol_alpha)) diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml index e32e4fabcde27afd24ca40d00de67086c870ee59..5672070a26e740415ac526d6012b1eb3dab118fc 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky.ml @@ -27,8 +27,8 @@ open Protocol exception Term_contains_holes -module Mikhailsky_signature : Signature.S with type t = Mikhailsky_prim.prim = -struct +module Mikhailsky_signature : + Algebraic_signature.S with type t = Mikhailsky_prim.prim = struct type t = Mikhailsky_prim.prim let compare (x : t) (y : t) = Stdlib.compare x y @@ -386,18 +386,12 @@ module Data = struct let key_hash kh = let b = - Data_encoding.Binary.to_bytes_exn - Tezos_crypto.Signature.Public_key_hash.encoding - kh + Data_encoding.Binary.to_bytes_exn Signature.Public_key_hash.encoding kh in prim A_Key_hash [bytes b] [] let key k = - let b = - Data_encoding.Binary.to_bytes_exn - Tezos_crypto.Signature.Public_key.encoding - k - in + let b = Data_encoding.Binary.to_bytes_exn Signature.Public_key.encoding k in prim A_Key [bytes b] [] let integer (i : int) = prim A_Int [int (Z.of_int i)] [] diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli index e8c5b3ac5e19901d4cfe1307c00878b1be08f7c1..4cebbffb4467867f921d23f4921d00fcca564d32 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky.mli @@ -65,7 +65,8 @@ open Protocol *) (** The signature of Mikhailsky terms. *) -module Mikhailsky_signature : Signature.S with type t = Mikhailsky_prim.prim +module Mikhailsky_signature : + Algebraic_signature.S with type t = Mikhailsky_prim.prim (** Elements of type [Path.t] allow to index subterms of Mikhailsky terms. *) module Path : Path.S @@ -308,9 +309,9 @@ module Data : sig val mutez : Alpha_context.Tez.t -> node - val key_hash : Tezos_crypto.Signature.Public_key_hash.t -> node + val key_hash : Signature.Public_key_hash.t -> node - val key : Tezos_crypto.Signature.Public_key.t -> node + val key : Signature.Public_key.t -> node val integer : int -> node diff --git a/src/proto_alpha/lib_benchmark/test/test_distribution.ml b/src/proto_alpha/lib_benchmark/test/test_distribution.ml index ce8866dd7afe796e6c888a3e76f65cfc27f8f239..7822b5b6e08cd476377340106be16136c9142616 100644 --- a/src/proto_alpha/lib_benchmark/test/test_distribution.ml +++ b/src/proto_alpha/lib_benchmark/test/test_distribution.ml @@ -1,4 +1,3 @@ -open Tezos_benchmark open Michelson_samplers open Protocol open Internal_for_tests @@ -49,7 +48,7 @@ module Type_name = struct let hash = Stdlib.Hashtbl.hash end -module Type_name_hashtbl = Hashtbl.Make (Type_name) +module Type_name_hashtbl = Stdlib.Hashtbl.Make (Type_name) let rec tnames_of_type : type a ac. (a, ac) Script_typed_ir.ty -> type_name list -> type_name list = diff --git a/src/proto_alpha/lib_benchmark/test/test_sampling_code.ml b/src/proto_alpha/lib_benchmark/test/test_sampling_code.ml index c637d3944e1fe32a3976f482b0ba50a215fb5a78..e5e8edf378d5c87a4ab171f387d082a782e2e89d 100644 --- a/src/proto_alpha/lib_benchmark/test/test_sampling_code.ml +++ b/src/proto_alpha/lib_benchmark/test/test_sampling_code.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Tezos_benchmark - (* Input parameter parsing *) let verbose = diff --git a/src/proto_alpha/lib_benchmark/test/test_sampling_data.ml b/src/proto_alpha/lib_benchmark/test/test_sampling_data.ml index a93671d4e1023440806cd90175e5887618bbf54b..fb67a046d1ef33ccfd2970c4419e48a293c74273 100644 --- a/src/proto_alpha/lib_benchmark/test/test_sampling_data.ml +++ b/src/proto_alpha/lib_benchmark/test/test_sampling_data.ml @@ -23,8 +23,6 @@ (* *) (*****************************************************************************) -open Tezos_benchmark - (* Input parameter parsing *) let verbose =