Refactor: Remame lib_node_p2p/p2p_base into lib_p2p/p2p_services

2018-01-22 19:08:18 +01:00 · 2018-01-22 19:08:18 +01:00 · 4acdfc67fb
commit 4acdfc67fb
parent e0a2570988
38 changed files with 36 additions and 37 deletions
--- a/src/bin_node/jbuild
+++ b/src/bin_node/jbuild
@ -5,11 +5,11 @@
  (public_name tezos-node)
  (libraries (tezos-base
              tezos-rpc-http
-              tezos-node-updater
-              tezos-node-p2p-base
-              tezos-node-p2p
+              tezos-p2p-services
+              tezos-p2p
              tezos-node-shell-base
              tezos-node-shell
+              tezos-node-updater
              tezos-embedded-protocol-genesis
              tezos-embedded-protocol-demo
              tezos-embedded-protocol-alpha
@ -19,11 +19,11 @@
                    -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_p2p_services
+                    -open Tezos_p2p
                    -open Tezos_node_shell_base
                    -open Tezos_node_shell
+                    -open Tezos_node_updater
                    -linkall))))

 (install
--- a/src/lib_client_base/jbuild
+++ b/src/lib_client_base/jbuild
@ -6,7 +6,7 @@
  (libraries (tezos-base
              tezos-storage
              tezos-rpc-http
-              tezos-node-p2p-base
+              tezos-p2p-services
              tezos-node-shell-base
              tezos-node-services
              tezos-node-updater
@ -16,7 +16,7 @@
                    -open Tezos_base__TzPervasives
                    -open Tezos_storage
                    -open Tezos_rpc_http
-                    -open Tezos_node_p2p_base
+                    -open Tezos_p2p_services
                    -open Tezos_node_services
                    -open Tezos_node_updater))))

