Client refactor: Move Client_node_rpcs.Network into P2p_services

src/lib_base/p2p_point.ml

@@ -93,6 +93,14 @@ module Id = struct
   let encoding =
     Data_encoding.conv to_string of_string_exn Data_encoding.string
 
+  let rpc_arg =
+    RPC_arg.make
+      ~name:"point"
+      ~descr:"A network point (ipv4:port or [ipv6]:port)."
+      ~destruct:of_string
+      ~construct:to_string
+      ()
+
 end
 
 module Map = Map.Make (Id)

src/lib_base/p2p_point.mli

@@ -23,6 +23,7 @@ module Id : sig
   val is_global : t -> bool
   val parse_addr_port : string -> string * string
 
+  val rpc_arg : t RPC_arg.t
 end
 
 module Map : Map.S with type key = Id.t

src/lib_client_base/client_network.ml

@@ -16,10 +16,10 @@ let commands () = [
   command ~group ~desc: "show global network status"
     no_options
     (prefixes ["network" ; "stat"] stop) begin fun () (cctxt : Client_commands.full_context) ->
-    Client_node_rpcs.Network.stat cctxt >>=? fun stat ->
+    P2p_services.stat cctxt >>=? fun stat ->
-    Client_node_rpcs.Network.connections cctxt >>=? fun conns ->
+    P2p_services.Connections.list cctxt >>=? fun conns ->
-    Client_node_rpcs.Network.peers cctxt >>=? fun peers ->
+    P2p_services.Peers.list cctxt >>=? fun peers ->
-    Client_node_rpcs.Network.points cctxt >>=? fun points ->
+    P2p_services.Points.list cctxt >>=? fun points ->
     cctxt#message "GLOBAL STATS" >>= fun () ->
     cctxt#message "  %a" P2p_stat.pp stat >>= fun () ->
     cctxt#message "CONNECTIONS" >>= fun () ->

src/lib_client_base/client_node_rpcs.ml

@@ -57,19 +57,3 @@ module Protocols = struct
       { contents; monitor = Some false }
 
 end
-
-module Network = struct
-
-  let stat cctxt =
-    call_service0 cctxt P2p_services.stat ()
-
-  let connections cctxt =
-    call_service0 cctxt P2p_services.Connection.list ()
-
-  let peers cctxt =
-    call_service0 cctxt P2p_services.Peer_id.list []
-
-  let points cctxt =
-    call_service0 cctxt P2p_services.Point.list []
-
-end

src/lib_client_base/client_node_rpcs.mli

@@ -54,22 +54,6 @@ end
 val bootstrapped:
   #Client_rpcs.ctxt -> (Block_hash.t * Time.t) Lwt_stream.t tzresult Lwt.t
 
-module Network : sig
-
-  val stat:
-    #Client_rpcs.ctxt -> P2p_stat.t tzresult Lwt.t
-
-  val connections:
-    #Client_rpcs.ctxt -> P2p_connection.Info.t list tzresult Lwt.t
-
-  val peers:
-    #Client_rpcs.ctxt -> (P2p_peer.Id.t * P2p_peer.Info.t) list tzresult Lwt.t
-
-  val points:
-    #Client_rpcs.ctxt -> (P2p_point.Id.t * P2p_point.Info.t) list tzresult Lwt.t
-
-end
-
 val complete:
   #Client_rpcs.ctxt ->
   ?block:Block_services.block -> string -> string list tzresult Lwt.t

src/lib_shell/node_rpc.ml

@@ -522,48 +522,52 @@ let build_rpc_directory node =
 
   let dir =
     let implementation () () = Node.RPC.Network.stat node |> RPC_answer.return in
-    RPC_directory.register0 dir P2p_services.stat implementation in
+    RPC_directory.register0 dir P2p_services.S.stat implementation in
   let dir =
     let implementation () () =
       RPC_answer.return Distributed_db.Raw.supported_versions in
-    RPC_directory.register0 dir P2p_services.versions implementation in
+    RPC_directory.register0 dir P2p_services.S.versions implementation in
   let dir =
     let implementation () () =
       let stream, stopper = Node.RPC.Network.watch node in
       let shutdown () = Lwt_watcher.shutdown stopper in
       let next () = Lwt_stream.get stream in
       RPC_answer.return_stream { next ; shutdown } in
-    RPC_directory.register0 dir P2p_services.events implementation in
+    RPC_directory.register0 dir P2p_services.S.events implementation in
   let dir =
     let implementation point () timeout =
       Node.RPC.Network.connect node point timeout >>= RPC_answer.return in
-    RPC_directory.register1 dir P2p_services.connect implementation in
+    RPC_directory.register1 dir P2p_services.S.connect implementation in
 
   (* Network : Connection *)
 
   let dir =
     let implementation peer_id () () =
-      Node.RPC.Network.Connection.info node peer_id |> RPC_answer.return in
+      match Node.RPC.Network.Connection.info node peer_id with
-    RPC_directory.register1 dir P2p_services.Connection.info implementation in
+      | None -> raise Not_found
+      | Some v -> RPC_answer.return v in
+    RPC_directory.register1 dir P2p_services.Connections.S.info implementation in
   let dir =
     let implementation peer_id () wait =
       Node.RPC.Network.Connection.kick node peer_id wait >>= RPC_answer.return in
-    RPC_directory.register1 dir P2p_services.Connection.kick implementation in
+    RPC_directory.register1 dir P2p_services.Connections.S.kick implementation in
   let dir =
     let implementation () () =
       Node.RPC.Network.Connection.list node |> RPC_answer.return in
-    RPC_directory.register0 dir P2p_services.Connection.list implementation in
+    RPC_directory.register0 dir P2p_services.Connections.S.list implementation in
 
   (* Network : Peer_id *)
 
   let dir =
     let implementation () state =
       Node.RPC.Network.Peer_id.list node ~restrict:state |> RPC_answer.return in
-    RPC_directory.register0 dir P2p_services.Peer_id.list implementation in
+    RPC_directory.register0 dir P2p_services.Peers.S.list implementation in
   let dir =
     let implementation peer_id () () =
-      Node.RPC.Network.Peer_id.info node peer_id |> RPC_answer.return in
+      match Node.RPC.Network.Peer_id.info node peer_id with
-    RPC_directory.register1 dir P2p_services.Peer_id.info implementation in
+      | None -> raise Not_found
+      | Some v -> RPC_answer.return v in
+    RPC_directory.register1 dir P2p_services.Peers.S.info implementation in
   let dir =
     let implementation peer_id () monitor =
       if monitor then
@@ -580,18 +584,20 @@ let build_rpc_directory node =
         RPC_answer.return_stream { next ; shutdown }
       else
         Node.RPC.Network.Peer_id.events node peer_id |> RPC_answer.return in
-    RPC_directory.register1 dir P2p_services.Peer_id.events implementation in
+    RPC_directory.register1 dir P2p_services.Peers.S.events implementation in
 
   (* Network : Point *)
 
   let dir =
     let implementation () state =
       Node.RPC.Network.Point.list node ~restrict:state |> RPC_answer.return in
-    RPC_directory.register0 dir P2p_services.Point.list implementation in
+    RPC_directory.register0 dir P2p_services.Points.S.list implementation in
   let dir =
     let implementation point () () =
-      Node.RPC.Network.Point.info node point |> RPC_answer.return in
+      match Node.RPC.Network.Point.info node point with
-    RPC_directory.register1 dir P2p_services.Point.info implementation in
+      | None -> raise Not_found
+      | Some v -> RPC_answer.return v in
+    RPC_directory.register1 dir P2p_services.Points.S.info implementation in
   let dir =
     let implementation point () monitor =
       if monitor then
@@ -608,7 +614,7 @@ let build_rpc_directory node =
         RPC_answer.return_stream { next ; shutdown }
       else
         Node.RPC.Network.Point.events node point |> RPC_answer.return in
-    RPC_directory.register1 dir P2p_services.Point.events implementation in
+    RPC_directory.register1 dir P2p_services.Points.S.events implementation in
   let dir =
     RPC_directory.register_describe_directory_service dir Shell_services.describe in
   dir

src/lib_shell_services/p2p_services.ml

@@ -7,13 +7,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-let point_arg =
+module S = struct
-  RPC_arg.make
-    ~name:"point"
-    ~descr:"A network point (ipv4:port or [ipv6]:port)."
-    ~destruct:P2p_point.Id.of_string
-    ~construct:P2p_point.Id.to_string
-    ()
 
   let versions =
     RPC_service.post_service
@@ -45,11 +39,22 @@ let connect =
       ~query: RPC_query.empty
       ~input: Data_encoding.(obj1 (dft "timeout" float 5.))
       ~output: (RPC_error.wrap Data_encoding.empty)
-    RPC_path.(root / "network" / "connect" /: point_arg)
+      RPC_path.(root / "network" / "connect" /: P2p_point.Id.rpc_arg)
+
+end
+
+open RPC_context
+let stat ctxt = make_call S.stat ctxt () () ()
+let versions ctxt = make_call S.versions ctxt () () ()
+let events ctxt = make_streamed_call S.events ctxt () () ()
+let connect ctxt ~timeout peer_id =
+  make_err_call1 S.connect ctxt peer_id () timeout
 
 let monitor_encoding = Data_encoding.(obj1 (dft "monitor" bool false))
 
-module Connection = struct
+module Connections = struct
+
+  module S = struct
 
     let list =
       RPC_service.post_service
@@ -57,15 +62,15 @@ module Connection = struct
         ~query: RPC_query.empty
         ~input: Data_encoding.empty
         ~output: (Data_encoding.list P2p_connection.Info.encoding)
-      RPC_path.(root / "network" / "connection")
+        RPC_path.(root / "network" / "connections")
 
     let info =
       RPC_service.post_service
         ~query: RPC_query.empty
         ~input: Data_encoding.empty
-      ~output: (Data_encoding.option P2p_connection.Info.encoding)
+        ~output: P2p_connection.Info.encoding
         ~description:"Details about the current P2P connection to the given peer."
-      RPC_path.(root / "network" / "connection" /: P2p_peer.Id.rpc_arg)
+        RPC_path.(root / "network" / "connections" /: P2p_peer.Id.rpc_arg)
 
     let kick =
       RPC_service.post_service
@@ -73,19 +78,27 @@ module Connection = struct
         ~input: Data_encoding.(obj1 (req "wait" bool))
         ~output: Data_encoding.empty
         ~description:"Forced close of the current P2P connection to the given peer."
-      RPC_path.(root / "network" / "connection" /: P2p_peer.Id.rpc_arg / "kick")
+        RPC_path.(root / "network" / "connections" /: P2p_peer.Id.rpc_arg / "kick")
 
   end
 
-module Point = struct
+  let list ctxt = make_call S.list ctxt () () ()
+  let info ctxt peer_id = make_call1 S.info ctxt peer_id () ()
+  let kick ctxt ?(wait = false) peer_id = make_call1 S.kick ctxt peer_id () wait
+
+end
+
+module Points = struct
+
+  module S = struct
 
     let info =
       RPC_service.post_service
         ~query: RPC_query.empty
         ~input: Data_encoding.empty
-      ~output: (Data_encoding.option P2p_point.Info.encoding)
+        ~output: P2p_point.Info.encoding
         ~description: "Details about a given `IP:addr`."
-      RPC_path.(root / "network" / "point" /: point_arg)
+        RPC_path.(root / "network" / "points" /: P2p_point.Id.rpc_arg)
 
     let events =
       RPC_service.post_service
@@ -94,7 +107,7 @@ module Point = struct
         ~output: (Data_encoding.list
                     P2p_point.Pool_event.encoding)
         ~description: "Monitor network events related to an `IP:addr`."
-      RPC_path.(root / "network" / "point" /: point_arg / "log")
+        RPC_path.(root / "network" / "points" /: P2p_point.Id.rpc_arg / "log")
 
     let list =
       let filter =
@@ -109,19 +122,29 @@ module Point = struct
                                  P2p_point.Info.encoding))
         ~description:"List the pool of known `IP:port` \
                       used for establishing P2P connections ."
