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

RPC: remove deprecated type RPC.directory

Browse Source
This commit is contained in:
Grégoire Henry 2017-12-07 17:43:21 +01:00 committed by Benjamin Canou
parent bfb6694afb
commit 98755cd2a0
12 changed files with 23 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib_embedded_protocol_alpha/src/services_registration.ml
View File

@ -26,7 +26,7 @@ let rpc_init
Tezos_context.init ~level ~timestamp ~fitness context >>=? fun context ->
return { block_hash ; block_header ; operation_hashes ; operations ; context }
let rpc_services = ref (RPC.Directory.empty : Updater.rpc_context RPC.directory)
let rpc_services = ref (RPC.Directory.empty : Updater.rpc_context RPC.Directory.t)
let register0_fullctxt s f =
rpc_services :=

2
lib_embedded_protocol_demo/src/services.ml
View File

@ -49,7 +49,7 @@ let failing_service custom_root =
~error: Data_encoding.empty
RPC.Path.(custom_root / "failing")
let rpc_services : Updater.rpc_context RPC.directory =
let rpc_services : Updater.rpc_context RPC.Directory.t =
let dir = RPC.Directory.empty in
let dir =
RPC.register

2
lib_embedded_protocol_genesis/src/services.ml
View File

@ -60,7 +60,7 @@ let int64_to_bytes i =
let operations_hash =
Operation_list_list_hash.compute []
let rpc_services : Updater.rpc_context RPC.directory =
let rpc_services : Updater.rpc_context RPC.Directory.t =
let dir = RPC.Directory.empty in
let dir =
RPC.register

2
lib_node_http/RPC_server.ml
View File

@ -50,8 +50,6 @@ let octet_stream = {
(* Compatibility layer, to be removed ASAP. *)
type 'a directory = 'a Directory.t
let empty = Directory.empty
let register d s f = Directory.register d s (fun p () i -> f p i)

24
lib_node_http/RPC_server.mli
View File

@ -46,36 +46,34 @@ val shutdown : server -> unit Lwt.t
(** Compatibility layer, to be removed ASAP. *)
type 'a directory = 'a Directory.t
val empty: 'a directory
val register:
'prefix directory ->
'prefix Directory.t ->
([`POST], 'prefix, 'params, unit, 'input, 'output, unit) RPC.Service.t ->
('params -> 'input -> [< ('output, unit) RestoDirectory.Answer.t ] Lwt.t) ->
'prefix directory
'prefix Directory.t
val register0:
unit directory ->
unit Directory.t ->
([`POST], unit, unit, unit, 'i, 'o, unit) RPC.Service.t ->
('i -> [< ('o, unit) Answer.t ] Lwt.t) ->
unit directory
unit Directory.t
val register1:
'prefix directory ->
'prefix Directory.t ->
([`POST], 'prefix, unit * 'a, unit, 'i, 'o, unit) RPC.Service.t ->
('a -> 'i -> [< ('o, unit) Answer.t ] Lwt.t) ->
'prefix directory
'prefix Directory.t
val register2:
'prefix directory ->
'prefix Directory.t ->
([`POST], 'prefix, (unit * 'a) * 'b, unit, 'i, 'o, unit) RPC.Service.t ->
('a -> 'b -> 'i -> [< ('o, unit) Answer.t ] Lwt.t) ->
'prefix directory
'prefix Directory.t
val register_dynamic_directory1:
?descr:string ->
'prefix directory ->
'prefix Directory.t ->
('prefix, unit * 'a) RPC.Path.path ->
('a -> (unit * 'a) directory Lwt.t) ->
'prefix directory
('a -> (unit * 'a) Directory.t Lwt.t) ->
'prefix Directory.t

4
lib_node_shell/node.mli
View File

@ -89,7 +89,7 @@ module RPC : sig
t -> (Protocol_hash.t * Protocol.t) Lwt_stream.t * Lwt_watcher.stopper
val context_dir:
t -> block -> 'a RPC_server.directory option Lwt.t
t -> block -> 'a RPC_server.Directory.t option Lwt.t
val preapply:
t -> block ->
@ -98,7 +98,7 @@ module RPC : sig
(Block_header.shell_header * error Preapply_result.t) tzresult Lwt.t
val context_dir:
t -> block -> 'a RPC_server.directory option Lwt.t
t -> block -> 'a RPC_server.Directory.t option Lwt.t
val complete:
t -> ?block:block -> string -> string list Lwt.t