--- a/src/lib_client_base/tezos-client-base.opam
+++ b/src/lib_client_base/tezos-client-base.opam
@ -12,7 +12,7 @@ depends: [
  "tezos-base"
  "tezos-storage"
  "tezos-rpc-http"
-  "tezos-node-p2p-base"
+  "tezos-p2p-services"
  "tezos-node-services"
  "tezos-node-updater"
  "tezos-protocol-compiler"
--- a/src/lib_node_services/jbuild
+++ b/src/lib_node_services/jbuild
@ -4,12 +4,12 @@
 ((name tezos_node_services)
  (public_name tezos-node-services)
  (libraries (tezos-base
-              tezos-node-p2p-base
+              tezos-p2p-services
              tezos-node-shell-base))
  (flags (:standard -w -9+27-30-32-40@8
                    -safe-string
                    -open Tezos_base__TzPervasives
-                    -open Tezos_node_p2p_base
+                    -open Tezos_p2p_services
                    -open Tezos_node_shell_base))))

 (alias
--- a/src/lib_node_services/tezos-node-services.opam
+++ b/src/lib_node_services/tezos-node-services.opam
@ -10,8 +10,7 @@ depends: [
  "ocamlfind" { build }
  "jbuilder" { build & >= "1.0+beta15" }
  "tezos-base"
-  "tezos-node-p2p-base"
-  "tezos-node-shell-base"
+  "tezos-p2p-services"
  "ocplib-resto"
 ]
 build: [
--- a/src/lib_node_shell/jbuild
+++ b/src/lib_node_shell/jbuild
@ -6,20 +6,20 @@
  (libraries (tezos-base
              tezos-storage
              tezos-rpc-http
+              tezos-p2p-services
+              tezos-p2p
              tezos-node-services
-              tezos-node-p2p-base
              tezos-node-shell-base
-              tezos-node-p2p
              tezos-node-updater))
  (flags (:standard -w -9+27-30-32-40@8
                    -safe-string
                    -open Tezos_base__TzPervasives
                    -open Tezos_storage
                    -open Tezos_rpc_http
+                    -open Tezos_p2p_services
+                    -open Tezos_p2p
                    -open Tezos_node_services
-                    -open Tezos_node_p2p_base
                    -open Tezos_node_shell_base
-                    -open Tezos_node_p2p
                    -open Tezos_node_updater))))

 (alias
--- a/src/lib_node_shell/tezos-node-shell.opam
+++ b/src/lib_node_shell/tezos-node-shell.opam
@ -12,8 +12,8 @@ depends: [
  "tezos-base"
  "tezos-storage"
  "tezos-node-services"
-  "tezos-node-p2p-base"
-  "tezos-node-p2p"
+  "tezos-p2p-services"
+  "tezos-p2p"
  "tezos-node-updater"
 ]
 build: [
--- a/src/lib_node_shell_base/jbuild
+++ b/src/lib_node_shell_base/jbuild
@ -4,9 +4,9 @@
 ((name tezos_node_shell_base)
  (public_name tezos-node-shell-base)
  (libraries (tezos-base
-              tezos-node-p2p-base))
+              tezos-p2p-services))
  (flags (:standard -open Tezos_base__TzPervasives
-                    -open Tezos_node_p2p_base))))
+                    -open Tezos_p2p_services))))

 (alias
 ((name runtest_indent)
--- a/src/lib_node_shell_base/tezos-node-shell-base.opam
+++ b/src/lib_node_shell_base/tezos-node-shell-base.opam
@ -13,7 +13,7 @@ depends: [
  "mtime"
  "ocplib-resto-cohttp"
  "tezos-base"
-  "tezos-node-p2p-base"
+  "tezos-p2p-services"
 ]
 build: [
  [ "jbuilder" "build" "-p" name "-j" jobs ]
--- a/src/lib_node_updater/jbuild
+++ b/src/lib_node_updater/jbuild
@ -8,8 +8,8 @@
              tezos-protocol-compiler
              tezos-storage
              tezos-rpc-http
+              tezos-p2p-services
              tezos-node-services
-              tezos-node-p2p-base
              dynlink))
  (flags (:standard -w -9+27-30-32-40@8
                    -safe-string
@ -18,8 +18,8 @@
                    -open Tezos_protocol_compiler
                    -open Tezos_storage
                    -open Tezos_rpc_http
-                    -open Tezos_node_services
-                    -open Tezos_node_p2p_base))))
+                    -open Tezos_p2p_services
+                    -open Tezos_node_services))))

 (alias
 ((name runtest_indent)
--- a/src/lib_node_updater/tezos-node-updater.opam
+++ b/src/lib_node_updater/tezos-node-updater.opam
@ -14,8 +14,8 @@ depends: [
  "tezos-protocol-compiler"
  "tezos-storage"
  "tezos-rpc-http"
+  "tezos-p2p-services"
  "tezos-node-services"
-  "tezos-node-p2p-base"
 ]
 build: [
  [ "jbuilder" "build" "-p" name "-j" jobs ]
--- a/src/lib_node_p2p/jbuild
+++ b/src/lib_node_p2p/jbuild
@ -1,14 +1,14 @@
 (jbuild_version 1)

 (library
- ((name tezos_node_p2p)
-  (public_name tezos-node-p2p)
+ ((name tezos_p2p)
+  (public_name tezos-p2p)
  (libraries (tezos-base
-              tezos-node-p2p-base))
+              tezos-p2p-services))
  (flags (:standard -w -9+27-30-32-40@8
                    -safe-string
                    -open Tezos_base__TzPervasives
-                    -open Tezos_node_p2p_base))))
+                    -open Tezos_p2p_services))))

 (alias
 ((name runtest_indent)
--- a/src/lib_node_p2p/moving_average.ml
+++ b/src/lib_node_p2p/moving_average.ml
--- a/src/lib_node_p2p/moving_average.mli
+++ b/src/lib_node_p2p/moving_average.mli
--- a/src/lib_node_p2p/p2p.ml
+++ b/src/lib_node_p2p/p2p.ml
--- a/src/lib_node_p2p/p2p.mli
+++ b/src/lib_node_p2p/p2p.mli
--- a/src/lib_node_p2p/p2p_connection.ml
+++ b/src/lib_node_p2p/p2p_connection.ml
--- a/src/lib_node_p2p/p2p_connection.mli
+++ b/src/lib_node_p2p/p2p_connection.mli
--- a/src/lib_node_p2p/p2p_connection_pool.ml
+++ b/src/lib_node_p2p/p2p_connection_pool.ml
--- a/src/lib_node_p2p/p2p_connection_pool.mli
+++ b/src/lib_node_p2p/p2p_connection_pool.mli
--- a/src/lib_node_p2p/p2p_discovery.ml
+++ b/src/lib_node_p2p/p2p_discovery.ml
--- a/src/lib_node_p2p/p2p_discovery.mli
+++ b/src/lib_node_p2p/p2p_discovery.mli
--- a/src/lib_node_p2p/p2p_io_scheduler.ml
+++ b/src/lib_node_p2p/p2p_io_scheduler.ml
--- a/src/lib_node_p2p/p2p_io_scheduler.mli
+++ b/src/lib_node_p2p/p2p_io_scheduler.mli
--- a/src/lib_node_p2p/p2p_maintenance.ml
+++ b/src/lib_node_p2p/p2p_maintenance.ml
--- a/src/lib_node_p2p/p2p_maintenance.mli
+++ b/src/lib_node_p2p/p2p_maintenance.mli
--- a/src/lib_node_p2p/p2p_welcome.ml
+++ b/src/lib_node_p2p/p2p_welcome.ml
--- a/src/lib_node_p2p/p2p_welcome.mli
+++ b/src/lib_node_p2p/p2p_welcome.mli
--- a/src/lib_node_p2p/tezos-node-p2p.opam
+++ b/src/lib_node_p2p/tezos-node-p2p.opam
@ -10,7 +10,7 @@ depends: [
  "ocamlfind" { build }
  "jbuilder" { build & >= "1.0+beta15" }
  "tezos-base"
-  "tezos-node-p2p-base"
+  "tezos-p2p-services"
 ]
 build: [
  [ "jbuilder" "build" "-p" name "-j" jobs ]
--- a/src/lib_node_p2p_base/jbuild
+++ b/src/lib_node_p2p_base/jbuild
@ -1,8 +1,8 @@
 (jbuild_version 1)

 (library
- ((name tezos_node_p2p_base)
-  (public_name tezos-node-p2p-base)
+ ((name tezos_p2p_services)
+  (public_name tezos-p2p-services)
  (libraries (tezos-base))
  (flags (:standard -open Tezos_base__TzPervasives -safe-string))))

--- a/src/lib_node_p2p_base/p2p_connection_pool_types.ml
+++ b/src/lib_node_p2p_base/p2p_connection_pool_types.ml
--- a/src/lib_node_p2p_base/p2p_connection_pool_types.mli
+++ b/src/lib_node_p2p_base/p2p_connection_pool_types.mli
--- a/src/lib_node_p2p_base/p2p_services.ml
+++ b/src/lib_node_p2p_base/p2p_services.ml
--- a/src/lib_node_p2p_base/p2p_services.mli
+++ b/src/lib_node_p2p_base/p2p_services.mli
--- a/src/lib_node_p2p_base/p2p_types.ml
+++ b/src/lib_node_p2p_base/p2p_types.ml
--- a/src/lib_node_p2p_base/p2p_types.mli
+++ b/src/lib_node_p2p_base/p2p_types.mli
--- a/src/lib_node_p2p_base/tezos-node-p2p-base.opam
+++ b/src/lib_node_p2p_base/tezos-node-p2p-base.opam
--- a/test/p2p/jbuild
+++ b/test/p2p/jbuild
@ -5,16 +5,16 @@
          test_p2p_connection_pool
          test_p2p_io_scheduler))
  (libraries (tezos-base
-              tezos-node-p2p-base
-              tezos-node-p2p
+              tezos-p2p-services
+              tezos-p2p
              lwt.unix
              test_lib))
  (flags (:standard -w -9-32
                    -linkall
                    -safe-string
                    -open Tezos_base__TzPervasives
-                    -open Tezos_node_p2p_base
-                    -open Tezos_node_p2p))))
+                    -open Tezos_p2p_services
+                    -open Tezos_p2p))))

 (alias
 ((name buildtest)