-      RPC_path.(root / "network" / "point")
+        RPC_path.(root / "networks" / "point")
 
   end
 
-module Peer_id = struct
+  open RPC_context
+  let info ctxt peer_id = make_call1 S.info ctxt peer_id () ()
+  let events ctxt point =
+    make_streamed_call S.events ctxt ((), point) () true
+  let list ?(filter = []) ctxt = make_call S.list ctxt () () filter
+
+end
+
+module Peers = struct
+
+  module S = struct
 
     let info =
       RPC_service.post_service
         ~query: RPC_query.empty
         ~input: Data_encoding.empty
-      ~output: (Data_encoding.option P2p_peer.Info.encoding)
+        ~output: P2p_peer.Info.encoding
         ~description:"Details about a given peer."
-      RPC_path.(root / "network" / "peer_id" /: P2p_peer.Id.rpc_arg)
+        RPC_path.(root / "network" / "peers" /: P2p_peer.Id.rpc_arg)
 
     let events =
       RPC_service.post_service
@@ -130,7 +153,7 @@ module Peer_id = struct
         ~output: (Data_encoding.list
                     P2p_peer.Pool_event.encoding)
         ~description:"Monitor network events related to a given peer."
-      RPC_path.(root / "network" / "peer_id" /: P2p_peer.Id.rpc_arg / "log")
+        RPC_path.(root / "network" / "peers" /: P2p_peer.Id.rpc_arg / "log")
 
     let list =
       let filter =
