balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Alpha: Simplify a few things after removing dead code.

Browse Source
This commit is contained in:
Pierre Chambart 2018-06-01 18:24:38 +02:00 committed by Benjamin Canou
parent 233273dff8
commit e9c42123cb
4 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/proto_alpha/lib_protocol/src/storage.ml
View File

@ -163,18 +163,18 @@ module Contract = struct
module Code = module Code =
Indexed_context.Make_carbonated_map Indexed_context.Make_carbonated_map
(struct let name = ["code"] end) (struct let name = ["code"] end)
(Make_carbonated_value(struct (struct
type t = Script_repr.lazy_expr type t = Script_repr.lazy_expr
let encoding = Script_repr.lazy_expr_encoding let encoding = Script_repr.lazy_expr_encoding
end)) end)
module Storage = module Storage =
Indexed_context.Make_carbonated_map Indexed_context.Make_carbonated_map
(struct let name = ["storage"] end) (struct let name = ["storage"] end)
(Make_carbonated_value(struct (struct
type t = Script_repr.lazy_expr type t = Script_repr.lazy_expr
let encoding = Script_repr.lazy_expr_encoding let encoding = Script_repr.lazy_expr_encoding
end)) end)
type bigmap_key = Raw_context.t * Contract_repr.t type bigmap_key = Raw_context.t * Contract_repr.t
@ -184,10 +184,10 @@ module Contract = struct
(Indexed_context.Raw_context) (Indexed_context.Raw_context)
(struct let name = ["big_map"] end)) (struct let name = ["big_map"] end))
(String_index) (String_index)
(Make_carbonated_value (struct (struct
type t = Script_repr.expr type t = Script_repr.expr
let encoding = Script_repr.expr_encoding let encoding = Script_repr.expr_encoding
end)) end)
module Paid_storage_space_fees = module Paid_storage_space_fees =
Indexed_context.Make_map Indexed_context.Make_map

13
src/proto_alpha/lib_protocol/src/storage_functors.ml
View File

@ -20,15 +20,6 @@ module Make_encoder (V : VALUE) = struct
| None -> MBytes.create 0 | None -> MBytes.create 0
end end
module Make_carbonated_value (V : VALUE) = struct
include V
let size =
match Data_encoding.classify V.encoding with
| `Fixed _size ->
assert false
| `Variable | `Dynamic -> Variable
end
let len_name = "len" let len_name = "len"
let data_name = "data" let data_name = "data"
@ -313,7 +304,7 @@ module Make_indexed_data_storage
end end
module Make_indexed_carbonated_data_storage module Make_indexed_carbonated_data_storage
(C : Raw_context.T) (I : INDEX) (V : CARBONATED_VALUE) (C : Raw_context.T) (I : INDEX) (V : VALUE)
: Non_iterable_indexed_carbonated_data_storage with type t = C.t : Non_iterable_indexed_carbonated_data_storage with type t = C.t
and type key = I.t and type key = I.t
and type value = V.t = struct and type value = V.t = struct
@ -742,7 +733,7 @@ module Make_indexed_subcontext (C : Raw_context.T) (I : INDEX)
end end
module Make_carbonated_map (N : NAME) (V : CARBONATED_VALUE) = struct module Make_carbonated_map (N : NAME) (V : VALUE) = struct
type t = C.t type t = C.t
type context = t type context = t
type key = I.t type key = I.t

4
src/proto_alpha/lib_protocol/src/storage_functors.mli
View File

@ -19,8 +19,6 @@ module Make_single_data_storage
: Single_data_storage with type t = C.t : Single_data_storage with type t = C.t
and type value = V.t and type value = V.t
module Make_carbonated_value (V : VALUE) : CARBONATED_VALUE with type t = V.t
module type INDEX = sig module type INDEX = sig
type t type t
val path_length: int val path_length: int
@ -42,7 +40,7 @@ module Make_indexed_data_storage
and type value = V.t and type value = V.t
module Make_indexed_carbonated_data_storage module Make_indexed_carbonated_data_storage
(C : Raw_context.T) (I : INDEX) (V : CARBONATED_VALUE) (C : Raw_context.T) (I : INDEX) (V : VALUE)
: Non_iterable_indexed_carbonated_data_storage with type t = C.t : Non_iterable_indexed_carbonated_data_storage with type t = C.t
and type key = I.t and type key = I.t
and type value = V.t and type value = V.t

11
src/proto_alpha/lib_protocol/src/storage_sigs.ml
View File

@ -338,15 +338,6 @@ module type VALUE = sig
val encoding: t Data_encoding.t val encoding: t Data_encoding.t
end end
type value_size =
| Fixed of int
| Variable
module type CARBONATED_VALUE = sig
include VALUE
val size: value_size
end
module type Indexed_raw_context = sig module type Indexed_raw_context = sig
type t type t
@ -371,7 +362,7 @@ module type Indexed_raw_context = sig
and type key = key and type key = key
and type value = V.t and type value = V.t
module Make_carbonated_map (N : NAME) (V : CARBONATED_VALUE) module Make_carbonated_map (N : NAME) (V : VALUE)
: Non_iterable_indexed_carbonated_data_storage with type t = t : Non_iterable_indexed_carbonated_data_storage with type t = t
and type key = key and type key = key
and type value = V.t and type value = V.t