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

Alpha: fix some comments about non gazeified functions

Browse Source
This commit is contained in:
Benjamin Canou 2018-06-29 12:54:53 +02:00
parent 2db455274c
commit 820fb9ab18
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/proto_alpha/lib_protocol/src/contract_services.ml
View File

@ -168,7 +168,7 @@ let register () =
let ctxt = Gas.set_unlimited ctxt in
let open Script_ir_translator in
parse_script ctxt script >>=? fun (Ex_script script, ctxt) ->
unparse_script ctxt Readable script >>=? fun script ->
unparse_script ctxt Readable script >>=? fun (script, ctxt) ->
Script.force_decode ctxt script.storage >>=? fun (storage, _ctxt) ->
return_some storage) ;
register_field S.info (fun ctxt contract ->
@ -185,7 +185,7 @@ let register () =
let ctxt = Gas.set_unlimited ctxt in
let open Script_ir_translator in
parse_script ctxt script >>=? fun (Ex_script script, ctxt) ->
unparse_script ctxt Readable script >>=? fun script ->
unparse_script ctxt Readable script >>=? fun (script, ctxt) ->
return (Some script, ctxt)
end >>=? fun (script, _ctxt) ->
return { manager ; balance ;

16
src/proto_alpha/lib_protocol/src/script_ir_translator.ml
View File

@ -2978,12 +2978,13 @@ let rec unparse_data
| Lambda_t _, Lam (_, original_code) ->
unparse_code ctxt mode (root original_code)
(* only used in client, don't account for gas *)
(* Gas accounting may not be perfect in this function, as it is only called by RPCs. *)
and unparse_code ctxt mode = function
| Prim (loc, I_PUSH, [ ty ; data ], annot) ->
Lwt.return (parse_ty ctxt ~allow_big_map:false ~allow_operation:false ty) >>=? fun (Ex_ty t, ctxt) ->
parse_data ctxt t data >>=? fun (data, ctxt) ->
unparse_data ctxt mode t data >>=? fun (data, ctxt) ->
Lwt.return (Gas.consume ctxt (Unparse_costs.prim_cost 2 annot)) >>=? fun ctxt ->
return (Prim (loc, I_PUSH, [ ty ; data ], annot), ctxt)
| Seq (loc, items) ->
fold_left_s
@ -2991,6 +2992,7 @@ and unparse_code ctxt mode = function
unparse_code ctxt mode item >>=? fun (item, ctxt) ->
return (item :: l, ctxt))
([], ctxt) items >>=? fun (items, ctxt) ->
Lwt.return (Gas.consume ctxt (Unparse_costs.seq_cost (List.length items))) >>=? fun ctxt ->
return (Micheline.Seq (loc, List.rev items), ctxt)
| Prim (loc, prim, items, annot) ->
fold_left_s
@ -2998,23 +3000,29 @@ and unparse_code ctxt mode = function
unparse_code ctxt mode item >>=? fun (item, ctxt) ->
return (item :: l, ctxt))
([], ctxt) items >>=? fun (items, ctxt) ->
Lwt.return (Gas.consume ctxt (Unparse_costs.prim_cost 3 annot)) >>=? fun ctxt ->
return (Prim (loc, prim, List.rev items, annot), ctxt)
| Int _ | String _ | Bytes _ as atom -> return (atom, ctxt)
(* only used in client, don't account for gas *)
(* Gas accounting may not be perfect in this function, as it is only called by RPCs. *)
let unparse_script ctxt mode { code ; arg_type ; storage ; storage_type } =
let Lam (_, original_code) = code in
unparse_code ctxt mode (root original_code) >>=? fun (code, ctxt) ->
unparse_data ctxt mode storage_type storage >>=? fun (storage, ctxt) ->
unparse_ty ctxt arg_type >>=? fun (arg_type, ctxt) ->
unparse_ty ctxt storage_type >>=? fun (storage_type, _ctxt) ->
unparse_ty ctxt storage_type >>=? fun (storage_type, ctxt) ->
let open Micheline in
let code =
Seq (-1, [ Prim (-1, K_parameter, [ arg_type ], []) ;
Prim (-1, K_storage, [ storage_type ], []) ;
Prim (-1, K_code, [ code ], []) ]) in
Lwt.return
(Gas.consume ctxt (Unparse_costs.seq_cost 3) >>? fun ctxt ->
Gas.consume ctxt (Unparse_costs.prim_cost 1 []) >>? fun ctxt ->
Gas.consume ctxt (Unparse_costs.prim_cost 1 []) >>? fun ctxt ->
Gas.consume ctxt (Unparse_costs.prim_cost 1 [])) >>=? fun ctxt ->
return ({ code = lazy_expr (strip_locations code) ;
storage = lazy_expr (strip_locations storage) })
storage = lazy_expr (strip_locations storage) }, ctxt)
let pack_data ctxt typ data =
unparse_data ctxt Optimized typ data >>=? fun (data, ctxt) ->

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

@ -92,10 +92,10 @@ val parse_script :
?type_logger: type_logger ->
context -> Script.t -> (ex_script * context) tzresult Lwt.t
(* only used in client, don't account for gas *)
(* Gas accounting may not be perfect in this function, as it is only called by RPCs. *)
val unparse_script :
context -> unparsing_mode ->
('a, 'b) Script_typed_ir.script -> Script.t tzresult Lwt.t
('a, 'b) Script_typed_ir.script -> (Script.t * context) tzresult Lwt.t
val parse_contract :
context -> Script.location -> 'a Script_typed_ir.ty -> Contract.t ->