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

Remove explicit references to the module Error_monad

Browse Source
This commit is contained in:
Grégoire Henry 2017-12-07 17:43:21 +01:00 committed by Benjamin Canou
parent 34cca61f7b
commit af8dd63e41
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib_client_base/client_rpcs.ml
View File

@ -189,28 +189,26 @@ let fail config err = fail (RPC_error (config, err))
class type rpc_sig = object class type rpc_sig = object
method get_json : method get_json :
RPC.meth -> RPC.meth ->
string list -> Data_encoding.json -> Data_encoding.json Error_monad.tzresult Lwt.t string list -> Data_encoding.json -> Data_encoding.json tzresult Lwt.t
method get_streamed_json : method get_streamed_json :
RPC.meth -> RPC.meth ->
string list -> string list ->
Data_encoding.json -> Data_encoding.json ->
(Data_encoding.json, Error_monad.error list) result Lwt_stream.t Data_encoding.json tzresult Lwt_stream.t tzresult Lwt.t
Error_monad.tzresult Lwt.t
method make_request : method make_request :
(Uri.t -> Data_encoding.json -> 'a Lwt.t) -> (Uri.t -> Data_encoding.json -> 'a Lwt.t) ->
RPC.meth -> RPC.meth ->
string list -> string list ->
Data_encoding.json -> Data_encoding.json ->
('a * Cohttp.Code.status_code * Cohttp_lwt.Body.t) ('a * Cohttp.Code.status_code * Cohttp_lwt.Body.t) tzresult Lwt.t
Error_monad.tzresult Lwt.t
method parse_answer : method parse_answer :
(unit, 'b, 'c, 'd) RPC.service -> (unit, 'b, 'c, 'd) RPC.service ->
string list -> string list ->
Data_encoding.json -> 'd Error_monad.tzresult Lwt.t Data_encoding.json -> 'd tzresult Lwt.t
method parse_err_answer : method parse_err_answer :
(unit, 'e, 'f, 'g Error_monad.tzresult) RPC.service -> (unit, 'e, 'f, 'g tzresult) RPC.service ->
string list -> string list ->
Data_encoding.json -> 'g Error_monad.tzresult Lwt.t Data_encoding.json -> 'g tzresult Lwt.t
end end
class rpc config = object (self) class rpc config = object (self)
@ -220,8 +218,7 @@ class rpc config = object (self)
RPC.meth -> RPC.meth ->
string list -> string list ->
Data_encoding.json -> Data_encoding.json ->
(a * Cohttp.Code.status_code * Cohttp_lwt.Body.t) (a * Cohttp.Code.status_code * Cohttp_lwt.Body.t) tzresult Lwt.t =
Error_monad.tzresult Lwt.t =
fun log_request meth service json -> fun log_request meth service json ->
let scheme = if config.tls then "https" else "http" in let scheme = if config.tls then "https" else "http" in
let path = String.concat "/" service in let path = String.concat "/" service in
@ -277,7 +274,7 @@ class rpc config = object (self)
method parse_answer : type b c d. (unit, b, c, d) RPC.service -> method parse_answer : type b c d. (unit, b, c, d) RPC.service ->
string list -> string list ->
Data_encoding.json -> d Error_monad.tzresult Lwt.t = Data_encoding.json -> d tzresult Lwt.t =
fun service path json -> fun service path json ->
match Data_encoding.Json.destruct (RPC.Service.output_encoding service) json with match Data_encoding.Json.destruct (RPC.Service.output_encoding service) json with
| exception msg -> | exception msg ->
@ -288,7 +285,7 @@ class rpc config = object (self)
method get_json : RPC.meth -> method get_json : RPC.meth ->
string list -> Data_encoding.json -> Data_encoding.json Error_monad.tzresult Lwt.t = string list -> Data_encoding.json -> Data_encoding.json tzresult Lwt.t =
fun meth service json -> fun meth service json ->
let Logger logger = config.logger in let Logger logger = config.logger in
self#make_request logger.log_request self#make_request logger.log_request
@ -312,9 +309,9 @@ class rpc config = object (self)
fail config (Request_failed (service, err)) fail config (Request_failed (service, err))
method parse_err_answer : type e f g. method parse_err_answer : type e f g.
(unit, e, f, g Error_monad.tzresult) RPC.service -> (unit, e, f, g tzresult) RPC.service ->
string list -> string list ->
Data_encoding.json -> g Error_monad.tzresult Lwt.t = Data_encoding.json -> g tzresult Lwt.t =
fun service path json -> fun service path json ->
match Data_encoding.Json.destruct (RPC.Service.output_encoding service) json with match Data_encoding.Json.destruct (RPC.Service.output_encoding service) json with
| exception msg -> (* TODO print_error *) | exception msg -> (* TODO print_error *)

18
lib_client_base/client_rpcs.mli
View File

@ -27,28 +27,26 @@ class type rpc_sig = object
method get_json : method get_json :
RPC.meth -> RPC.meth ->
string list -> Data_encoding.json -> string list -> Data_encoding.json ->
Data_encoding.json Error_monad.tzresult Lwt.t Data_encoding.json tzresult Lwt.t
method get_streamed_json : method get_streamed_json :
RPC.meth -> RPC.meth ->
string list -> string list ->
Data_encoding.json -> Data_encoding.json ->
(Data_encoding.json, Error_monad.error list) result Lwt_stream.t Data_encoding.json tzresult Lwt_stream.t tzresult Lwt.t
Error_monad.tzresult Lwt.t
method make_request : method make_request :
(Uri.t -> Data_encoding.json -> 'a Lwt.t) -> (Uri.t -> Data_encoding.json -> 'a Lwt.t) ->
RPC.meth -> RPC.meth ->
string list -> string list ->
Data_encoding.json -> Data_encoding.json ->
('a * Cohttp.Code.status_code * Cohttp_lwt.Body.t) ('a * Cohttp.Code.status_code * Cohttp_lwt.Body.t) tzresult Lwt.t
Error_monad.tzresult Lwt.t
method parse_answer : method parse_answer :
(unit, 'b, 'c, 'd) RPC.service -> (unit, 'b, 'c, 'd) RPC.service ->
string list -> string list ->
Data_encoding.json -> 'd Error_monad.tzresult Lwt.t Data_encoding.json -> 'd tzresult Lwt.t
method parse_err_answer : method parse_err_answer :
(unit, 'e, 'f, 'g Error_monad.tzresult) RPC.service -> (unit, 'e, 'f, 'g tzresult) RPC.service ->
string list -> string list ->
Data_encoding.json -> 'g Error_monad.tzresult Lwt.t Data_encoding.json -> 'g tzresult Lwt.t
end end
class rpc : config -> rpc_sig class rpc : config -> rpc_sig
@ -76,12 +74,12 @@ val call_service2:
val call_streamed_service0: val call_streamed_service0:
#rpc_sig -> #rpc_sig ->
(unit, unit, 'a, 'b) RPC.service -> (unit, unit, 'a, 'b) RPC.service ->
'a -> ('b, error list) result Lwt_stream.t tzresult Lwt.t 'a -> 'b tzresult Lwt_stream.t tzresult Lwt.t
val call_streamed_service1: val call_streamed_service1:
#rpc_sig -> #rpc_sig ->
(unit, unit * 'a, 'b, 'c) RPC.service -> (unit, unit * 'a, 'b, 'c) RPC.service ->
'a -> 'b -> ('c, error list) result Lwt_stream.t tzresult Lwt.t 'a -> 'b -> 'c tzresult Lwt_stream.t tzresult Lwt.t
val call_err_service0: val call_err_service0:
#rpc_sig -> #rpc_sig ->