From 96e493006c93dce415eb97a11ec5439b029da1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Mon, 22 Jan 2018 19:52:53 +0100 Subject: [PATCH] Refactor: Rename `lib_node_updater` -> `lib_protocol_updater` --- .gitlab-ci.yml | 4 ++-- src/bin_node/jbuild | 4 ++-- src/bin_node/tezos-node.opam | 1 + src/lib_client_base/jbuild | 4 ++-- src/lib_client_base/tezos-client-base.opam | 2 +- src/lib_protocol_compiler/jbuild_embedded_protocol_template | 4 ++-- src/{lib_node_updater => lib_protocol_updater}/jbuild | 4 ++-- src/{lib_node_updater => lib_protocol_updater}/register.ml | 0 src/{lib_node_updater => lib_protocol_updater}/register.mli | 0 .../tezos-protocol-updater.opam} | 0 .../tezos_protocol_environment.ml | 0 src/{lib_node_updater => lib_protocol_updater}/updater.ml | 0 src/{lib_node_updater => lib_protocol_updater}/updater.mli | 0 src/lib_shell/jbuild | 4 ++-- src/lib_shell/tezos-shell.opam | 2 +- .../lib_protocol_alpha/tezos-embedded-protocol-alpha.opam | 2 +- .../lib_protocol_demo/tezos-embedded-protocol-demo.opam | 2 +- .../lib_protocol_genesis/tezos-embedded-protocol-genesis.opam | 2 +- 18 files changed, 18 insertions(+), 17 deletions(-) rename src/{lib_node_updater => lib_protocol_updater}/jbuild (91%) rename src/{lib_node_updater => lib_protocol_updater}/register.ml (100%) rename src/{lib_node_updater => lib_protocol_updater}/register.mli (100%) rename src/{lib_node_updater/tezos-node-updater.opam => lib_protocol_updater/tezos-protocol-updater.opam} (100%) rename src/{lib_node_updater => lib_protocol_updater}/tezos_protocol_environment.ml (100%) rename src/{lib_node_updater => lib_protocol_updater}/updater.ml (100%) rename src/{lib_node_updater => lib_protocol_updater}/updater.mli (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79623e56f..d36efdd07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -283,10 +283,10 @@ opam:21:tezos-node-p2p: variables: package: tezos-node-p2p -opam:22:tezos-node-updater: +opam:22:tezos-protocol-updater: <<: *opam_definition variables: - package: tezos-node-updater + package: tezos-protocol-updater opam:23:tezos-node-shell: <<: *opam_definition diff --git a/src/bin_node/jbuild b/src/bin_node/jbuild index 7f0ed9bc3..d6967834b 100644 --- a/src/bin_node/jbuild +++ b/src/bin_node/jbuild @@ -9,7 +9,7 @@ tezos-p2p tezos-shell-services tezos-shell - tezos-node-updater + tezos-protocol-updater tezos-embedded-protocol-genesis tezos-embedded-protocol-demo tezos-embedded-protocol-alpha @@ -23,7 +23,7 @@ -open Tezos_p2p -open Tezos_shell_services -open Tezos_shell - -open Tezos_node_updater + -open Tezos_protocol_updater -linkall)))) (install diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam index 0b505e88a..7d5229f62 100644 --- a/src/bin_node/tezos-node.opam +++ b/src/bin_node/tezos-node.opam @@ -13,6 +13,7 @@ depends: [ "tezos-rpc-http" "tezos-p2p" "tezos-shell" + "tezos-protocol-updater" "tezos-embedded-protocol-genesis" "tezos-embedded-protocol-demo" "tezos-embedded-protocol-alpha" diff --git a/src/lib_client_base/jbuild b/src/lib_client_base/jbuild index 234d75fa0..678325b3d 100644 --- a/src/lib_client_base/jbuild +++ b/src/lib_client_base/jbuild @@ -8,7 +8,7 @@ tezos-rpc-http tezos-p2p-services tezos-shell-services - tezos-node-updater + tezos-protocol-updater tezos-protocol-compiler)) (flags (:standard -w -9+27-30-32-40@8 -safe-string @@ -17,7 +17,7 @@ -open Tezos_rpc_http -open Tezos_p2p_services -open Tezos_shell_services - -open Tezos_node_updater)))) + -open Tezos_protocol_updater)))) (alias ((name runtest_indent) diff --git a/src/lib_client_base/tezos-client-base.opam b/src/lib_client_base/tezos-client-base.opam index 2bc8483d5..75709ea42 100644 --- a/src/lib_client_base/tezos-client-base.opam +++ b/src/lib_client_base/tezos-client-base.opam @@ -14,8 +14,8 @@ depends: [ "tezos-rpc-http" "tezos-p2p-services" "tezos-shell-services" - "tezos-node-updater" "tezos-protocol-compiler" + "tezos-protocol-updater" "tezos-embedded-protocol-genesis" "tezos-embedded-protocol-demo" "tezos-embedded-protocol-alpha" diff --git a/src/lib_protocol_compiler/jbuild_embedded_protocol_template b/src/lib_protocol_compiler/jbuild_embedded_protocol_template index 9542f8a53..fc9e1c44e 100644 --- a/src/lib_protocol_compiler/jbuild_embedded_protocol_template +++ b/src/lib_protocol_compiler/jbuild_embedded_protocol_template @@ -22,7 +22,7 @@ let () = Format.kasprintf Jbuild_plugin.V1.send {| ((targets (environment.ml)) (action (write-file ${@@} - "include Tezos_node_updater.Tezos_protocol_environment.Make(struct let name = \"%s\" end)()")))) + "include Tezos_protocol_updater.Tezos_protocol_environment.Make(struct let name = \"%s\" end)()")))) (rule ((targets (registerer.ml)) @@ -35,7 +35,7 @@ let () = Format.kasprintf Jbuild_plugin.V1.send {| ((name tezos_embedded_protocol_environment_%s) (public_name tezos-embedded-protocol-%s.environment) (library_flags (:standard -linkall)) - (libraries (tezos-node-updater)) + (libraries (tezos-protocol-updater)) (modules (Environment)))) (library diff --git a/src/lib_node_updater/jbuild b/src/lib_protocol_updater/jbuild similarity index 91% rename from src/lib_node_updater/jbuild rename to src/lib_protocol_updater/jbuild index 1583f740c..9223ecf99 100644 --- a/src/lib_node_updater/jbuild +++ b/src/lib_protocol_updater/jbuild @@ -1,8 +1,8 @@ (jbuild_version 1) (library - ((name tezos_node_updater) - (public_name tezos-node-updater) + ((name tezos_protocol_updater) + (public_name tezos-protocol-updater) (libraries (tezos-base tezos-micheline tezos-protocol-compiler diff --git a/src/lib_node_updater/register.ml b/src/lib_protocol_updater/register.ml similarity index 100% rename from src/lib_node_updater/register.ml rename to src/lib_protocol_updater/register.ml diff --git a/src/lib_node_updater/register.mli b/src/lib_protocol_updater/register.mli similarity index 100% rename from src/lib_node_updater/register.mli rename to src/lib_protocol_updater/register.mli diff --git a/src/lib_node_updater/tezos-node-updater.opam b/src/lib_protocol_updater/tezos-protocol-updater.opam similarity index 100% rename from src/lib_node_updater/tezos-node-updater.opam rename to src/lib_protocol_updater/tezos-protocol-updater.opam diff --git a/src/lib_node_updater/tezos_protocol_environment.ml b/src/lib_protocol_updater/tezos_protocol_environment.ml similarity index 100% rename from src/lib_node_updater/tezos_protocol_environment.ml rename to src/lib_protocol_updater/tezos_protocol_environment.ml diff --git a/src/lib_node_updater/updater.ml b/src/lib_protocol_updater/updater.ml similarity index 100% rename from src/lib_node_updater/updater.ml rename to src/lib_protocol_updater/updater.ml diff --git a/src/lib_node_updater/updater.mli b/src/lib_protocol_updater/updater.mli similarity index 100% rename from src/lib_node_updater/updater.mli rename to src/lib_protocol_updater/updater.mli diff --git a/src/lib_shell/jbuild b/src/lib_shell/jbuild index 0b9971ea2..070e150aa 100644 --- a/src/lib_shell/jbuild +++ b/src/lib_shell/jbuild @@ -9,7 +9,7 @@ tezos-p2p-services tezos-p2p tezos-shell-services - tezos-node-updater)) + tezos-protocol-updater)) (flags (:standard -w -9+27-30-32-40@8 -safe-string -open Tezos_base__TzPervasives @@ -18,7 +18,7 @@ -open Tezos_p2p_services -open Tezos_p2p -open Tezos_shell_services - -open Tezos_node_updater)))) + -open Tezos_protocol_updater)))) (alias ((name runtest_indent) diff --git a/src/lib_shell/tezos-shell.opam b/src/lib_shell/tezos-shell.opam index 288ba0a57..6477573d6 100644 --- a/src/lib_shell/tezos-shell.opam +++ b/src/lib_shell/tezos-shell.opam @@ -14,7 +14,7 @@ depends: [ "tezos-p2p-services" "tezos-p2p" "tezos-shell-services" - "tezos-node-updater" + "tezos-protocol-updater" ] build: [ [ "jbuilder" "build" "-p" name "-j" jobs ] diff --git a/src/proto_alpha/lib_protocol_alpha/tezos-embedded-protocol-alpha.opam b/src/proto_alpha/lib_protocol_alpha/tezos-embedded-protocol-alpha.opam index e2813e50f..586454b96 100644 --- a/src/proto_alpha/lib_protocol_alpha/tezos-embedded-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol_alpha/tezos-embedded-protocol-alpha.opam @@ -10,7 +10,7 @@ depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } "tezos-protocol-compiler" - "tezos-node-updater" + "tezos-protocol-updater" "tezos-shell" ] build: [ diff --git a/src/proto_demo/lib_protocol_demo/tezos-embedded-protocol-demo.opam b/src/proto_demo/lib_protocol_demo/tezos-embedded-protocol-demo.opam index 764d7660f..036ce1c52 100644 --- a/src/proto_demo/lib_protocol_demo/tezos-embedded-protocol-demo.opam +++ b/src/proto_demo/lib_protocol_demo/tezos-embedded-protocol-demo.opam @@ -10,7 +10,7 @@ depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } "tezos-protocol-compiler" - "tezos-node-updater" + "tezos-protocol-updater" "tezos-shell" ] build: [ diff --git a/src/proto_genesis/lib_protocol_genesis/tezos-embedded-protocol-genesis.opam b/src/proto_genesis/lib_protocol_genesis/tezos-embedded-protocol-genesis.opam index 50b09b38d..77e01e354 100644 --- a/src/proto_genesis/lib_protocol_genesis/tezos-embedded-protocol-genesis.opam +++ b/src/proto_genesis/lib_protocol_genesis/tezos-embedded-protocol-genesis.opam @@ -10,7 +10,7 @@ depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } "tezos-protocol-compiler" - "tezos-node-updater" + "tezos-protocol-updater" "tezos-shell" ] build: [