From c4420ac40e5762273e6c43fa3f67a487bcfbd8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Tue, 23 Jan 2018 15:11:55 +0100 Subject: [PATCH] Refactor: Move `Blake2B.Make` instanciation into `Tezos_base` --- src/{lib_crypto => lib_base}/block_hash.ml | 0 src/{lib_crypto => lib_base}/block_hash.mli | 2 +- src/{lib_crypto => lib_base}/context_hash.ml | 0 src/{lib_crypto => lib_base}/context_hash.mli | 2 +- src/{lib_crypto => lib_base}/net_id.ml | 2 ++ src/{lib_crypto => lib_base}/net_id.mli | 2 +- src/{lib_crypto => lib_base}/operation_hash.ml | 0 src/{lib_crypto => lib_base}/operation_hash.mli | 2 +- src/{lib_crypto => lib_base}/operation_list_hash.ml | 0 src/{lib_crypto => lib_base}/operation_list_hash.mli | 2 +- .../operation_list_list_hash.ml | 0 .../operation_list_list_hash.mli | 2 +- src/{lib_crypto => lib_base}/protocol_hash.ml | 0 src/{lib_crypto => lib_base}/protocol_hash.mli | 2 +- src/lib_base/tzPervasives.ml | 10 +++++++++- src/lib_base/tzPervasives.mli | 10 +++++++++- src/lib_protocol_compiler/main_embedded_packer.ml | 2 +- src/lib_protocol_updater/tezos_protocol_environment.ml | 7 +++++++ 18 files changed, 35 insertions(+), 10 deletions(-) rename src/{lib_crypto => lib_base}/block_hash.ml (100%) rename src/{lib_crypto => lib_base}/block_hash.mli (94%) rename src/{lib_crypto => lib_base}/context_hash.ml (100%) rename src/{lib_crypto => lib_base}/context_hash.mli (94%) rename src/{lib_crypto => lib_base}/net_id.ml (99%) rename src/{lib_crypto => lib_base}/net_id.mli (94%) rename src/{lib_crypto => lib_base}/operation_hash.ml (100%) rename src/{lib_crypto => lib_base}/operation_hash.mli (94%) rename src/{lib_crypto => lib_base}/operation_list_hash.ml (100%) rename src/{lib_crypto => lib_base}/operation_list_hash.mli (88%) rename src/{lib_crypto => lib_base}/operation_list_list_hash.ml (100%) rename src/{lib_crypto => lib_base}/operation_list_list_hash.mli (88%) rename src/{lib_crypto => lib_base}/protocol_hash.ml (100%) rename src/{lib_crypto => lib_base}/protocol_hash.mli (94%) diff --git a/src/lib_crypto/block_hash.ml b/src/lib_base/block_hash.ml similarity index 100% rename from src/lib_crypto/block_hash.ml rename to src/lib_base/block_hash.ml diff --git a/src/lib_crypto/block_hash.mli b/src/lib_base/block_hash.mli similarity index 94% rename from src/lib_crypto/block_hash.mli rename to src/lib_base/block_hash.mli index c38290500..b92abd52c 100644 --- a/src/lib_crypto/block_hash.mli +++ b/src/lib_base/block_hash.mli @@ -7,4 +7,4 @@ (* *) (**************************************************************************) -include S.INTERNAL_HASH +include Tezos_crypto.S.INTERNAL_HASH diff --git a/src/lib_crypto/context_hash.ml b/src/lib_base/context_hash.ml similarity index 100% rename from src/lib_crypto/context_hash.ml rename to src/lib_base/context_hash.ml diff --git a/src/lib_crypto/context_hash.mli b/src/lib_base/context_hash.mli similarity index 94% rename from src/lib_crypto/context_hash.mli rename to src/lib_base/context_hash.mli index c38290500..b92abd52c 100644 --- a/src/lib_crypto/context_hash.mli +++ b/src/lib_base/context_hash.mli @@ -7,4 +7,4 @@ (* *) (**************************************************************************) -include S.INTERNAL_HASH +include Tezos_crypto.S.INTERNAL_HASH diff --git a/src/lib_crypto/net_id.ml b/src/lib_base/net_id.ml similarity index 99% rename from src/lib_crypto/net_id.ml rename to src/lib_base/net_id.ml index 1173b9f17..232aa506f 100644 --- a/src/lib_crypto/net_id.ml +++ b/src/lib_base/net_id.ml @@ -7,6 +7,8 @@ (* *) (**************************************************************************) +open Error_monad + type t = string let name = "Net_id" diff --git a/src/lib_crypto/net_id.mli b/src/lib_base/net_id.mli similarity index 94% rename from src/lib_crypto/net_id.mli rename to src/lib_base/net_id.mli index 4a6c70353..488a13245 100644 --- a/src/lib_crypto/net_id.mli +++ b/src/lib_base/net_id.mli @@ -7,5 +7,5 @@ (* *) (**************************************************************************) -include S.INTERNAL_HASH +include Tezos_crypto.S.INTERNAL_HASH val of_block_hash: Block_hash.t -> t diff --git a/src/lib_crypto/operation_hash.ml b/src/lib_base/operation_hash.ml similarity index 100% rename from src/lib_crypto/operation_hash.ml rename to src/lib_base/operation_hash.ml diff --git a/src/lib_crypto/operation_hash.mli b/src/lib_base/operation_hash.mli similarity index 94% rename from src/lib_crypto/operation_hash.mli rename to src/lib_base/operation_hash.mli index c38290500..b92abd52c 100644 --- a/src/lib_crypto/operation_hash.mli +++ b/src/lib_base/operation_hash.mli @@ -7,4 +7,4 @@ (* *) (**************************************************************************) -include S.INTERNAL_HASH +include Tezos_crypto.S.INTERNAL_HASH diff --git a/src/lib_crypto/operation_list_hash.ml b/src/lib_base/operation_list_hash.ml similarity index 100% rename from src/lib_crypto/operation_list_hash.ml rename to src/lib_base/operation_list_hash.ml diff --git a/src/lib_crypto/operation_list_hash.mli b/src/lib_base/operation_list_hash.mli similarity index 88% rename from src/lib_crypto/operation_list_hash.mli rename to src/lib_base/operation_list_hash.mli index 9ad1c3510..d562b52cd 100644 --- a/src/lib_crypto/operation_list_hash.mli +++ b/src/lib_base/operation_list_hash.mli @@ -7,5 +7,5 @@ (* *) (**************************************************************************) -include S.INTERNAL_MERKLE_TREE with type elt = Operation_hash.t +include Tezos_crypto.S.INTERNAL_MERKLE_TREE with type elt = Operation_hash.t diff --git a/src/lib_crypto/operation_list_list_hash.ml b/src/lib_base/operation_list_list_hash.ml similarity index 100% rename from src/lib_crypto/operation_list_list_hash.ml rename to src/lib_base/operation_list_list_hash.ml diff --git a/src/lib_crypto/operation_list_list_hash.mli b/src/lib_base/operation_list_list_hash.mli similarity index 88% rename from src/lib_crypto/operation_list_list_hash.mli rename to src/lib_base/operation_list_list_hash.mli index c9f2c631e..f9c1c7a24 100644 --- a/src/lib_crypto/operation_list_list_hash.mli +++ b/src/lib_base/operation_list_list_hash.mli @@ -7,4 +7,4 @@ (* *) (**************************************************************************) -include S.INTERNAL_MERKLE_TREE with type elt = Operation_list_hash.t +include Tezos_crypto.S.INTERNAL_MERKLE_TREE with type elt = Operation_list_hash.t diff --git a/src/lib_crypto/protocol_hash.ml b/src/lib_base/protocol_hash.ml similarity index 100% rename from src/lib_crypto/protocol_hash.ml rename to src/lib_base/protocol_hash.ml diff --git a/src/lib_crypto/protocol_hash.mli b/src/lib_base/protocol_hash.mli similarity index 94% rename from src/lib_crypto/protocol_hash.mli rename to src/lib_base/protocol_hash.mli index c38290500..b92abd52c 100644 --- a/src/lib_crypto/protocol_hash.mli +++ b/src/lib_base/protocol_hash.mli @@ -7,4 +7,4 @@ (* *) (**************************************************************************) -include S.INTERNAL_HASH +include Tezos_crypto.S.INTERNAL_HASH diff --git a/src/lib_base/tzPervasives.ml b/src/lib_base/tzPervasives.ml index 3072cdf95..efdda403b 100644 --- a/src/lib_base/tzPervasives.ml +++ b/src/lib_base/tzPervasives.ml @@ -9,10 +9,10 @@ include Tezos_stdlib include Tezos_stdlib_lwt -include Tezos_crypto include Tezos_data_encoding include Tezos_error_monad include Tezos_rpc +include Tezos_crypto module List = struct include List @@ -30,6 +30,14 @@ module Block_header = Block_header module Operation = Operation module Protocol = Protocol +module Net_id = Net_id +module Block_hash = Block_hash +module Operation_hash = Operation_hash +module Operation_list_hash = Operation_list_hash +module Operation_list_list_hash = Operation_list_list_hash +module Context_hash = Context_hash +module Protocol_hash = Protocol_hash + module Test_network_status = Test_network_status module Preapply_result = Preapply_result diff --git a/src/lib_base/tzPervasives.mli b/src/lib_base/tzPervasives.mli index 3c2ac4704..64e023a39 100644 --- a/src/lib_base/tzPervasives.mli +++ b/src/lib_base/tzPervasives.mli @@ -10,9 +10,9 @@ include (module type of (struct include Tezos_stdlib end)) include (module type of (struct include Tezos_data_encoding end)) include (module type of (struct include Tezos_stdlib_lwt end)) -include (module type of (struct include Tezos_crypto end)) include (module type of (struct include Tezos_error_monad end)) include (module type of (struct include Tezos_rpc end)) +include (module type of (struct include Tezos_crypto end)) module List : sig include (module type of (struct include List end)) @@ -34,5 +34,13 @@ module Preapply_result = Preapply_result module Block_locator = Block_locator module Mempool = Mempool +module Net_id = Net_id +module Block_hash = Block_hash +module Operation_hash = Operation_hash +module Operation_list_hash = Operation_list_hash +module Operation_list_list_hash = Operation_list_list_hash +module Context_hash = Context_hash +module Protocol_hash = Protocol_hash + include (module type of (struct include Utils.Infix end)) include (module type of (struct include Error_monad end)) diff --git a/src/lib_protocol_compiler/main_embedded_packer.ml b/src/lib_protocol_compiler/main_embedded_packer.ml index 0c115622f..3c3294616 100644 --- a/src/lib_protocol_compiler/main_embedded_packer.ml +++ b/src/lib_protocol_compiler/main_embedded_packer.ml @@ -16,7 +16,7 @@ let () = Format.printf {| module Source = struct let hash = - Some (Tezos_crypto.Protocol_hash.of_b58check_exn %S) + Some (Tezos_base.Protocol_hash.of_b58check_exn %S) let sources = Tezos_base.Protocol.%a end @.|} diff --git a/src/lib_protocol_updater/tezos_protocol_environment.ml b/src/lib_protocol_updater/tezos_protocol_environment.ml index 9d7280f47..e07130166 100644 --- a/src/lib_protocol_updater/tezos_protocol_environment.ml +++ b/src/lib_protocol_updater/tezos_protocol_environment.ml @@ -43,6 +43,13 @@ module Make(Param : sig val name: string end)() = struct module Hash = struct include Tezos_crypto include Tezos_crypto.S + module Net_id = Net_id + module Block_hash = Block_hash + module Operation_hash = Operation_hash + module Operation_list_hash = Operation_list_hash + module Operation_list_list_hash = Operation_list_list_hash + module Context_hash = Context_hash + module Protocol_hash = Protocol_hash module Make_minimal_Blake2B = Blake2B.Make_minimal module Make_Blake2B = Blake2B.Make end