6
lib_node_shell/node_rpc.ml
View File

@ -140,7 +140,7 @@ let register_bi_dir node dir =
dir
let ops_dir _node =
let ops_dir = RPC_server.empty in
let ops_dir = RPC_server.Directory.empty in
ops_dir
let rec insert_future_block (bi: Services.Blocks.block_info) = function
@ -369,7 +369,7 @@ let get_protocols node hash () =
| Error _ -> raise Not_found
let build_rpc_directory node =
let dir = RPC_server.empty in
let dir = RPC_server.Directory.empty in
let dir =
RPC_server.register0 dir Services.Blocks.list (list_blocks node) in
let dir =
@ -381,7 +381,7 @@ let build_rpc_directory node =
Node.RPC.context_dir node block >>= function
| None -> Lwt.fail Not_found
| Some context_dir -> Lwt.return context_dir)
(fun _ -> Lwt.return RPC_server.empty) in
(fun _ -> Lwt.return RPC_server.Directory.empty) in
RPC_server.register_dynamic_directory1
~descr:
"All the RPCs which are specific to the protocol version."

2
lib_node_shell/node_rpc.mli
View File

@ -7,4 +7,4 @@
(* *)
(**************************************************************************)
val build_rpc_directory: Node.t -> unit RPC_server.directory
val build_rpc_directory: Node.t -> unit RPC_server.Directory.t

2
lib_node_updater/updater.ml
View File

@ -153,7 +153,7 @@ module type RAW_PROTOCOL = sig
validation_state -> operation -> validation_state tzresult Lwt.t
val finalize_block:
validation_state -> validation_result tzresult Lwt.t
val rpc_services: rpc_context RPC_server.directory
val rpc_services: rpc_context RPC_server.Directory.t
val configure_sandbox:
Context.t -> Data_encoding.json option -> Context.t tzresult Lwt.t
end

2
lib_node_updater/updater.mli
View File

@ -67,7 +67,7 @@ module type RAW_PROTOCOL = sig
validation_state -> operation -> validation_state tzresult Lwt.t
val finalize_block:
validation_state -> validation_result tzresult Lwt.t
val rpc_services: rpc_context RPC_server.directory
val rpc_services: rpc_context RPC_server.Directory.t
val configure_sandbox:
Context.t -> Data_encoding.json option -> Context.t tzresult Lwt.t
end

36
lib_protocol_environment_sigs/v1/RPC.mli
View File

@ -288,39 +288,3 @@ module Directory : sig
'prefix directory
end
(** Compatibility layer, to be removed ASAP. *)
type 'a directory = 'a Directory.t
val register:
'prefix directory ->
([ `POST ], 'prefix,
'params, unit, 'input,
'output, unit) Service.t ->
('params -> 'input -> [< ('output, unit) Answer.t ] Lwt.t) ->
'prefix directory
val register0:
unit directory ->
([ `POST ], unit,
unit, unit, 'i,
'o, unit) Service.t ->
('i -> [< ('o, unit) Answer.t ] Lwt.t) ->
unit directory
val register1:
'prefix directory ->
([ `POST ], 'prefix,
unit * 'a, unit, 'i,
'o, unit) Service.t ->
('a -> 'i -> [< ('o, unit) Answer.t ] Lwt.t) ->
'prefix directory
val register2:
'prefix directory ->
([ `POST ], 'prefix,
(unit * 'a) * 'b, unit, 'i,
'o, unit) Service.t ->
('a -> 'b -> 'i -> [< ('o, unit) Answer.t ] Lwt.t) ->
'prefix directory

2
lib_protocol_environment_sigs/v1/updater.mli
View File

@ -132,7 +132,7 @@ module type PROTOCOL = sig
validation_state -> validation_result tzresult Lwt.t
(** The list of remote procedures exported by this implementation *)
val rpc_services: rpc_context RPC.directory
val rpc_services: rpc_context RPC.Directory.t
(** An ad-hoc context patcher. It used only for debugging protocol
while running in the "sandbox" mode. This function is never used