From a3d0ee644a57a718d35dd6b3fc988f91d3833c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Mon, 22 Jan 2018 18:30:12 +0100 Subject: [PATCH] Refactor: Rename `lib_rpc_base` -> `lib_rpc` --- src/lib_base/jbuild | 4 ++-- src/lib_base/tzPervasives.ml | 2 +- src/lib_base/tzPervasives.mli | 2 +- src/lib_crypto/jbuild | 4 ++-- src/lib_crypto/tezos-crypto.opam | 2 +- src/{lib_rpc_base => lib_rpc}/RPC_arg.ml | 0 src/{lib_rpc_base => lib_rpc}/RPC_arg.mli | 0 src/{lib_rpc_base => lib_rpc}/RPC_description.ml | 0 src/{lib_rpc_base => lib_rpc}/RPC_description.mli | 0 src/{lib_rpc_base => lib_rpc}/RPC_encoding.ml | 0 src/{lib_rpc_base => lib_rpc}/RPC_encoding.mli | 0 src/{lib_rpc_base => lib_rpc}/RPC_path.ml | 0 src/{lib_rpc_base => lib_rpc}/RPC_path.mli | 0 src/{lib_rpc_base => lib_rpc}/RPC_query.ml | 0 src/{lib_rpc_base => lib_rpc}/RPC_query.mli | 0 src/{lib_rpc_base => lib_rpc}/RPC_service.ml | 0 src/{lib_rpc_base => lib_rpc}/RPC_service.mli | 0 src/{lib_rpc_base => lib_rpc}/jbuild | 4 ++-- .../tezos-rpc-base.opam => lib_rpc/tezos-rpc.opam} | 0 src/lib_rpc_http/jbuild | 2 +- 20 files changed, 10 insertions(+), 10 deletions(-) rename src/{lib_rpc_base => lib_rpc}/RPC_arg.ml (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_arg.mli (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_description.ml (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_description.mli (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_encoding.ml (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_encoding.mli (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_path.ml (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_path.mli (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_query.ml (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_query.mli (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_service.ml (100%) rename src/{lib_rpc_base => lib_rpc}/RPC_service.mli (100%) rename src/{lib_rpc_base => lib_rpc}/jbuild (86%) rename src/{lib_rpc_base/tezos-rpc-base.opam => lib_rpc/tezos-rpc.opam} (100%) diff --git a/src/lib_base/jbuild b/src/lib_base/jbuild index 288c39b08..49a4a0340 100644 --- a/src/lib_base/jbuild +++ b/src/lib_base/jbuild @@ -8,14 +8,14 @@ -open Tezos_crypto -open Tezos_data_encoding -open Tezos_error_monad - -open Tezos_rpc_base + -open Tezos_rpc -safe-string)) (libraries (tezos-stdlib tezos-stdlib-lwt tezos-crypto tezos-data-encoding tezos-error-monad - tezos-rpc-base + tezos-rpc calendar ezjsonm mtime.clock.os)))) diff --git a/src/lib_base/tzPervasives.ml b/src/lib_base/tzPervasives.ml index 9dfee0838..c76e757b9 100644 --- a/src/lib_base/tzPervasives.ml +++ b/src/lib_base/tzPervasives.ml @@ -12,7 +12,7 @@ include Tezos_stdlib_lwt include Tezos_crypto include Tezos_data_encoding include Tezos_error_monad -include Tezos_rpc_base +include Tezos_rpc module List = struct include List diff --git a/src/lib_base/tzPervasives.mli b/src/lib_base/tzPervasives.mli index 3bbda6c9e..dce6e6653 100644 --- a/src/lib_base/tzPervasives.mli +++ b/src/lib_base/tzPervasives.mli @@ -12,7 +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)) +include (module type of (struct include Tezos_rpc end)) module List : sig include (module type of (struct include List end)) diff --git a/src/lib_crypto/jbuild b/src/lib_crypto/jbuild index e5020e221..d794d6772 100644 --- a/src/lib_crypto/jbuild +++ b/src/lib_crypto/jbuild @@ -6,14 +6,14 @@ (flags (:standard -open Tezos_stdlib -open Tezos_data_encoding -open Tezos_stdlib_lwt - -open Tezos_rpc_base + -open Tezos_rpc -open Tezos_error_monad__Error_monad -safe-string)) (libraries (tezos-stdlib tezos-stdlib-lwt tezos-data-encoding tezos-error-monad - tezos-rpc-base + tezos-rpc nocrypto sodium zarith)))) diff --git a/src/lib_crypto/tezos-crypto.opam b/src/lib_crypto/tezos-crypto.opam index ba2039a05..cbc32b7bc 100644 --- a/src/lib_crypto/tezos-crypto.opam +++ b/src/lib_crypto/tezos-crypto.opam @@ -13,7 +13,7 @@ depends: [ "tezos-stdlib-lwt" "tezos-data-encoding" "tezos-error-monad" - "tezos-rpc-base" + "tezos-rpc" "nocrypto" "sodium" "zarith" diff --git a/src/lib_rpc_base/RPC_arg.ml b/src/lib_rpc/RPC_arg.ml similarity index 100% rename from src/lib_rpc_base/RPC_arg.ml rename to src/lib_rpc/RPC_arg.ml diff --git a/src/lib_rpc_base/RPC_arg.mli b/src/lib_rpc/RPC_arg.mli similarity index 100% rename from src/lib_rpc_base/RPC_arg.mli rename to src/lib_rpc/RPC_arg.mli diff --git a/src/lib_rpc_base/RPC_description.ml b/src/lib_rpc/RPC_description.ml similarity index 100% rename from src/lib_rpc_base/RPC_description.ml rename to src/lib_rpc/RPC_description.ml diff --git a/src/lib_rpc_base/RPC_description.mli b/src/lib_rpc/RPC_description.mli similarity index 100% rename from src/lib_rpc_base/RPC_description.mli rename to src/lib_rpc/RPC_description.mli diff --git a/src/lib_rpc_base/RPC_encoding.ml b/src/lib_rpc/RPC_encoding.ml similarity index 100% rename from src/lib_rpc_base/RPC_encoding.ml rename to src/lib_rpc/RPC_encoding.ml diff --git a/src/lib_rpc_base/RPC_encoding.mli b/src/lib_rpc/RPC_encoding.mli similarity index 100% rename from src/lib_rpc_base/RPC_encoding.mli rename to src/lib_rpc/RPC_encoding.mli diff --git a/src/lib_rpc_base/RPC_path.ml b/src/lib_rpc/RPC_path.ml similarity index 100% rename from src/lib_rpc_base/RPC_path.ml rename to src/lib_rpc/RPC_path.ml diff --git a/src/lib_rpc_base/RPC_path.mli b/src/lib_rpc/RPC_path.mli similarity index 100% rename from src/lib_rpc_base/RPC_path.mli rename to src/lib_rpc/RPC_path.mli diff --git a/src/lib_rpc_base/RPC_query.ml b/src/lib_rpc/RPC_query.ml similarity index 100% rename from src/lib_rpc_base/RPC_query.ml rename to src/lib_rpc/RPC_query.ml diff --git a/src/lib_rpc_base/RPC_query.mli b/src/lib_rpc/RPC_query.mli similarity index 100% rename from src/lib_rpc_base/RPC_query.mli rename to src/lib_rpc/RPC_query.mli diff --git a/src/lib_rpc_base/RPC_service.ml b/src/lib_rpc/RPC_service.ml similarity index 100% rename from src/lib_rpc_base/RPC_service.ml rename to src/lib_rpc/RPC_service.ml diff --git a/src/lib_rpc_base/RPC_service.mli b/src/lib_rpc/RPC_service.mli similarity index 100% rename from src/lib_rpc_base/RPC_service.mli rename to src/lib_rpc/RPC_service.mli diff --git a/src/lib_rpc_base/jbuild b/src/lib_rpc/jbuild similarity index 86% rename from src/lib_rpc_base/jbuild rename to src/lib_rpc/jbuild index 0ec17c9f4..83680e92c 100644 --- a/src/lib_rpc_base/jbuild +++ b/src/lib_rpc/jbuild @@ -1,8 +1,8 @@ (jbuild_version 1) (library - ((name tezos_rpc_base) - (public_name tezos-rpc-base) + ((name tezos_rpc) + (public_name tezos-rpc) (libraries (tezos-data-encoding ocplib-resto)) (flags (:standard -w -9+27-30-32-40@8 diff --git a/src/lib_rpc_base/tezos-rpc-base.opam b/src/lib_rpc/tezos-rpc.opam similarity index 100% rename from src/lib_rpc_base/tezos-rpc-base.opam rename to src/lib_rpc/tezos-rpc.opam diff --git a/src/lib_rpc_http/jbuild b/src/lib_rpc_http/jbuild index 0fe821d41..8b970fba7 100644 --- a/src/lib_rpc_http/jbuild +++ b/src/lib_rpc_http/jbuild @@ -10,7 +10,7 @@ (flags (:standard -w -9+27-30-32-40@8 -safe-string -open Tezos_base__TzPervasives - -open Tezos_rpc_base + -open Tezos_rpc -open Tezos_node_services)))) (alias