From d11bc0b996087f945353dab975f4b1de29cb9758 Mon Sep 17 00:00:00 2001 From: Pierre Chambart Date: Fri, 1 Jun 2018 17:41:38 +0200 Subject: [PATCH] Alpha: Remove empty module type --- src/proto_alpha/lib_protocol/src/storage.mli | 6 +++--- .../lib_protocol/src/storage_functors.ml | 6 +++--- .../lib_protocol/src/storage_functors.mli | 6 +++--- src/proto_alpha/lib_protocol/src/storage_sigs.ml | 13 +++---------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/proto_alpha/lib_protocol/src/storage.mli b/src/proto_alpha/lib_protocol/src/storage.mli index abcd79f4e..dfd55a551 100644 --- a/src/proto_alpha/lib_protocol/src/storage.mli +++ b/src/proto_alpha/lib_protocol/src/storage.mli @@ -162,12 +162,12 @@ module Contract : sig and type value = int32 and type t := Raw_context.t - module Code : Indexed_carbonated_data_storage + module Code : Non_iterable_indexed_carbonated_data_storage with type key = Contract_repr.t and type value = Script_repr.lazy_expr and type t := Raw_context.t - module Storage : Indexed_carbonated_data_storage + module Storage : Non_iterable_indexed_carbonated_data_storage with type key = Contract_repr.t and type value = Script_repr.lazy_expr and type t := Raw_context.t @@ -187,7 +187,7 @@ module Contract : sig type bigmap_key = Raw_context.t * Contract_repr.t - module Big_map : Indexed_carbonated_data_storage + module Big_map : Non_iterable_indexed_carbonated_data_storage with type key = string and type value = Script_repr.expr and type t := bigmap_key diff --git a/src/proto_alpha/lib_protocol/src/storage_functors.ml b/src/proto_alpha/lib_protocol/src/storage_functors.ml index f2d3ddc32..6d06d9677 100644 --- a/src/proto_alpha/lib_protocol/src/storage_functors.ml +++ b/src/proto_alpha/lib_protocol/src/storage_functors.ml @@ -315,9 +315,9 @@ end module Make_indexed_carbonated_data_storage (C : Raw_context.T) (I : INDEX) (V : CARBONATED_VALUE) - : Indexed_carbonated_data_storage with type t = C.t - and type key = I.t - and type value = V.t = struct + : Non_iterable_indexed_carbonated_data_storage with type t = C.t + and type key = I.t + and type value = V.t = struct type t = C.t type context = t type key = I.t diff --git a/src/proto_alpha/lib_protocol/src/storage_functors.mli b/src/proto_alpha/lib_protocol/src/storage_functors.mli index 529d1832c..754550b6b 100644 --- a/src/proto_alpha/lib_protocol/src/storage_functors.mli +++ b/src/proto_alpha/lib_protocol/src/storage_functors.mli @@ -43,9 +43,9 @@ module Make_indexed_data_storage module Make_indexed_carbonated_data_storage (C : Raw_context.T) (I : INDEX) (V : CARBONATED_VALUE) - : Indexed_carbonated_data_storage with type t = C.t - and type key = I.t - and type value = V.t + : Non_iterable_indexed_carbonated_data_storage with type t = C.t + and type key = I.t + and type value = V.t module Make_indexed_data_snapshotable_storage (C : Raw_context.T) (Snapshot : INDEX) (I : INDEX) (V : VALUE) diff --git a/src/proto_alpha/lib_protocol/src/storage_sigs.ml b/src/proto_alpha/lib_protocol/src/storage_sigs.ml index 949617998..ac2ed73f0 100644 --- a/src/proto_alpha/lib_protocol/src/storage_sigs.ml +++ b/src/proto_alpha/lib_protocol/src/storage_sigs.ml @@ -277,13 +277,6 @@ module type Indexed_data_storage = sig end -(** Variant of {!Indexed_data_storage} with gas accounting. *) -module type Indexed_carbonated_data_storage = sig - - include Non_iterable_indexed_carbonated_data_storage - -end - module type Indexed_data_snapshotable_storage = sig type snapshot type key @@ -379,9 +372,9 @@ module type Indexed_raw_context = sig and type value = V.t module Make_carbonated_map (N : NAME) (V : CARBONATED_VALUE) - : Indexed_carbonated_data_storage with type t = t - and type key = key - and type value = V.t + : Non_iterable_indexed_carbonated_data_storage with type t = t + and type key = key + and type value = V.t module Raw_context : Raw_context.T with type t = t ipath