From 4acdfc67fb539222d0bd3940a7e336c0c4048590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Mon, 22 Jan 2018 19:08:18 +0100 Subject: [PATCH] Refactor: Remame `lib_node_p2p/p2p_base` into `lib_p2p/p2p_services` --- src/bin_node/jbuild | 12 ++++++------ src/lib_client_base/jbuild | 4 ++-- src/lib_client_base/tezos-client-base.opam | 2 +- src/lib_node_services/jbuild | 4 ++-- src/lib_node_services/tezos-node-services.opam | 3 +-- src/lib_node_shell/jbuild | 8 ++++---- src/lib_node_shell/tezos-node-shell.opam | 4 ++-- src/lib_node_shell_base/jbuild | 4 ++-- src/lib_node_shell_base/tezos-node-shell-base.opam | 2 +- src/lib_node_updater/jbuild | 6 +++--- src/lib_node_updater/tezos-node-updater.opam | 2 +- src/{lib_node_p2p => lib_p2p}/jbuild | 8 ++++---- src/{lib_node_p2p => lib_p2p}/moving_average.ml | 0 src/{lib_node_p2p => lib_p2p}/moving_average.mli | 0 src/{lib_node_p2p => lib_p2p}/p2p.ml | 0 src/{lib_node_p2p => lib_p2p}/p2p.mli | 0 src/{lib_node_p2p => lib_p2p}/p2p_connection.ml | 0 src/{lib_node_p2p => lib_p2p}/p2p_connection.mli | 0 src/{lib_node_p2p => lib_p2p}/p2p_connection_pool.ml | 0 .../p2p_connection_pool.mli | 0 src/{lib_node_p2p => lib_p2p}/p2p_discovery.ml | 0 src/{lib_node_p2p => lib_p2p}/p2p_discovery.mli | 0 src/{lib_node_p2p => lib_p2p}/p2p_io_scheduler.ml | 0 src/{lib_node_p2p => lib_p2p}/p2p_io_scheduler.mli | 0 src/{lib_node_p2p => lib_p2p}/p2p_maintenance.ml | 0 src/{lib_node_p2p => lib_p2p}/p2p_maintenance.mli | 0 src/{lib_node_p2p => lib_p2p}/p2p_welcome.ml | 0 src/{lib_node_p2p => lib_p2p}/p2p_welcome.mli | 0 .../tezos-node-p2p.opam => lib_p2p/tezos-p2p.opam} | 2 +- src/{lib_node_p2p_base => lib_p2p_services}/jbuild | 4 ++-- .../p2p_connection_pool_types.ml | 0 .../p2p_connection_pool_types.mli | 0 .../p2p_services.ml | 0 .../p2p_services.mli | 0 .../p2p_types.ml | 0 .../p2p_types.mli | 0 .../tezos-p2p-services.opam} | 0 test/p2p/jbuild | 8 ++++---- 38 files changed, 36 insertions(+), 37 deletions(-) rename src/{lib_node_p2p => lib_p2p}/jbuild (70%) rename src/{lib_node_p2p => lib_p2p}/moving_average.ml (100%) rename src/{lib_node_p2p => lib_p2p}/moving_average.mli (100%) rename src/{lib_node_p2p => lib_p2p}/p2p.ml (100%) rename src/{lib_node_p2p => lib_p2p}/p2p.mli (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_connection.ml (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_connection.mli (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_connection_pool.ml (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_connection_pool.mli (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_discovery.ml (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_discovery.mli (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_io_scheduler.ml (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_io_scheduler.mli (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_maintenance.ml (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_maintenance.mli (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_welcome.ml (100%) rename src/{lib_node_p2p => lib_p2p}/p2p_welcome.mli (100%) rename src/{lib_node_p2p/tezos-node-p2p.opam => lib_p2p/tezos-p2p.opam} (95%) rename src/{lib_node_p2p_base => lib_p2p_services}/jbuild (80%) rename src/{lib_node_p2p_base => lib_p2p_services}/p2p_connection_pool_types.ml (100%) rename src/{lib_node_p2p_base => lib_p2p_services}/p2p_connection_pool_types.mli (100%) rename src/{lib_node_p2p_base => lib_p2p_services}/p2p_services.ml (100%) rename src/{lib_node_p2p_base => lib_p2p_services}/p2p_services.mli (100%) rename src/{lib_node_p2p_base => lib_p2p_services}/p2p_types.ml (100%) rename src/{lib_node_p2p_base => lib_p2p_services}/p2p_types.mli (100%) rename src/{lib_node_p2p_base/tezos-node-p2p-base.opam => lib_p2p_services/tezos-p2p-services.opam} (100%) diff --git a/src/bin_node/jbuild b/src/bin_node/jbuild index 6ff24d1d9..302c3922f 100644 --- 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 diff --git a/src/lib_client_base/jbuild b/src/lib_client_base/jbuild index f98e81a83..e1705498c 100644 --- 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)))) diff --git a/src/lib_client_base/tezos-client-base.opam b/src/lib_client_base/tezos-client-base.opam index 198d70272..aaf13ba9c 100644 --- 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" diff --git a/src/lib_node_services/jbuild b/src/lib_node_services/jbuild index 14900bbfd..5cd78cf2b 100644 --- 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 diff --git a/src/lib_node_services/tezos-node-services.opam b/src/lib_node_services/tezos-node-services.opam index d0af2fd65..0cf858edc 100644 --- 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: [ diff --git a/src/lib_node_shell/jbuild b/src/lib_node_shell/jbuild index ca6b7db91..337291134 100644 --- 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 diff --git a/src/lib_node_shell/tezos-node-shell.opam b/src/lib_node_shell/tezos-node-shell.opam index 28b78fbea..0467071d1 100644 --- 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: [ diff --git a/src/lib_node_shell_base/jbuild b/src/lib_node_shell_base/jbuild index 059b9a5c6..abb916874 100644 --- 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) diff --git a/src/lib_node_shell_base/tezos-node-shell-base.opam b/src/lib_node_shell_base/tezos-node-shell-base.opam index 1324a9737..c8bfdf9bf 100644 --- 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 ] diff --git a/src/lib_node_updater/jbuild b/src/lib_node_updater/jbuild index 8fc173087..e433b96d9 100644 --- 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) diff --git a/src/lib_node_updater/tezos-node-updater.opam b/src/lib_node_updater/tezos-node-updater.opam index 3612c2d14..f1a0215d3 100644 --- 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 ] diff --git a/src/lib_node_p2p/jbuild b/src/lib_p2p/jbuild similarity index 70% rename from src/lib_node_p2p/jbuild rename to src/lib_p2p/jbuild index a76ffe6e0..79bbd456b 100644 --- a/src/lib_node_p2p/jbuild +++ b/src/lib_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) diff --git a/src/lib_node_p2p/moving_average.ml b/src/lib_p2p/moving_average.ml similarity index 100% rename from src/lib_node_p2p/moving_average.ml rename to src/lib_p2p/moving_average.ml diff --git a/src/lib_node_p2p/moving_average.mli b/src/lib_p2p/moving_average.mli similarity index 100% rename from src/lib_node_p2p/moving_average.mli rename to src/lib_p2p/moving_average.mli diff --git a/src/lib_node_p2p/p2p.ml b/src/lib_p2p/p2p.ml similarity index 100% rename from src/lib_node_p2p/p2p.ml rename to src/lib_p2p/p2p.ml diff --git a/src/lib_node_p2p/p2p.mli b/src/lib_p2p/p2p.mli similarity index 100% rename from src/lib_node_p2p/p2p.mli rename to src/lib_p2p/p2p.mli diff --git a/src/lib_node_p2p/p2p_connection.ml b/src/lib_p2p/p2p_connection.ml similarity index 100% rename from src/lib_node_p2p/p2p_connection.ml rename to src/lib_p2p/p2p_connection.ml diff --git a/src/lib_node_p2p/p2p_connection.mli b/src/lib_p2p/p2p_connection.mli similarity index 100% rename from src/lib_node_p2p/p2p_connection.mli rename to src/lib_p2p/p2p_connection.mli diff --git a/src/lib_node_p2p/p2p_connection_pool.ml b/src/lib_p2p/p2p_connection_pool.ml similarity index 100% rename from src/lib_node_p2p/p2p_connection_pool.ml rename to src/lib_p2p/p2p_connection_pool.ml diff --git a/src/lib_node_p2p/p2p_connection_pool.mli b/src/lib_p2p/p2p_connection_pool.mli similarity index 100% rename from src/lib_node_p2p/p2p_connection_pool.mli rename to src/lib_p2p/p2p_connection_pool.mli diff --git a/src/lib_node_p2p/p2p_discovery.ml b/src/lib_p2p/p2p_discovery.ml similarity index 100% rename from src/lib_node_p2p/p2p_discovery.ml rename to src/lib_p2p/p2p_discovery.ml diff --git a/src/lib_node_p2p/p2p_discovery.mli b/src/lib_p2p/p2p_discovery.mli similarity index 100% rename from src/lib_node_p2p/p2p_discovery.mli rename to src/lib_p2p/p2p_discovery.mli diff --git a/src/lib_node_p2p/p2p_io_scheduler.ml b/src/lib_p2p/p2p_io_scheduler.ml similarity index 100% rename from src/lib_node_p2p/p2p_io_scheduler.ml rename to src/lib_p2p/p2p_io_scheduler.ml diff --git a/src/lib_node_p2p/p2p_io_scheduler.mli b/src/lib_p2p/p2p_io_scheduler.mli similarity index 100% rename from src/lib_node_p2p/p2p_io_scheduler.mli rename to src/lib_p2p/p2p_io_scheduler.mli diff --git a/src/lib_node_p2p/p2p_maintenance.ml b/src/lib_p2p/p2p_maintenance.ml similarity index 100% rename from src/lib_node_p2p/p2p_maintenance.ml rename to src/lib_p2p/p2p_maintenance.ml diff --git a/src/lib_node_p2p/p2p_maintenance.mli b/src/lib_p2p/p2p_maintenance.mli similarity index 100% rename from src/lib_node_p2p/p2p_maintenance.mli rename to src/lib_p2p/p2p_maintenance.mli diff --git a/src/lib_node_p2p/p2p_welcome.ml b/src/lib_p2p/p2p_welcome.ml similarity index 100% rename from src/lib_node_p2p/p2p_welcome.ml rename to src/lib_p2p/p2p_welcome.ml diff --git a/src/lib_node_p2p/p2p_welcome.mli b/src/lib_p2p/p2p_welcome.mli similarity index 100% rename from src/lib_node_p2p/p2p_welcome.mli rename to src/lib_p2p/p2p_welcome.mli diff --git a/src/lib_node_p2p/tezos-node-p2p.opam b/src/lib_p2p/tezos-p2p.opam similarity index 95% rename from src/lib_node_p2p/tezos-node-p2p.opam rename to src/lib_p2p/tezos-p2p.opam index d67e36e02..9f16483f5 100644 --- a/src/lib_node_p2p/tezos-node-p2p.opam +++ b/src/lib_p2p/tezos-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 ] diff --git a/src/lib_node_p2p_base/jbuild b/src/lib_p2p_services/jbuild similarity index 80% rename from src/lib_node_p2p_base/jbuild rename to src/lib_p2p_services/jbuild index 3f0670abb..087691f0e 100644 --- a/src/lib_node_p2p_base/jbuild +++ b/src/lib_p2p_services/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)))) diff --git a/src/lib_node_p2p_base/p2p_connection_pool_types.ml b/src/lib_p2p_services/p2p_connection_pool_types.ml similarity index 100% rename from src/lib_node_p2p_base/p2p_connection_pool_types.ml rename to src/lib_p2p_services/p2p_connection_pool_types.ml diff --git a/src/lib_node_p2p_base/p2p_connection_pool_types.mli b/src/lib_p2p_services/p2p_connection_pool_types.mli similarity index 100% rename from src/lib_node_p2p_base/p2p_connection_pool_types.mli rename to src/lib_p2p_services/p2p_connection_pool_types.mli diff --git a/src/lib_node_p2p_base/p2p_services.ml b/src/lib_p2p_services/p2p_services.ml similarity index 100% rename from src/lib_node_p2p_base/p2p_services.ml rename to src/lib_p2p_services/p2p_services.ml diff --git a/src/lib_node_p2p_base/p2p_services.mli b/src/lib_p2p_services/p2p_services.mli similarity index 100% rename from src/lib_node_p2p_base/p2p_services.mli rename to src/lib_p2p_services/p2p_services.mli diff --git a/src/lib_node_p2p_base/p2p_types.ml b/src/lib_p2p_services/p2p_types.ml similarity index 100% rename from src/lib_node_p2p_base/p2p_types.ml rename to src/lib_p2p_services/p2p_types.ml diff --git a/src/lib_node_p2p_base/p2p_types.mli b/src/lib_p2p_services/p2p_types.mli similarity index 100% rename from src/lib_node_p2p_base/p2p_types.mli rename to src/lib_p2p_services/p2p_types.mli diff --git a/src/lib_node_p2p_base/tezos-node-p2p-base.opam b/src/lib_p2p_services/tezos-p2p-services.opam similarity index 100% rename from src/lib_node_p2p_base/tezos-node-p2p-base.opam rename to src/lib_p2p_services/tezos-p2p-services.opam diff --git a/test/p2p/jbuild b/test/p2p/jbuild index f410f6892..8eadbb74d 100644 --- 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)