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

Proto: avoid conflict between client errors

Browse Source
This commit is contained in:
Grégoire Henry 2018-07-19 01:28:08 +02:00
parent 8b01c52529
commit 9b9c3a1bee
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/proto_alpha/lib_client/michelson_v1_macros.ml
View File

@ -1092,6 +1092,7 @@ let rec unexpand_rec expr =
let () = let () =
let open Data_encoding in let open Data_encoding in
let open Proto_alpha in
register_error_kind register_error_kind
`Permanent `Permanent
~id:"michelson.macros.unexpected_annotation" ~id:"michelson.macros.unexpected_annotation"

9
src/proto_alpha/lib_client/proto_alpha.ml
View File

@ -66,3 +66,12 @@ class wrap_full (t : Client_context.full) : full = object
(t :> RPC_context.t) (t :> RPC_context.t)
Shell_services.Blocks.path Shell_services.Blocks.path
end end
let register_error_kind
category ~id ~title ~description ?pp
encoding from_error to_error =
let id = "client." ^ Name.name ^ "." ^ id in
register_error_kind
category ~id ~title ~description ?pp
encoding from_error to_error

8
src/proto_alpha/lib_protocol/test/helpers/proto_alpha.ml
View File

@ -37,3 +37,11 @@ end
include Proto include Proto
module M = Alpha_environment.Lift(Main) module M = Alpha_environment.Lift(Main)
let register_error_kind
category ~id ~title ~description ?pp
encoding from_error to_error =
let id = "client." ^ Name.name ^ "." ^ id in
register_error_kind
category ~id ~title ~description ?pp
encoding from_error to_error