Refactor: Move Blake2B.Make instanciation into Tezos_base

src/lib_base/block_hash.mli

@@ -7,4 +7,4 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include S.INTERNAL_HASH
+include Tezos_crypto.S.INTERNAL_HASH

src/lib_base/context_hash.mli

@@ -7,4 +7,4 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include S.INTERNAL_HASH
+include Tezos_crypto.S.INTERNAL_HASH

src/lib_base/net_id.ml

@@ -7,6 +7,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
+open Error_monad
+
 type t = string
 
 let name = "Net_id"

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

src/lib_base/operation_hash.mli

@@ -7,4 +7,4 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include S.INTERNAL_HASH
+include Tezos_crypto.S.INTERNAL_HASH

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
 

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

src/lib_base/protocol_hash.mli

@@ -7,4 +7,4 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include S.INTERNAL_HASH
+include Tezos_crypto.S.INTERNAL_HASH

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
 

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))

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
 @.|}

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