diff --git a/src/bin_node/jbuild b/src/bin_node/jbuild index 84d05edc1..7f0ed9bc3 100644 --- a/src/bin_node/jbuild +++ b/src/bin_node/jbuild @@ -8,7 +8,7 @@ tezos-p2p-services tezos-p2p tezos-shell-services - tezos-node-shell + tezos-shell tezos-node-updater tezos-embedded-protocol-genesis tezos-embedded-protocol-demo @@ -22,7 +22,7 @@ -open Tezos_p2p_services -open Tezos_p2p -open Tezos_shell_services - -open Tezos_node_shell + -open Tezos_shell -open Tezos_node_updater -linkall)))) diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam index 086c59147..0b505e88a 100644 --- a/src/bin_node/tezos-node.opam +++ b/src/bin_node/tezos-node.opam @@ -11,11 +11,8 @@ depends: [ "jbuilder" { build & >= "1.0+beta15" } "tezos-base" "tezos-rpc-http" - "tezos-p2p-services" "tezos-p2p" - "tezos-shell-services" - "tezos-node-shell" - "tezos-node-updater" + "tezos-shell" "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 08449bc9b..9542f8a53 100644 --- a/src/lib_protocol_compiler/jbuild_embedded_protocol_template +++ b/src/lib_protocol_compiler/jbuild_embedded_protocol_template @@ -56,7 +56,7 @@ let () = Format.kasprintf Jbuild_plugin.V1.send {| ((name tezos_embedded_protocol_%s) (public_name tezos-embedded-protocol-%s) (library_flags (:standard -linkall)) - (libraries (tezos_embedded_raw_protocol_%s tezos-node-shell)) + (libraries (tezos_embedded_raw_protocol_%s tezos-shell)) (modules (Registerer)))) |} version version version version version version version version diff --git a/src/lib_protocol_compiler/main_embedded_packer.ml b/src/lib_protocol_compiler/main_embedded_packer.ml index 5ff3afd26..0c115622f 100644 --- a/src/lib_protocol_compiler/main_embedded_packer.ml +++ b/src/lib_protocol_compiler/main_embedded_packer.ml @@ -26,7 +26,7 @@ end let () = Format.printf {| let () = - let module Ignored = Tezos_node_shell.State.Register_embedded_protocol + let module Ignored = Tezos_shell.State.Register_embedded_protocol (Tezos_embedded_protocol_environment_%s.Environment) (Tezos_embedded_raw_protocol_%s.Main) (Source) in diff --git a/src/lib_node_shell/block_locator_iterator.ml b/src/lib_shell/block_locator_iterator.ml similarity index 100% rename from src/lib_node_shell/block_locator_iterator.ml rename to src/lib_shell/block_locator_iterator.ml diff --git a/src/lib_node_shell/block_locator_iterator.mli b/src/lib_shell/block_locator_iterator.mli similarity index 100% rename from src/lib_node_shell/block_locator_iterator.mli rename to src/lib_shell/block_locator_iterator.mli diff --git a/src/lib_node_shell/block_validator.ml b/src/lib_shell/block_validator.ml similarity index 100% rename from src/lib_node_shell/block_validator.ml rename to src/lib_shell/block_validator.ml diff --git a/src/lib_node_shell/block_validator.mli b/src/lib_shell/block_validator.mli similarity index 100% rename from src/lib_node_shell/block_validator.mli rename to src/lib_shell/block_validator.mli diff --git a/src/lib_node_shell/bootstrap_pipeline.ml b/src/lib_shell/bootstrap_pipeline.ml similarity index 100% rename from src/lib_node_shell/bootstrap_pipeline.ml rename to src/lib_shell/bootstrap_pipeline.ml diff --git a/src/lib_node_shell/bootstrap_pipeline.mli b/src/lib_shell/bootstrap_pipeline.mli similarity index 100% rename from src/lib_node_shell/bootstrap_pipeline.mli rename to src/lib_shell/bootstrap_pipeline.mli diff --git a/src/lib_node_shell/chain.ml b/src/lib_shell/chain.ml similarity index 100% rename from src/lib_node_shell/chain.ml rename to src/lib_shell/chain.ml diff --git a/src/lib_node_shell/chain.mli b/src/lib_shell/chain.mli similarity index 100% rename from src/lib_node_shell/chain.mli rename to src/lib_shell/chain.mli diff --git a/src/lib_node_shell/chain_traversal.ml b/src/lib_shell/chain_traversal.ml similarity index 100% rename from src/lib_node_shell/chain_traversal.ml rename to src/lib_shell/chain_traversal.ml diff --git a/src/lib_node_shell/chain_traversal.mli b/src/lib_shell/chain_traversal.mli similarity index 100% rename from src/lib_node_shell/chain_traversal.mli rename to src/lib_shell/chain_traversal.mli diff --git a/src/lib_node_shell/distributed_db.ml b/src/lib_shell/distributed_db.ml similarity index 100% rename from src/lib_node_shell/distributed_db.ml rename to src/lib_shell/distributed_db.ml diff --git a/src/lib_node_shell/distributed_db.mli b/src/lib_shell/distributed_db.mli similarity index 100% rename from src/lib_node_shell/distributed_db.mli rename to src/lib_shell/distributed_db.mli diff --git a/src/lib_node_shell/distributed_db_functors.ml b/src/lib_shell/distributed_db_functors.ml similarity index 100% rename from src/lib_node_shell/distributed_db_functors.ml rename to src/lib_shell/distributed_db_functors.ml diff --git a/src/lib_node_shell/distributed_db_functors.mli b/src/lib_shell/distributed_db_functors.mli similarity index 100% rename from src/lib_node_shell/distributed_db_functors.mli rename to src/lib_shell/distributed_db_functors.mli diff --git a/src/lib_node_shell/distributed_db_message.ml b/src/lib_shell/distributed_db_message.ml similarity index 100% rename from src/lib_node_shell/distributed_db_message.ml rename to src/lib_shell/distributed_db_message.ml diff --git a/src/lib_node_shell/distributed_db_message.mli b/src/lib_shell/distributed_db_message.mli similarity index 100% rename from src/lib_node_shell/distributed_db_message.mli rename to src/lib_shell/distributed_db_message.mli diff --git a/src/lib_node_shell/distributed_db_metadata.ml b/src/lib_shell/distributed_db_metadata.ml similarity index 100% rename from src/lib_node_shell/distributed_db_metadata.ml rename to src/lib_shell/distributed_db_metadata.ml diff --git a/src/lib_node_shell/distributed_db_metadata.mli b/src/lib_shell/distributed_db_metadata.mli similarity index 100% rename from src/lib_node_shell/distributed_db_metadata.mli rename to src/lib_shell/distributed_db_metadata.mli diff --git a/src/lib_node_shell/jbuild b/src/lib_shell/jbuild similarity index 92% rename from src/lib_node_shell/jbuild rename to src/lib_shell/jbuild index 8b1d3dae8..0b9971ea2 100644 --- a/src/lib_node_shell/jbuild +++ b/src/lib_shell/jbuild @@ -1,8 +1,8 @@ (jbuild_version 1) (library - ((name tezos_node_shell) - (public_name tezos-node-shell) + ((name tezos_shell) + (public_name tezos-shell) (libraries (tezos-base tezos-storage tezos-rpc-http diff --git a/src/lib_node_shell/net_validator.ml b/src/lib_shell/net_validator.ml similarity index 100% rename from src/lib_node_shell/net_validator.ml rename to src/lib_shell/net_validator.ml diff --git a/src/lib_node_shell/net_validator.mli b/src/lib_shell/net_validator.mli similarity index 100% rename from src/lib_node_shell/net_validator.mli rename to src/lib_shell/net_validator.mli diff --git a/src/lib_node_shell/node.ml b/src/lib_shell/node.ml similarity index 100% rename from src/lib_node_shell/node.ml rename to src/lib_shell/node.ml diff --git a/src/lib_node_shell/node.mli b/src/lib_shell/node.mli similarity index 100% rename from src/lib_node_shell/node.mli rename to src/lib_shell/node.mli diff --git a/src/lib_node_shell/node_rpc.ml b/src/lib_shell/node_rpc.ml similarity index 100% rename from src/lib_node_shell/node_rpc.ml rename to src/lib_shell/node_rpc.ml diff --git a/src/lib_node_shell/node_rpc.mli b/src/lib_shell/node_rpc.mli similarity index 100% rename from src/lib_node_shell/node_rpc.mli rename to src/lib_shell/node_rpc.mli diff --git a/src/lib_node_shell/peer_validator.ml b/src/lib_shell/peer_validator.ml similarity index 100% rename from src/lib_node_shell/peer_validator.ml rename to src/lib_shell/peer_validator.ml diff --git a/src/lib_node_shell/peer_validator.mli b/src/lib_shell/peer_validator.mli similarity index 100% rename from src/lib_node_shell/peer_validator.mli rename to src/lib_shell/peer_validator.mli diff --git a/src/lib_node_shell/prevalidation.ml b/src/lib_shell/prevalidation.ml similarity index 100% rename from src/lib_node_shell/prevalidation.ml rename to src/lib_shell/prevalidation.ml diff --git a/src/lib_node_shell/prevalidation.mli b/src/lib_shell/prevalidation.mli similarity index 100% rename from src/lib_node_shell/prevalidation.mli rename to src/lib_shell/prevalidation.mli diff --git a/src/lib_node_shell/prevalidator.ml b/src/lib_shell/prevalidator.ml similarity index 100% rename from src/lib_node_shell/prevalidator.ml rename to src/lib_shell/prevalidator.ml diff --git a/src/lib_node_shell/prevalidator.mli b/src/lib_shell/prevalidator.mli similarity index 100% rename from src/lib_node_shell/prevalidator.mli rename to src/lib_shell/prevalidator.mli diff --git a/src/lib_node_shell/protocol_validator.ml b/src/lib_shell/protocol_validator.ml similarity index 100% rename from src/lib_node_shell/protocol_validator.ml rename to src/lib_shell/protocol_validator.ml diff --git a/src/lib_node_shell/protocol_validator.mli b/src/lib_shell/protocol_validator.mli similarity index 100% rename from src/lib_node_shell/protocol_validator.mli rename to src/lib_shell/protocol_validator.mli diff --git a/src/lib_node_shell/state.ml b/src/lib_shell/state.ml similarity index 100% rename from src/lib_node_shell/state.ml rename to src/lib_shell/state.ml diff --git a/src/lib_node_shell/state.mli b/src/lib_shell/state.mli similarity index 100% rename from src/lib_node_shell/state.mli rename to src/lib_shell/state.mli diff --git a/src/lib_node_shell/tezos-node-shell.opam b/src/lib_shell/tezos-shell.opam similarity index 100% rename from src/lib_node_shell/tezos-node-shell.opam rename to src/lib_shell/tezos-shell.opam diff --git a/src/lib_node_shell/validator.ml b/src/lib_shell/validator.ml similarity index 100% rename from src/lib_node_shell/validator.ml rename to src/lib_shell/validator.ml diff --git a/src/lib_node_shell/validator.mli b/src/lib_shell/validator.mli similarity index 100% rename from src/lib_node_shell/validator.mli rename to src/lib_shell/validator.mli diff --git a/src/lib_node_shell/worker.ml b/src/lib_shell/worker.ml similarity index 100% rename from src/lib_node_shell/worker.ml rename to src/lib_shell/worker.ml diff --git a/src/lib_node_shell/worker.mli b/src/lib_shell/worker.mli similarity index 100% rename from src/lib_node_shell/worker.mli rename to src/lib_shell/worker.mli 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 bf7535387..e2813e50f 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 @@ -11,7 +11,7 @@ depends: [ "jbuilder" { build & >= "1.0+beta15" } "tezos-protocol-compiler" "tezos-node-updater" - "tezos-node-shell" + "tezos-shell" ] build: [ [ "rm" "jbuild" "src/jbuild" ] 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 938be65f2..764d7660f 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 @@ -11,7 +11,7 @@ depends: [ "jbuilder" { build & >= "1.0+beta15" } "tezos-protocol-compiler" "tezos-node-updater" - "tezos-node-shell" + "tezos-shell" ] build: [ [ "rm" "jbuild" "src/jbuild" ] 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 cab1bdd0d..50b09b38d 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 @@ -11,7 +11,7 @@ depends: [ "jbuilder" { build & >= "1.0+beta15" } "tezos-protocol-compiler" "tezos-node-updater" - "tezos-node-shell" + "tezos-shell" ] build: [ [ "rm" "jbuild" "src/jbuild" ] diff --git a/test/shell/jbuild b/test/shell/jbuild index 0542f65c5..24a772f4e 100644 --- a/test/shell/jbuild +++ b/test/shell/jbuild @@ -6,7 +6,7 @@ test_store)) (libraries (tezos-base tezos-storage - tezos-node-shell + tezos-shell tezos-embedded-protocol-demo tezos-embedded-protocol-alpha tezos-embedded-protocol-genesis @@ -15,7 +15,7 @@ -safe-string -open Tezos_base__TzPervasives -open Tezos_storage - -open Tezos_node_shell)))) + -open Tezos_shell)))) (alias ((name buildtest)