RPC: split package tezos-node_services

bin_node/jbuild

@@ -4,10 +4,10 @@
  ((name main)
   (public_name tezos-node)
   (libraries (tezos-base
+              tezos-rpc-http
               tezos-node-updater
               tezos-node-p2p-base
               tezos-node-p2p
-              tezos-node-http
               tezos-node-shell
               tezos-embedded-protocol-genesis
               tezos-embedded-protocol-demo
@@ -17,10 +17,10 @@
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives
+                    -open Tezos_rpc_http
                     -open Tezos_node_updater
                     -open Tezos_node_p2p_base
                     -open Tezos_node_p2p
-                    -open Tezos_node_http
                     -open Tezos_node_shell
                     -linkall))))
 

lib_base/jbuild

@@ -7,12 +7,14 @@
                     -open Tezos_stdlib_lwt
                     -open Tezos_crypto
                     -open Tezos_data_encoding
-                    -open Tezos_error_monad))
+                    -open Tezos_error_monad
+                    -open Tezos_rpc_base))
   (libraries (tezos-stdlib
               tezos-stdlib-lwt
               tezos-crypto
               tezos-data-encoding
               tezos-error-monad
+              tezos-rpc-base
               calendar
               ezjsonm
               mtime.clock.os))))

lib_base/tzPervasives.ml

@@ -12,6 +12,7 @@ include Tezos_stdlib_lwt
 include Tezos_crypto
 include Tezos_data_encoding
 include Tezos_error_monad
+include Tezos_rpc_base
 
 module List = struct
   include List

lib_base/tzPervasives.mli

@@ -12,6 +12,7 @@ include (module type of (struct include Tezos_data_encoding end))
 include (module type of (struct include Tezos_stdlib_lwt end))
 include (module type of (struct include Tezos_crypto end))
 include (module type of (struct include Tezos_error_monad end))
+include (module type of (struct include Tezos_rpc_base end))
 
 module List : sig
   include (module type of (struct include List end))

lib_client_base/jbuild

@@ -5,18 +5,18 @@
   (public_name tezos-client-base)
   (libraries (tezos-base
               tezos-storage
+              tezos-rpc-http
               tezos-node-p2p-base
               tezos-node-services
-              tezos-node-http
               tezos-node-updater
               tezos-protocol-compiler))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives
                     -open Tezos_storage
+                    -open Tezos_rpc_http
                     -open Tezos_node_p2p_base
                     -open Tezos_node_services
-                    -open Tezos_node_http
                     -open Tezos_node_updater))))
 
 (alias

lib_client_base/tezos-client-base.opam

@@ -11,9 +11,9 @@ depends: [
   "jbuilder" { build & >= "1.0+beta15" }
   "tezos-base"
   "tezos-storage"
+  "tezos-rpc-http"
   "tezos-node-p2p-base"
   "tezos-node-services"
-  "tezos-node-http"
   "tezos-node-updater"
   "tezos-protocol-compiler"
   "tezos-embedded-protocol-genesis"

lib_node_services/jbuild

@@ -4,8 +4,7 @@
  ((name tezos_node_services)
   (public_name tezos-node-services)
   (libraries (tezos-base
-              tezos-node-p2p-base
+              tezos-node-p2p-base))
-              ocplib-resto))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives

lib_node_shell/jbuild

@@ -5,6 +5,7 @@
   (public_name tezos-node-shell)
   (libraries (tezos-base
               tezos-storage
+              tezos-rpc-http
               tezos-node-services
               tezos-node-p2p-base
               tezos-node-p2p
@@ -13,8 +14,8 @@
                     -safe-string
                     -open Tezos_base__TzPervasives
                     -open Tezos_storage
+                    -open Tezos_rpc_http
                     -open Tezos_node_services
-                    -open Tezos_node_http
                     -open Tezos_node_p2p_base
                     -open Tezos_node_p2p
                     -open Tezos_node_updater))))

lib_node_updater/jbuild

@@ -7,9 +7,9 @@
               tezos-micheline
               tezos-protocol-compiler
               tezos-storage
+              tezos-rpc-http
               tezos-node-services
               tezos-node-p2p-base
-              tezos-node-http
               dynlink))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
@@ -17,8 +17,8 @@
                     -open Tezos_micheline
                     -open Tezos_protocol_compiler
                     -open Tezos_storage
+                    -open Tezos_rpc_http
                     -open Tezos_node_services
-                    -open Tezos_node_http
                     -open Tezos_node_p2p_base))))
 
 (alias

lib_node_updater/tezos-node-updater.opam

@@ -13,9 +13,9 @@ depends: [
   "tezos-micheline"
   "tezos-protocol-compiler"
   "tezos-storage"
+  "tezos-rpc-http"
   "tezos-node-services"
   "tezos-node-p2p-base"
-  "tezos-node-http"
 ]
 build: [
   [ "jbuilder" "build" "-p" name "-j" jobs ]

lib_rpc-base/jbuild

@@ -0,0 +1,15 @@
+(jbuild_version 1)
+
+(library
+ ((name tezos_rpc_base)
+  (public_name tezos-rpc-base)
+  (libraries (tezos-data-encoding
+              ocplib-resto))
+  (flags (:standard -w -9+27-30-32-40@8
+                    -safe-string
+                    -open Tezos_data_encoding))))
+
+(alias
+ ((name runtest_indent)
+  (deps ((glob_files *.ml) (glob_files *.mli)))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))

lib_rpc-base/tezos-rpc-base.opam

@@ -0,0 +1,20 @@
+opam-version: "1.2"
+version: "dev"
+maintainer: "contact@tezos.com"
+authors: [ "Tezos devteam" ]
+homepage: "https://www.tezos.com/"
+bug-reports: "https://gitlab.com/tezos/tezos/issues"
+dev-repo: "https://gitlab.com/tezos/tezos.git"
+license: "unreleased"
+depends: [
+  "ocamlfind" { build }
+  "jbuilder" { build & >= "1.0+beta15" }
+  "tezos-data-encoding"
+  "ocplib-resto"
+]
+build: [
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [
+  [ "jbuilder" "runtest" "-p" name "-j" jobs ]
+]

lib_rpc-http/jbuild

@@ -1,8 +1,8 @@
 (jbuild_version 1)
 
 (library
- ((name tezos_node_http)
+ ((name tezos_rpc_http)
-  (public_name tezos-node-http)
+  (public_name tezos-rpc-http)
   (libraries (tezos-base
               tezos-node-services
               ocplib-resto-directory
@@ -10,6 +10,7 @@
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives
+                    -open Tezos_rpc_base
                     -open Tezos_node_services))))
 
 (alias