@@ -144,6 +167,13 @@ module Peer_id = struct
                                  P2p_peer.Id.encoding
                                  P2p_peer.Info.encoding))
         ~description:"List the peers the node ever met."
-      RPC_path.(root / "network" / "peer_id")
+        RPC_path.(root / "network" / "peers")
+
+  end
+
+  let info ctxt peer_id = make_call1 S.info ctxt peer_id () ()
+  let events ctxt point =
+    make_streamed_call S.events ctxt ((), point) () true
+  let list ?(filter = []) ctxt = make_call S.list ctxt () () filter
 
 end

src/lib_shell_services/p2p_services.mli

@@ -7,6 +7,19 @@
 (*                                                                        *)
 (**************************************************************************)
 
+open RPC_context
+
+val stat: #simple -> P2p_stat.t tzresult Lwt.t
+
+val versions: #simple -> P2p_version.t list tzresult Lwt.t
+
+val events: #streamed ->
+  (P2p_connection.Pool_event.t Lwt_stream.t * stopper) tzresult Lwt.t
+
+val connect: #simple -> timeout:float -> P2p_point.Id.t -> unit tzresult Lwt.t
+
+module S : sig
+
   val stat :
     ([ `POST ], unit,
      unit, unit, unit,
@@ -27,7 +40,19 @@ val connect :
      unit * P2p_point.Id.t, unit, float,
      unit tzresult) RPC_service.t
 
-module Connection : sig
+end
+
+module Connections : sig
+
+  open RPC_context
+
+  val list: #simple -> P2p_connection.Info.t list tzresult Lwt.t
+
+  val info: #simple -> P2p_peer.Id.t -> P2p_connection.Info.t tzresult Lwt.t
+
+  val kick: #simple -> ?wait:bool -> P2p_peer.Id.t -> unit tzresult Lwt.t
+
+  module S : sig
 
     val list :
       ([ `POST ], unit,
@@ -37,7 +62,7 @@ module Connection : sig
     val info :
       ([ `POST ], unit,
        unit * P2p_peer.Id.t, unit, unit,
-     P2p_connection.Info.t option) RPC_service.t
+       P2p_connection.Info.t) RPC_service.t
 
     val kick :
       ([ `POST ], unit,
@@ -46,22 +71,58 @@ module Connection : sig
 
   end
 
-module Point : sig
+end
+
+
+module Points : sig
+
+  val list:
+    ?filter:(P2p_point.State.t list) ->
+    #simple -> (P2p_point.Id.t * P2p_point.Info.t) list tzresult Lwt.t
+
+  val info: #simple -> P2p_point.Id.t -> P2p_point.Info.t tzresult Lwt.t
+
+  val events:
+    #streamed ->
+    P2p_point.Id.t ->
+    (P2p_point.Pool_event.t list Lwt_stream.t * stopper) tzresult Lwt.t
+
+  module S : sig
+
     val list :
       ([ `POST ], unit,
        unit, unit, P2p_point.State.t list,
        (P2p_point.Id.t * P2p_point.Info.t) list) RPC_service.t
+
     val info :
       ([ `POST ], unit,
        unit * P2p_point.Id.t, unit, unit,
-     P2p_point.Info.t option) RPC_service.t
+       P2p_point.Info.t) RPC_service.t
+
     val events :
       ([ `POST ], unit,
        unit * P2p_point.Id.t, unit, bool,
        P2p_point.Pool_event.t list) RPC_service.t
+
   end
 
-module Peer_id : sig
+end
+
+
+module Peers : sig
+
+  val list:
+    ?filter:(P2p_peer.State.t list) ->
+    #simple ->
+    (P2p_peer.Id.t * P2p_peer.Info.t) list tzresult Lwt.t
+
+  val info: #simple -> P2p_peer.Id.t -> P2p_peer.Info.t tzresult Lwt.t
+
+  val events:
+    #streamed -> P2p_peer.Id.t ->
+    (P2p_peer.Pool_event.t list Lwt_stream.t * stopper) tzresult Lwt.t
+
+  module S : sig
 
     val list :
       ([ `POST ], unit,
@@ -71,7 +132,7 @@ module Peer_id : sig
     val info :
       ([ `POST ], unit,
        unit * P2p_peer.Id.t, unit, unit,
-     P2p_peer.Info.t option) RPC_service.t
+       P2p_peer.Info.t) RPC_service.t
 
     val events :
       ([ `POST ], unit,
@@ -79,3 +140,5 @@ module Peer_id : sig
        P2p_peer.Pool_event.t list) RPC_service.t
 
   end
+
+end