From f8df7c479629f2fb780b8cc456e3ae432da7ce80 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Tue, 29 Aug 2023 13:36:26 +0200 Subject: [PATCH 1/6] Manifest: Remove "tezos" and "octez" from octez-libs sub-libs name --- contrib/bin_codec_kaitai/dune | 10 +- contrib/octez_injector_server/dune | 8 +- devtools/get_contracts/dune | 8 +- devtools/testnet_experiment_tools/dune | 20 +-- devtools/tztop/dune | 2 +- devtools/yes_wallet/dune | 4 +- devtools/yes_wallet/test/dune | 4 +- manifest/main.ml | 137 +++++++++++------- src/bin_client/dune | 10 +- src/bin_codec/dune | 10 +- src/bin_dac_client/dune | 10 +- src/bin_dac_node/dune | 16 +- src/bin_dal_node/dune | 22 +-- src/bin_evm_proxy/dune | 10 +- src/bin_evm_proxy/lib_dev/dune | 6 +- src/bin_evm_proxy/lib_prod/dune | 6 +- src/bin_evm_proxy/test/dune | 8 +- src/bin_node/dune | 14 +- src/bin_proxy_server/dune | 12 +- src/bin_sequencer_node/dune | 4 +- src/bin_signer/dune | 16 +- src/bin_smart_rollup_node/dune | 4 +- src/bin_snoop/dune | 8 +- src/bin_tps_evaluation/dune | 2 +- src/bin_wasm_debugger/dune | 8 +- src/lib_aplonk/dune | 4 +- src/lib_aplonk/plonk-aggregation/dune | 6 +- src/lib_aplonk/test/dune | 8 +- src/lib_base/dune | 14 +- src/lib_base/p2p_identity_file/dune | 6 +- src/lib_base/test/dune | 6 +- src/lib_base/test_helpers/dune | 12 +- src/lib_base/unix/dune | 16 +- src/lib_base/unix/test/dune | 10 +- src/lib_benchmark/dune | 10 +- src/lib_benchmark/example/dune | 6 +- .../lib_micheline_rewriting/dune | 8 +- .../lib_micheline_rewriting/test/dune | 4 +- src/lib_benchmark/test/dune | 10 +- src/lib_bls12_381_hash/dune | 2 +- src/lib_bls12_381_hash/test/dune | 2 +- src/lib_bls12_381_polynomial/dune | 2 +- src/lib_bls12_381_polynomial/test/dune | 4 +- src/lib_bls12_381_signature/dune | 2 +- src/lib_bls12_381_signature/test/dune | 2 +- src/lib_clic/dune | 8 +- src/lib_clic/examples/dune | 2 +- src/lib_clic/test/dune | 4 +- src/lib_clic/unix/dune | 12 +- src/lib_client_base/dune | 6 +- src/lib_client_base/test/dune | 2 +- src/lib_client_base_unix/dune | 14 +- src/lib_client_base_unix/test/dune | 4 +- src/lib_client_commands/dune | 12 +- src/lib_context/disk/dune | 8 +- src/lib_context/dump/dune | 4 +- src/lib_context/encoding/dune | 4 +- src/lib_context/helpers/dune | 6 +- src/lib_context/memory/dune | 6 +- src/lib_context/memory/test/dune | 6 +- src/lib_context/merkle_proof_encoding/dune | 6 +- src/lib_context/sigs/dune | 6 +- src/lib_context/test/dune | 10 +- src/lib_crawler/dune | 8 +- src/lib_crypto/dune | 14 +- src/lib_crypto/test-unix/dune | 10 +- src/lib_crypto/test/dune | 10 +- src/lib_crypto_dal/dal_config/dune | 2 +- src/lib_crypto_dal/dune | 12 +- src/lib_crypto_dal/test/dune | 12 +- src/lib_dac/dune | 2 +- src/lib_dac/test/dune | 10 +- src/lib_dac_client/dune | 6 +- src/lib_dac_node/dune | 8 +- src/lib_dac_node/test/dune | 10 +- src/lib_dal_node/dune | 8 +- src/lib_dal_node/gossipsub/dune | 6 +- src/lib_dal_node_services/dune | 6 +- src/lib_distributed_plonk/communication/dune | 4 +- src/lib_distributed_plonk/distribution/dune | 6 +- .../distribution/test/dune | 4 +- src/lib_distributed_plonk/dune | 18 +-- src/lib_distributed_plonk/test/dune | 12 +- src/lib_epoxy_tx/dune | 8 +- src/lib_epoxy_tx/test/dune | 6 +- src/lib_error_monad/dune | 6 +- src/lib_error_monad/test/dune | 2 +- src/lib_event_logging/dune | 8 +- src/lib_event_logging/test_helpers/dune | 12 +- src/lib_expect_helper/dune | 2 +- src/lib_expect_helper/test/dune | 2 +- src/lib_gossipsub/dune | 12 +- src/lib_gossipsub/test/dune | 6 +- src/lib_hacl/dune | 2 +- src/lib_hacl/test/dune | 10 +- src/lib_injector/dune | 10 +- src/lib_layer2_store/dune | 4 +- src/lib_layer2_store/test/dune | 2 +- src/lib_lazy_containers/dune | 4 +- src/lib_lazy_containers/test/dune | 2 +- .../bare/functor_outputs/dune | 2 +- src/lib_lwt_result_stdlib/bare/sigs/dune | 4 +- src/lib_lwt_result_stdlib/bare/structs/dune | 4 +- src/lib_lwt_result_stdlib/dune | 10 +- .../examples/traces/dune | 6 +- src/lib_lwt_result_stdlib/test/dune | 6 +- .../traced/functor_outputs/dune | 4 +- src/lib_lwt_result_stdlib/traced/sigs/dune | 8 +- src/lib_lwt_result_stdlib/traced/structs/dune | 6 +- src/lib_mec/dune | 2 +- src/lib_mec/test/dune | 2 +- src/lib_micheline/dune | 6 +- src/lib_micheline/test/dune | 4 +- src/lib_mockup/dune | 18 +-- src/lib_mockup/test/dune | 8 +- src/lib_mockup_proxy/dune | 6 +- src/lib_node_config/dune | 10 +- src/lib_octogram/dune | 2 +- src/lib_p2p/dune | 12 +- src/lib_p2p/test/common/dune | 8 +- src/lib_p2p/test/dune | 14 +- src/lib_p2p/tezt/dune | 14 +- src/lib_p2p_services/dune | 4 +- src/lib_plompiler/dune | 8 +- src/lib_plonk/dune | 6 +- src/lib_plonk/test/dune | 14 +- src/lib_plonk/test_plompiler/dune | 6 +- src/lib_polynomial/dune | 2 +- src/lib_polynomial/test/dune | 4 +- src/lib_protocol_compiler/bin/dune | 10 +- src/lib_protocol_compiler/dune | 8 +- src/lib_protocol_compiler/registerer/dune | 2 +- src/lib_protocol_environment/context_ops/dune | 4 +- src/lib_protocol_environment/dune | 10 +- .../shell_context/dune | 2 +- src/lib_protocol_environment/structs/dune | 8 +- src/lib_protocol_environment/test/dune | 6 +- .../test_shell_context/dune | 4 +- src/lib_protocol_updater/dune | 6 +- src/lib_proxy/dune | 6 +- src/lib_proxy/rpc/dune | 4 +- src/lib_proxy/test/dune | 10 +- .../test_helpers/shell_services/dune | 4 +- .../test_helpers/shell_services/test/dune | 6 +- src/lib_proxy_server_config/dune | 4 +- src/lib_proxy_server_config/test/dune | 6 +- src/lib_requester/dune | 6 +- src/lib_requester/test/dune | 14 +- src/lib_rpc/dune | 4 +- src/lib_rpc_http/dune | 34 ++--- src/lib_rpc_http/test/dune | 14 +- src/lib_sapling/dune | 8 +- src/lib_sapling/test/dune | 14 +- src/lib_scoru_sequencer/dune | 8 +- src/lib_scoru_sequencer/test/dune | 6 +- src/lib_scoru_wasm/bench/dune | 2 +- src/lib_scoru_wasm/bench/executable/dune | 2 +- src/lib_scoru_wasm/dune | 10 +- src/lib_scoru_wasm/fast/dune | 6 +- src/lib_scoru_wasm/fast/test/dune | 10 +- src/lib_scoru_wasm/helpers/dune | 6 +- src/lib_scoru_wasm/regressions/dune | 4 +- src/lib_scoru_wasm/test/dune | 10 +- src/lib_scoru_wasm/test/durable_snapshot/dune | 4 +- src/lib_scoru_wasm/test/helpers/dune | 10 +- src/lib_shell/dune | 14 +- src/lib_shell/test/dune | 12 +- src/lib_shell_benchmarks/dune | 10 +- src/lib_shell_services/dune | 10 +- src/lib_shell_services/test/dune | 2 +- src/lib_signer_backends/dune | 8 +- src/lib_signer_backends/test/dune | 10 +- src/lib_signer_backends/unix/dune | 16 +- src/lib_signer_backends/unix/test/dune | 6 +- src/lib_signer_services/dune | 4 +- src/lib_smart_rollup/dune | 10 +- src/lib_smart_rollup_node/dune | 8 +- src/lib_srs_extraction/dune | 8 +- src/lib_srs_extraction/test/dune | 2 +- src/lib_stdlib/dune | 2 +- src/lib_stdlib/test-unix/dune | 4 +- src/lib_stdlib/test/dune | 4 +- src/lib_stdlib_unix/dune | 10 +- src/lib_stdlib_unix/test/dune | 8 +- src/lib_store/dune | 6 +- src/lib_store/mocked/dune | 4 +- src/lib_store/shared/dune | 6 +- src/lib_store/unix/dune | 22 +-- src/lib_store/unix/test/bench/dune | 2 +- src/lib_store/unix/test/dune | 8 +- src/lib_store/unix/test/slow/dune | 2 +- src/lib_test/dune | 2 +- src/lib_tree_encoding/dune | 8 +- src/lib_tree_encoding/test/dune | 10 +- src/lib_validation/dune | 8 +- src/lib_version/dune | 6 +- src/lib_version/exe/dune | 6 +- src/lib_version/parser/dune | 2 +- src/lib_version/test/dune | 4 +- src/lib_version/value/dune | 6 +- src/lib_webassembly/bin/dune | 4 +- src/lib_webassembly/dune | 8 +- src/lib_webassembly/extra/dune | 2 +- src/lib_workers/dune | 4 +- src/lib_workers/test/dune | 10 +- src/proto_000_Ps9mPmXa/lib_client/dune | 8 +- src/proto_001_PtCJ7pwo/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_002_PsYLVpVv/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_003_PsddFKi3/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_004_Pt24m4xi/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_005_PsBabyM1/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_006_PsCARTHA/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_007_PsDELPH1/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_007_PsDELPH1/lib_plugin/dune | 4 +- src/proto_008_PtEdo2Zk/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_008_PtEdo2Zk/lib_plugin/dune | 4 +- src/proto_009_PsFLoren/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_009_PsFLoren/lib_plugin/dune | 4 +- src/proto_010_PtGRANAD/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- src/proto_010_PtGRANAD/lib_plugin/dune | 4 +- src/proto_011_PtHangz2/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 8 +- src/proto_011_PtHangz2/lib_parameters/dune | 4 +- src/proto_011_PtHangz2/lib_plugin/dune | 4 +- src/proto_012_Psithaca/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 8 +- src/proto_012_Psithaca/lib_parameters/dune | 4 +- src/proto_012_Psithaca/lib_plugin/dune | 4 +- src/proto_013_PtJakart/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 8 +- src/proto_013_PtJakart/lib_parameters/dune | 4 +- src/proto_013_PtJakart/lib_plugin/dune | 4 +- src/proto_014_PtKathma/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 8 +- src/proto_014_PtKathma/lib_parameters/dune | 4 +- src/proto_014_PtKathma/lib_plugin/dune | 4 +- src/proto_015_PtLimaPt/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 8 +- src/proto_015_PtLimaPt/lib_parameters/dune | 4 +- src/proto_015_PtLimaPt/lib_plugin/dune | 4 +- src/proto_016_PtMumbai/lib_client/dune | 6 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 8 +- src/proto_016_PtMumbai/lib_layer2_utils/dune | 2 +- src/proto_016_PtMumbai/lib_parameters/dune | 4 +- src/proto_016_PtMumbai/lib_plugin/dune | 4 +- src/proto_016_PtMumbai/lib_sc_rollup/dune | 2 +- .../lib_sc_rollup_layer2/dune | 2 +- src/proto_017_PtNairob/bin_accuser/dune | 6 +- src/proto_017_PtNairob/bin_baker/dune | 6 +- .../bin_sc_rollup_client/dune | 4 +- .../bin_sc_rollup_node/dune | 4 +- src/proto_017_PtNairob/lib_benchmark/dune | 10 +- .../lib_benchmark_type_inference/dune | 8 +- .../lib_benchmark_type_inference/test/dune | 4 +- .../lib_benchmark/test/dune | 6 +- .../lib_benchmarks_proto/dune | 12 +- src/proto_017_PtNairob/lib_client/dune | 6 +- src/proto_017_PtNairob/lib_client/test/dune | 8 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 8 +- src/proto_017_PtNairob/lib_dac_plugin/dune | 4 +- .../lib_dac_plugin/test/dune | 4 +- src/proto_017_PtNairob/lib_dal/dune | 4 +- src/proto_017_PtNairob/lib_dal/test/dune | 4 +- src/proto_017_PtNairob/lib_delegate/dune | 24 +-- src/proto_017_PtNairob/lib_delegate/test/dune | 8 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 4 +- src/proto_017_PtNairob/lib_injector/dune | 2 +- src/proto_017_PtNairob/lib_layer2_utils/dune | 2 +- src/proto_017_PtNairob/lib_parameters/dune | 4 +- src/proto_017_PtNairob/lib_plugin/dune | 4 +- src/proto_017_PtNairob/lib_plugin/test/dune | 12 +- .../lib_protocol/test/helpers/dune | 12 +- .../test/integration/consensus/dune | 4 +- .../lib_protocol/test/integration/dune | 4 +- .../lib_protocol/test/integration/gas/dune | 4 +- .../test/integration/michelson/dune | 6 +- .../test/integration/operations/dune | 4 +- .../test/integration/validate/dune | 6 +- .../lib_protocol/test/pbt/dune | 10 +- .../lib_protocol/test/regression/dune | 4 +- .../lib_protocol/test/unit/dune | 14 +- src/proto_017_PtNairob/lib_sc_rollup/dune | 2 +- .../lib_sc_rollup_client/dune | 2 +- .../lib_sc_rollup_layer2/dune | 2 +- .../lib_sc_rollup_node/dune | 14 +- .../lib_sc_rollup_node/test/dune | 4 +- .../lib_sc_rollup_node/test/helpers/dune | 4 +- src/proto_018_Proxford/bin_accuser/dune | 6 +- src/proto_018_Proxford/bin_baker/dune | 6 +- .../bin_sc_rollup_client/dune | 4 +- .../bin_sc_rollup_node/dune | 4 +- src/proto_018_Proxford/lib_benchmark/dune | 10 +- .../lib_benchmark_type_inference/dune | 8 +- .../lib_benchmark_type_inference/test/dune | 4 +- .../lib_benchmark/test/dune | 6 +- .../lib_benchmarks_proto/dune | 12 +- src/proto_018_Proxford/lib_client/dune | 6 +- src/proto_018_Proxford/lib_client/test/dune | 8 +- .../lib_client_commands/dune | 14 +- .../lib_client_sapling/dune | 8 +- src/proto_018_Proxford/lib_dac_plugin/dune | 4 +- .../lib_dac_plugin/test/dune | 4 +- src/proto_018_Proxford/lib_dal/dune | 4 +- src/proto_018_Proxford/lib_dal/test/dune | 4 +- src/proto_018_Proxford/lib_delegate/dune | 24 +-- src/proto_018_Proxford/lib_delegate/test/dune | 8 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 4 +- src/proto_018_Proxford/lib_injector/dune | 2 +- src/proto_018_Proxford/lib_layer2_utils/dune | 2 +- src/proto_018_Proxford/lib_parameters/dune | 4 +- src/proto_018_Proxford/lib_plugin/dune | 4 +- src/proto_018_Proxford/lib_plugin/test/dune | 12 +- .../lib_protocol/test/helpers/dune | 12 +- .../test/integration/consensus/dune | 4 +- .../lib_protocol/test/integration/dune | 4 +- .../lib_protocol/test/integration/gas/dune | 4 +- .../test/integration/michelson/dune | 6 +- .../test/integration/operations/dune | 4 +- .../test/integration/validate/dune | 6 +- .../lib_protocol/test/pbt/dune | 10 +- .../lib_protocol/test/regression/dune | 4 +- .../lib_protocol/test/unit/dune | 14 +- src/proto_018_Proxford/lib_sc_rollup/dune | 2 +- .../lib_sc_rollup_client/dune | 2 +- .../lib_sc_rollup_layer2/dune | 2 +- .../lib_sc_rollup_node/dune | 14 +- .../lib_sc_rollup_node/test/dune | 4 +- .../lib_sc_rollup_node/test/helpers/dune | 4 +- src/proto_alpha/bin_accuser/dune | 6 +- src/proto_alpha/bin_baker/dune | 6 +- src/proto_alpha/bin_sc_rollup_client/dune | 4 +- src/proto_alpha/bin_sc_rollup_node/dune | 4 +- src/proto_alpha/lib_benchmark/dune | 10 +- .../lib_benchmark_type_inference/dune | 8 +- .../lib_benchmark_type_inference/test/dune | 4 +- src/proto_alpha/lib_benchmark/test/dune | 6 +- src/proto_alpha/lib_benchmarks_proto/dune | 12 +- src/proto_alpha/lib_client/dune | 6 +- src/proto_alpha/lib_client/test/dune | 8 +- src/proto_alpha/lib_client_commands/dune | 14 +- src/proto_alpha/lib_client_sapling/dune | 8 +- src/proto_alpha/lib_dac_plugin/dune | 4 +- src/proto_alpha/lib_dac_plugin/test/dune | 4 +- src/proto_alpha/lib_dal/dune | 4 +- src/proto_alpha/lib_dal/test/dune | 4 +- src/proto_alpha/lib_delegate/dune | 24 +-- src/proto_alpha/lib_delegate/test/dune | 8 +- .../lib_delegate/test/mockup_simulator/dune | 4 +- .../lib_delegate/test/tenderbrute/dune | 2 +- .../lib_delegate/test/tenderbrute/lib/dune | 4 +- src/proto_alpha/lib_injector/dune | 2 +- src/proto_alpha/lib_layer2_utils/dune | 2 +- src/proto_alpha/lib_parameters/dune | 4 +- src/proto_alpha/lib_plugin/dune | 4 +- src/proto_alpha/lib_plugin/test/dune | 12 +- .../lib_protocol/test/helpers/dune | 12 +- .../test/integration/consensus/dune | 4 +- .../lib_protocol/test/integration/dune | 4 +- .../lib_protocol/test/integration/gas/dune | 4 +- .../test/integration/michelson/dune | 6 +- .../test/integration/operations/dune | 4 +- .../test/integration/validate/dune | 6 +- src/proto_alpha/lib_protocol/test/pbt/dune | 10 +- .../lib_protocol/test/regression/dune | 4 +- src/proto_alpha/lib_protocol/test/unit/dune | 14 +- src/proto_alpha/lib_sc_rollup/dune | 2 +- src/proto_alpha/lib_sc_rollup_client/dune | 2 +- src/proto_alpha/lib_sc_rollup_layer2/dune | 2 +- src/proto_alpha/lib_sc_rollup_node/dune | 14 +- src/proto_alpha/lib_sc_rollup_node/test/dune | 4 +- .../lib_sc_rollup_node/test/helpers/dune | 4 +- src/proto_demo_counter/lib_client/dune | 2 +- src/proto_genesis/lib_client/dune | 4 +- tezt/lib_tezos/dune | 6 +- tezt/long_tests/dune | 8 +- tezt/tests/dune | 8 +- 397 files changed, 1479 insertions(+), 1446 deletions(-) diff --git a/contrib/bin_codec_kaitai/dune b/contrib/bin_codec_kaitai/dune index ea8797cd91b6..dd0a6cafe156 100644 --- a/contrib/bin_codec_kaitai/dune +++ b/contrib/bin_codec_kaitai/dune @@ -10,13 +10,13 @@ data-encoding kaitai-of-data-encoding kaitai - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix octez-shell-libs.client-base-unix octez-shell-libs.client-base - octez-libs.tezos-clic - octez-libs.tezos-stdlib-unix - octez-libs.tezos-event-logging + octez-libs.clic + octez-libs.stdlib-unix + octez-libs.event-logging octez-shell-libs.signer-services tezos-version.value (select void_for_linking-octez-protocol-005-PsBabyM1-libs-client from diff --git a/contrib/octez_injector_server/dune b/contrib/octez_injector_server/dune index dabd07a4fde8..360834d27ee7 100644 --- a/contrib/octez_injector_server/dune +++ b/contrib/octez_injector_server/dune @@ -7,11 +7,11 @@ (package octez-injector-server) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-injector - octez-libs.tezos-stdlib-unix - octez-libs.tezos-rpc-http-server - octez-libs.tezos-rpc-http + octez-libs.stdlib-unix + octez-libs.rpc-http-server + octez-libs.rpc-http octez-shell-libs.client-base octez-shell-libs.client-base-unix data-encoding diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index 1b49517a375c..889fcbdd171e 100644 --- a/devtools/get_contracts/dune +++ b/devtools/get_contracts/dune @@ -4,8 +4,8 @@ (library (name get_contracts_lib) (libraries - octez-libs.tezos-micheline - octez-libs.tezos-base + octez-libs.micheline + octez-libs.base octez-shell-libs.store tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.client @@ -23,8 +23,8 @@ (executable (name get_contracts) (libraries - octez-libs.tezos-micheline - octez-libs.tezos-base + octez-libs.micheline + octez-libs.base get_contracts_lib) (link_flags (:standard) diff --git a/devtools/testnet_experiment_tools/dune b/devtools/testnet_experiment_tools/dune index fab52fb544bb..2b5bd52806c8 100644 --- a/devtools/testnet_experiment_tools/dune +++ b/devtools/testnet_experiment_tools/dune @@ -7,9 +7,9 @@ tezt tezt-tezos octez-shell-libs.client-base-unix - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix octez-protocol-alpha-libs.client tezos-protocol-alpha.protocol) (link_flags @@ -27,9 +27,9 @@ (library (name simulation_scenario_lib) (libraries - octez-libs.tezos-stdlib-unix - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.stdlib-unix + octez-libs.base + octez-libs.base.unix octez-shell-libs.client-base octez-shell-libs.client-base-unix octez-protocol-017-PtNairob-libs.baking @@ -57,11 +57,11 @@ (executable (name simulation_scenario) (libraries - octez-libs.tezos-stdlib-unix - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.stdlib-unix + octez-libs.base + octez-libs.base.unix octez-shell-libs.store - octez-libs.tezos-clic + octez-libs.clic octez-shell-libs.store.unix-snapshots octez-shell-libs.store.shared octez-node-config diff --git a/devtools/tztop/dune b/devtools/tztop/dune index 640b96032f49..9b02f54dda40 100644 --- a/devtools/tztop/dune +++ b/devtools/tztop/dune @@ -8,6 +8,6 @@ (modes byte) (libraries octez-protocol-compiler - octez-libs.tezos-base + octez-libs.base compiler-libs.toplevel (select tztop.ml from (utop -> tztop.utop.ml) (-> tztop.vanilla.ml)))) diff --git a/devtools/yes_wallet/dune b/devtools/yes_wallet/dune index a929cf4814be..a73bafa74d35 100644 --- a/devtools/yes_wallet/dune +++ b/devtools/yes_wallet/dune @@ -4,8 +4,8 @@ (library (name yes_wallet_lib) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix lwt.unix ezjsonm octez-shell-libs.store diff --git a/devtools/yes_wallet/test/dune b/devtools/yes_wallet/test/dune index 8f2efda82bb8..7117c49a4c9e 100644 --- a/devtools/yes_wallet/test/dune +++ b/devtools/yes_wallet/test/dune @@ -4,8 +4,8 @@ (executable (name bench_signature_perf) (libraries - octez-libs.tezos-error-monad - octez-libs.tezos-crypto + octez-libs.error-monad + octez-libs.crypto zarith zarith_stubs_js data-encoding diff --git a/manifest/main.ml b/manifest/main.ml index 52be7c8fe662..27e57d8b00cd 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -500,7 +500,7 @@ let octez_l2_lib : Sub_lib.maker = let octez_test_helpers = octez_lib - "tezos-test-helpers" + "test-helpers" ~path:"src/lib_test" ~internal_name:"tezos_test_helpers" ~deps:[uri; fmt; qcheck_alcotest; lwt; pure_splitmix; data_encoding] @@ -516,7 +516,10 @@ let octez_test_helpers = ] let octez_expect_helper = - octez_lib "tezos-expect-helper" ~path:"src/lib_expect_helper" + octez_lib + "expect-helper" + ~internal_name:"tezos_expect_helper" + ~path:"src/lib_expect_helper" let _octez_expect_helper_test = private_lib @@ -528,7 +531,8 @@ let _octez_expect_helper_test = let octez_stdlib = octez_lib - "tezos-stdlib" + "stdlib" + ~internal_name:"tezos_stdlib" ~path:"src/lib_stdlib" ~synopsis:"Yet-another local-extension of the OCaml standard library" ~deps:[hex; zarith; zarith_stubs_js; lwt; aches] @@ -588,7 +592,7 @@ let _octez_stdlib_test_unix = let octez_lwt_result_stdlib_bare_functor_outputs = octez_lib - "tezos-lwt-result-stdlib.bare.functor-outputs" + "lwt-result-stdlib.bare.functor-outputs" ~path:"src/lib_lwt_result_stdlib/bare/functor_outputs" ~internal_name:"bare_functor_outputs" ~js_compatible:true @@ -596,7 +600,7 @@ let octez_lwt_result_stdlib_bare_functor_outputs = let octez_lwt_result_stdlib_bare_sigs = octez_lib - "tezos-lwt-result-stdlib.bare.sigs" + "lwt-result-stdlib.bare.sigs" ~path:"src/lib_lwt_result_stdlib/bare/sigs" ~internal_name:"bare_sigs" ~js_compatible:true @@ -604,7 +608,7 @@ let octez_lwt_result_stdlib_bare_sigs = let octez_lwt_result_stdlib_bare_structs = octez_lib - "tezos-lwt-result-stdlib.bare.structs" + "lwt-result-stdlib.bare.structs" ~path:"src/lib_lwt_result_stdlib/bare/structs" ~internal_name:"bare_structs" ~js_compatible:true @@ -612,7 +616,7 @@ let octez_lwt_result_stdlib_bare_structs = let octez_lwt_result_stdlib_traced_functor_outputs = octez_lib - "tezos-lwt-result-stdlib.traced.functor-outputs" + "lwt-result-stdlib.traced.functor-outputs" ~path:"src/lib_lwt_result_stdlib/traced/functor_outputs" ~internal_name:"traced_functor_outputs" ~js_compatible:true @@ -620,7 +624,7 @@ let octez_lwt_result_stdlib_traced_functor_outputs = let octez_lwt_result_stdlib_traced_sigs = octez_lib - "tezos-lwt-result-stdlib.traced.sigs" + "lwt-result-stdlib.traced.sigs" ~path:"src/lib_lwt_result_stdlib/traced/sigs" ~internal_name:"traced_sigs" ~js_compatible:true @@ -634,7 +638,7 @@ let octez_lwt_result_stdlib_traced_sigs = let octez_lwt_result_stdlib_traced_structs = octez_lib - "tezos-lwt-result-stdlib.traced.structs" + "lwt-result-stdlib.traced.structs" ~path:"src/lib_lwt_result_stdlib/traced/structs" ~internal_name:"traced_structs" ~js_compatible:true @@ -647,8 +651,9 @@ let octez_lwt_result_stdlib_traced_structs = let octez_lwt_result_stdlib = octez_lib - "tezos-lwt-result-stdlib" + "lwt-result-stdlib" ~path:"src/lib_lwt_result_stdlib" + ~internal_name:"tezos_lwt_result_stdlib" ~synopsis:"error-aware stdlib replacement" ~js_compatible:true ~documentation: @@ -668,7 +673,7 @@ let octez_lwt_result_stdlib = let octez_lwt_result_stdlib_examples_traces = octez_lib - "tezos-lwt-result-stdlib.examples.traces" + "lwt-result-stdlib.examples.traces" ~path:"src/lib_lwt_result_stdlib/examples/traces" ~internal_name:"traces" ~deps: @@ -708,7 +713,8 @@ let _octez_lwt_result_stdlib_tests = let octez_error_monad = octez_lib - "tezos-error-monad" + "error-monad" + ~internal_name:"tezos_error_monad" ~path:"src/lib_error_monad" ~synopsis:"Error monad" ~deps: @@ -727,7 +733,8 @@ let octez_hacl = let js_generated = "runtime-generated.js" in let js_helper = "helper.js" in octez_lib - "tezos-hacl" + "hacl" + ~internal_name:"tezos_hacl" ~path:"src/lib_hacl" ~synopsis:"Thin layer around hacl-star" ~deps:[hacl_star; hacl_star_raw; ctypes_stubs_js] @@ -863,7 +870,8 @@ let _octez_error_monad_tests = let octez_rpc = octez_lib - "tezos-rpc" + "rpc" + ~internal_name:"tezos_rpc" ~path:"src/lib_rpc" ~synopsis: "Library of auto-documented RPCs (service and hierarchy descriptions)" @@ -1100,7 +1108,7 @@ let _octez_bls12_381_utils = let octez_bls12_381_signature = octez_lib - "octez-bls12-381-signature" + "bls12-381-signature" ~path:"src/lib_bls12_381_signature" ~internal_name:"bls12_381_signature" ~deps:[bls12_381] @@ -1155,7 +1163,8 @@ let _octez_bls12_381_signature_gen_wasm_needed_names = let octez_crypto = octez_lib - "tezos-crypto" + "crypto" + ~internal_name:"tezos_crypto" ~path:"src/lib_crypto" ~synopsis:"Library with all the cryptographic primitives used by Tezos" ~deps: @@ -1235,7 +1244,7 @@ let _octez_crypto_tests_unix = let octez_bls12_381_hash = octez_lib - "octez-bls12-381-hash" + "bls12-381-hash" ~path:"src/lib_bls12_381_hash" ~internal_name:"bls12_381_hash" ~c_library_flags:["-Wall"; "-Wextra"; ":standard"; "-lpthread"] @@ -1269,7 +1278,7 @@ let _octez_bls12_381_hash_tests = let octez_mec = octez_lib - "octez-mec" + "mec" ~path:"src/lib_mec" ~internal_name:"mec" ~deps:[alcotest; bls12_381; bigarray_compat; eqaf] @@ -1341,7 +1350,7 @@ let _octez_mec_tests = let octez_polynomial = octez_lib - "octez-polynomial" + "polynomial" ~path:"src/lib_polynomial" ~internal_name:"polynomial" ~synopsis:"Polynomials over finite fields" @@ -1356,7 +1365,8 @@ let _octez_polynomial_tests = let octez_bls12_381_polynomial = octez_lib - "octez-bls12-381-polynomial" + "bls12-381-polynomial" + ~internal_name:"octez_bls12_381_polynomial" ~path:"src/lib_bls12_381_polynomial" ~synopsis: "Polynomials over BLS12-381 finite field - Temporary vendored version of \ @@ -1406,7 +1416,8 @@ let _octez_bls12_381_polynomial_tests = let octez_srs_extraction = octez_lib - "octez-srs-extraction" + "srs-extraction" + ~internal_name:"octez_srs_extraction" ~path:"src/lib_srs_extraction" ~modules:["libsrs"] ~bisect_ppx:No @@ -1486,7 +1497,7 @@ let _octez_srs_extraction_tests = let octez_plompiler = octez_lib - "octez-plompiler" + "plompiler" ~internal_name:"plompiler" ~path:"src/lib_plompiler" ~deps: @@ -1549,7 +1560,7 @@ let make_plonk_runtest_invocation ~package = let octez_plonk = octez_lib - "octez-plonk" + "plonk" ~internal_name:"plonk" ~path:"src/lib_plonk" ~deps: @@ -1565,7 +1576,7 @@ let octez_plonk = let octez_plonk_aggregation = octez_lib - "octez-plonk.aggregation" + "plonk.aggregation" ~path:"src/lib_aplonk/plonk-aggregation" ~internal_name:"aggregation" ~preprocess:[pps ppx_repr] @@ -1573,7 +1584,7 @@ let octez_plonk_aggregation = let octez_aplonk = octez_lib - "octez-aplonk" + "aplonk" ~internal_name:"aplonk" ~path:"src/lib_aplonk" ~preprocess:[pps ppx_repr] @@ -1581,7 +1592,7 @@ let octez_aplonk = let octez_plonk_distribution = octez_lib - "octez-plonk.distribution" + "plonk.distribution" ~internal_name:"distribution" ~path:"src/lib_distributed_plonk/distribution" ~deps:[octez_plonk; octez_plonk_aggregation] @@ -1589,7 +1600,7 @@ let octez_plonk_distribution = let octez_plonk_communication = octez_lib - "octez-plonk.communication" + "plonk.communication" ~internal_name:"communication" ~path:"src/lib_distributed_plonk/communication" ~deps:[logs; distributed_internal_lwt; octez_plonk_distribution |> open_] @@ -1597,7 +1608,7 @@ let octez_plonk_communication = let octez_plonk_test_helpers = octez_lib - "octez-plonk.plonk-test" + "plonk.plonk-test" ~path:"src/lib_plonk/test" ~internal_name:"plonk_test" ~deps:[octez_plonk; octez_plonk_aggregation; octez_plonk_distribution] @@ -1699,7 +1710,7 @@ let _octez_plonk_test_plompiler_main = let octez_distributed_plonk = octez_lib - "octez-distributed-plonk" + "distributed-plonk" ~internal_name:"distributed_plonk" ~path:"src/lib_distributed_plonk" ~deps: @@ -1784,7 +1795,7 @@ let _octez_aplonk_test_helpers_bench = let octez_epoxy_tx = octez_lib - "octez-epoxy-tx" + "epoxy-tx" ~path:"src/lib_epoxy_tx" ~internal_name:"epoxy_tx" ~deps:[octez_plompiler; hex; stdint; octez_plonk; octez_mec] @@ -1799,14 +1810,16 @@ let _octez_epoxy_tx_tests = let octez_dal_config = octez_lib - "tezos-crypto-dal.octez-dal-config" + "crypto-dal.dal-config" + ~internal_name:"tezos_crypto_dal_octez_dal_config" ~path:"src/lib_crypto_dal/dal_config" ~deps:[data_encoding |> open_] ~js_compatible:true let octez_crypto_dal = octez_lib - "tezos-crypto-dal" + "crypto-dal" + ~internal_name:"tezos_crypto_dal" ~path:"src/lib_crypto_dal" ~synopsis:"DAL cryptographic primitives" ~deps: @@ -1841,7 +1854,8 @@ let _octez_crypto_dal_tests = let octez_event_logging = octez_lib - "tezos-event-logging" + "event-logging" + ~internal_name:"tezos_event_logging" ~path:"src/lib_event_logging" ~synopsis:"Octez event logging library" ~deps: @@ -1856,7 +1870,8 @@ let octez_event_logging = let octez_event_logging_test_helpers = octez_lib - "tezos-event-logging-test-helpers" + "event-logging-test-helpers" + ~internal_name:"tezos_event_logging_test_helpers" ~path:"src/lib_event_logging/test_helpers" ~synopsis:"Test helpers for the event logging library" ~deps: @@ -1875,7 +1890,8 @@ let octez_event_logging_test_helpers = let octez_stdlib_unix = octez_lib - "tezos-stdlib-unix" + "stdlib-unix" + ~internal_name:"tezos_stdlib_unix" ~path:"src/lib_stdlib_unix" ~synopsis: "Yet-another local-extension of the OCaml standard library \ @@ -1918,7 +1934,8 @@ let _octez_stdlib_unix_test = let octez_clic = octez_lib - "tezos-clic" + "clic" + ~internal_name:"tezos_clic" ~path:"src/lib_clic" ~deps: [ @@ -1932,7 +1949,8 @@ let octez_clic = let octez_clic_unix = octez_lib - "tezos-clic.unix" + "clic.unix" + ~internal_name:"tezos_clic_unix" ~path:"src/lib_clic/unix" ~deps: [ @@ -1961,7 +1979,8 @@ let _octez_clic_example = let octez_micheline = octez_lib - "tezos-micheline" + "micheline" + ~internal_name:"tezos_micheline" ~path:"src/lib_micheline" ~synopsis:"Internal AST and parser for the Michelson language" ~deps: @@ -1998,7 +2017,8 @@ let _octez_micheline_tests = let octez_base = octez_lib - "tezos-base" + "base" + ~internal_name:"tezos_base" ~path:"src/lib_base" ~synopsis:"Meta-package and pervasive type definitions for Tezos" ~deps: @@ -2029,7 +2049,8 @@ let octez_base = let octez_base_unix = octez_lib - "tezos-base.unix" + "base.unix" + ~internal_name:"tezos_base_unix" ~path:"src/lib_base/unix" ~deps: [ @@ -2047,7 +2068,8 @@ let octez_base_unix = let octez_base_p2p_identity_file = octez_lib - "tezos-base.p2p-identity-file" + "base.p2p-identity-file" + ~internal_name:"tezos_base_p2p_identity_file" ~path:"src/lib_base/p2p_identity_file" ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_stdlib_unix |> open_] @@ -2103,7 +2125,8 @@ let _octez_base_unix_tests = let octez_base_test_helpers = octez_lib - "tezos-base-test-helpers" + "base-test-helpers" + ~internal_name:"tezos_base_test_helpers" ~path:"src/lib_base/test_helpers" ~synopsis:"Octez base test helpers" ~deps: @@ -2122,14 +2145,16 @@ let octez_base_test_helpers = let octez_context_sigs = octez_lib - "tezos-context.sigs" + "context.sigs" + ~internal_name:"tezos_context_sigs" ~path:"src/lib_context/sigs" ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_stdlib |> open_] ~js_compatible:true let tree_encoding = octez_lib - "tezos-tree-encoding" + "tree-encoding" + ~internal_name:"tezos_tree_encoding" ~path:"src/lib_tree_encoding" ~synopsis: "A general-purpose library to encode arbitrary data in Merkle trees" @@ -2143,7 +2168,8 @@ let tree_encoding = let lazy_containers = octez_lib - "tezos-lazy-containers" + "lazy-containers" + ~internal_name:"tezos_lazy_containers" ~path:"src/lib_lazy_containers" ~synopsis: "A collection of lazy containers whose contents is fetched from \ @@ -2223,7 +2249,8 @@ let _octez_webassembly_test = let octez_version_parser = octez_lib - "tezos-version.parser" + "version.parser" + ~internal_name:"tezos_version_parser" ~path:"src/lib_version/parser" ~dune:Dune.[ocamllex "tezos_version_parser"] ~js_compatible:true @@ -2231,7 +2258,8 @@ let octez_version_parser = let octez_version = octez_lib - "tezos-version" + "version" + ~internal_name:"tezos_version" ~path:"src/lib_version" ~synopsis:"Version information generated from Git" ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_version_parser] @@ -3382,7 +3410,8 @@ let _octez_store_mocked = let octez_requester = octez_lib - "tezos-requester" + "requester" + ~internal_name:"tezos_requester" ~path:"src/lib_requester" ~deps: [ @@ -3449,7 +3478,8 @@ let octez_shell = let octez_rpc_http = octez_lib - "tezos-rpc-http" + "rpc-http" + ~internal_name:"tezos-rpc-http" ~path:"src/lib_rpc_http" ~synopsis:"Library of auto-documented RPCs (http server and client)" ~deps:[octez_base |> open_ ~m:"TzPervasives"; octez_rpc; resto_cohttp; uri] @@ -3457,7 +3487,8 @@ let octez_rpc_http = let octez_rpc_http_client = octez_lib - "tezos-rpc-http-client" + "rpc-http-client" + ~internal_name:"tezos-rpc-http-client" ~path:"src/lib_rpc_http" ~synopsis:"Library of auto-documented RPCs (http client)" ~deps: @@ -3471,7 +3502,8 @@ let octez_rpc_http_client = let octez_rpc_http_client_unix = octez_lib - "tezos-rpc-http-client-unix" + "rpc-http-client-unix" + ~internal_name:"tezos_rpc_http_client_unix" ~path:"src/lib_rpc_http" ~synopsis:"Unix implementation of the RPC client" ~deps: @@ -3487,7 +3519,8 @@ let octez_rpc_http_client_unix = let octez_rpc_http_server = octez_lib - "tezos-rpc-http-server" + "rpc-http-server" + ~internal_name:"tezos_rpc_http_server" ~path:"src/lib_rpc_http" ~synopsis:"Library of auto-documented RPCs (http server)" ~deps: diff --git a/src/bin_client/dune b/src/bin_client/dune index ba59c64cdd4f..08f4ec5b3dfb 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -7,11 +7,11 @@ (package octez-client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-clic - octez-libs.tezos-rpc-http-client - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.base.unix + octez-libs.clic + octez-libs.rpc-http-client + octez-libs.stdlib-unix octez-shell-libs.shell-services octez-shell-libs.client-base octez-shell-libs.client-commands diff --git a/src/bin_codec/dune b/src/bin_codec/dune index 3f96218b2884..4d408ee1faba 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -8,13 +8,13 @@ (instrumentation (backend bisect_ppx)) (libraries data-encoding - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix octez-shell-libs.client-base-unix octez-shell-libs.client-base - octez-libs.tezos-clic - octez-libs.tezos-stdlib-unix - octez-libs.tezos-event-logging + octez-libs.clic + octez-libs.stdlib-unix + octez-libs.event-logging octez-shell-libs.signer-services tezos-version.value (select void_for_linking-octez-protocol-005-PsBabyM1-libs-client from diff --git a/src/bin_dac_client/dune b/src/bin_dac_client/dune index 250bbac7444a..028f2a2d354a 100644 --- a/src/bin_dac_client/dune +++ b/src/bin_dac_client/dune @@ -7,14 +7,14 @@ (package octez-dac-client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-clic + octez-libs.base + octez-libs.base.unix + octez-libs.clic octez-shell-libs.client-base octez-shell-libs.client-base-unix octez-shell-libs.client-commands - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib + octez-libs.stdlib-unix + octez-libs.stdlib tezos-dac-lib tezos-dac-client-lib octez-protocol-017-PtNairob-libs.dac diff --git a/src/bin_dac_node/dune b/src/bin_dac_node/dune index 8ee726dc641a..bf16b138e628 100644 --- a/src/bin_dac_node/dune +++ b/src/bin_dac_node/dune @@ -7,18 +7,18 @@ (package octez-dac-node) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-clic + octez-libs.base + octez-libs.base.unix + octez-libs.clic octez-shell-libs.client-base octez-shell-libs.client-base-unix octez-shell-libs.client-commands - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server + octez-libs.rpc-http + octez-libs.rpc-http-server octez-shell-libs.protocol-updater - octez-libs.tezos-rpc-http-client-unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib + octez-libs.rpc-http-client-unix + octez-libs.stdlib-unix + octez-libs.stdlib tezos-dac-lib tezos_dac_node_lib octez-l2-libs.layer2_store diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index d59fd17ae246..06f664c455c6 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -7,31 +7,31 @@ (package octez-dal-node) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-version + octez-libs.base + octez-libs.base.unix + octez-libs.version cmdliner octez-shell-libs.client-base octez-shell-libs.client-base-unix octez-shell-libs.client-commands - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server + octez-libs.rpc-http + octez-libs.rpc-http-server octez-shell-libs.protocol-updater - octez-libs.tezos-rpc-http-client-unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib + octez-libs.rpc-http-client-unix + octez-libs.stdlib-unix + octez-libs.stdlib tezos-dal-node-lib tezos-dal-node-services octez-l2-libs.layer2_store - octez-libs.tezos-crypto-dal + octez-libs.crypto-dal octez-shell-libs.store.unix octez-shell-libs.store.shared octez-libs.tezos-gossipsub tezos-dal-node-lib.gossipsub octez-shell-libs.p2p octez-libs.tezos-p2p-services - octez-libs.tezos-crypto - octez-libs.tezos-base.p2p-identity-file + octez-libs.crypto + octez-libs.base.p2p-identity-file octez-shell-libs.shell-services irmin-pack irmin-pack.unix diff --git a/src/bin_evm_proxy/dune b/src/bin_evm_proxy/dune index 2c7456d54587..3d667657cad8 100644 --- a/src/bin_evm_proxy/dune +++ b/src/bin_evm_proxy/dune @@ -7,11 +7,11 @@ (package octez-evm-proxy) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-clic - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server + octez-libs.base + octez-libs.base.unix + octez-libs.clic + octez-libs.rpc-http + octez-libs.rpc-http-server tezos-version.value evm_proxy_lib_prod evm_proxy_lib_dev) diff --git a/src/bin_evm_proxy/lib_dev/dune b/src/bin_evm_proxy/lib_dev/dune index a09bc339c737..7c246d7eb0a2 100644 --- a/src/bin_evm_proxy/lib_dev/dune +++ b/src/bin_evm_proxy/lib_dev/dune @@ -6,9 +6,9 @@ (package octez-evm-proxy-lib-dev) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-client-unix + octez-libs.base + octez-libs.rpc-http + octez-libs.rpc-http-client-unix tezos-version.value lwt-exit) (flags diff --git a/src/bin_evm_proxy/lib_prod/dune b/src/bin_evm_proxy/lib_prod/dune index 69008d9cfabd..5794fa585c27 100644 --- a/src/bin_evm_proxy/lib_prod/dune +++ b/src/bin_evm_proxy/lib_prod/dune @@ -6,9 +6,9 @@ (package octez-evm-proxy-lib-prod) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-client-unix + octez-libs.base + octez-libs.rpc-http + octez-libs.rpc-http-client-unix tezos-version.value lwt-exit) (flags diff --git a/src/bin_evm_proxy/test/dune b/src/bin_evm_proxy/test/dune index 87a253cad38e..c746b9050cfe 100644 --- a/src/bin_evm_proxy/test/dune +++ b/src/bin_evm_proxy/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base + octez-libs.base.unix + octez-libs.base-test-helpers + octez-libs.test-helpers qcheck-alcotest octez-alcotezt evm_proxy_lib_prod diff --git a/src/bin_node/dune b/src/bin_node/dune index 7a86e12cdb5e..284355fa36d1 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -7,15 +7,15 @@ (package octez-node) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-version + octez-libs.base + octez-libs.base.unix + octez-libs.version tezos-version.value octez-node-config - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.shell-services - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server + octez-libs.rpc-http + octez-libs.rpc-http-server octez-shell-libs.p2p octez-shell-libs.shell octez-shell-libs.store @@ -33,7 +33,7 @@ prometheus-app.unix lwt-exit uri - octez-libs.tezos-base.p2p-identity-file + octez-libs.base.p2p-identity-file (select void_for_linking-tezos-protocol-genesis-embedded-protocol from (tezos-protocol-genesis.embedded-protocol -> void_for_linking-tezos-protocol-genesis-embedded-protocol.empty) (-> void_for_linking-tezos-protocol-genesis-embedded-protocol.empty)) diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index 9ead09785401..edd328bbc398 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -7,17 +7,17 @@ (package octez-proxy-server) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-rpc + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.rpc cmdliner lwt-exit lwt.unix octez-shell-libs.proxy tezos-proxy-server-config - octez-libs.tezos-rpc-http-client-unix - octez-libs.tezos-rpc-http-server + octez-libs.rpc-http-client-unix + octez-libs.rpc-http-server octez-shell-libs.shell-services octez-shell-libs.shell-context tezos-version.value diff --git a/src/bin_sequencer_node/dune b/src/bin_sequencer_node/dune index 86b255eb9078..f36ed627c2e8 100644 --- a/src/bin_sequencer_node/dune +++ b/src/bin_sequencer_node/dune @@ -7,8 +7,8 @@ (package octez-smart-rollup-sequencer-node) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.client-base octez-shell-libs.client-base-unix octez-shell-libs.client-commands diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 409f3ddc0db1..39490ad53c14 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -7,18 +7,18 @@ (package octez-signer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-clic + octez-libs.base + octez-libs.base.unix + octez-libs.clic octez-shell-libs.client-base octez-shell-libs.client-base-unix octez-shell-libs.client-commands octez-shell-libs.signer-services - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server - octez-libs.tezos-rpc-http-client-unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib + octez-libs.rpc-http + octez-libs.rpc-http-server + octez-libs.rpc-http-client-unix + octez-libs.stdlib-unix + octez-libs.stdlib octez-shell-libs.signer-backends.unix) (link_flags (:standard) diff --git a/src/bin_smart_rollup_node/dune b/src/bin_smart_rollup_node/dune index cff8d3d9ca4e..78a4c8ca9f5e 100644 --- a/src/bin_smart_rollup_node/dune +++ b/src/bin_smart_rollup_node/dune @@ -7,8 +7,8 @@ (package octez-smart-rollup-node) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base octez-shell-libs.client-base-unix diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index fd3241eab86c..347524ebba4f 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -7,10 +7,10 @@ (package octez-snoop) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-clic + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.clic tezos-benchmark tezos-benchmark-examples octez-shell-libs.shell-benchmarks diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune index c43639ed8520..4abaad52a2a1 100644 --- a/src/bin_tps_evaluation/dune +++ b/src/bin_tps_evaluation/dune @@ -7,7 +7,7 @@ (package tezos-tps-evaluation) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base caqti caqti-dynload caqti-lwt diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune index 77c573dddc98..845f686064d0 100644 --- a/src/bin_wasm_debugger/dune +++ b/src/bin_wasm_debugger/dune @@ -7,10 +7,10 @@ (package octez-smart-rollup-wasm-debugger) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-tree-encoding - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.clic + octez-libs.tree-encoding + octez-libs.base.unix yaml octez-protocol-alpha-libs.client octez-l2-libs.scoru-wasm diff --git a/src/lib_aplonk/dune b/src/lib_aplonk/dune index 1854f232308d..0f6c104c1431 100644 --- a/src/lib_aplonk/dune +++ b/src/lib_aplonk/dune @@ -3,8 +3,8 @@ (library (name aplonk) - (public_name octez-libs.octez-aplonk) + (public_name octez-libs.aplonk) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.octez-plonk.aggregation) + octez-libs.plonk.aggregation) (preprocess (pps ppx_repr))) diff --git a/src/lib_aplonk/plonk-aggregation/dune b/src/lib_aplonk/plonk-aggregation/dune index decff0c74fbb..9c2a4733350d 100644 --- a/src/lib_aplonk/plonk-aggregation/dune +++ b/src/lib_aplonk/plonk-aggregation/dune @@ -3,11 +3,11 @@ (library (name aggregation) - (public_name octez-libs.octez-plonk.aggregation) + (public_name octez-libs.plonk.aggregation) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.octez-plonk - octez-libs.octez-bls12-381-polynomial) + octez-libs.plonk + octez-libs.bls12-381-polynomial) (preprocess (pps ppx_repr)) (flags (:standard) diff --git a/src/lib_aplonk/test/dune b/src/lib_aplonk/test/dune index 0987a8415099..647cba2e3fac 100644 --- a/src/lib_aplonk/test/dune +++ b/src/lib_aplonk/test/dune @@ -5,8 +5,8 @@ (name main) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.octez-plonk.plonk-test - octez-libs.octez-aplonk) + octez-libs.plonk.plonk-test + octez-libs.aplonk) (modules main test_aplonk test_main_protocol)) (rule @@ -31,6 +31,6 @@ (executable (name bench) (libraries - octez-libs.octez-plonk.plonk-test - octez-libs.octez-aplonk) + octez-libs.plonk.plonk-test + octez-libs.aplonk) (modules bench)) diff --git a/src/lib_base/dune b/src/lib_base/dune index 6d05fe449bb4..5eb86f9747e1 100644 --- a/src/lib_base/dune +++ b/src/lib_base/dune @@ -5,16 +5,16 @@ (library (name tezos_base) - (public_name octez-libs.tezos-base) + (public_name octez-libs.base) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-crypto + octez-libs.stdlib + octez-libs.crypto data-encoding - octez-libs.tezos-error-monad - octez-libs.tezos-rpc - octez-libs.tezos-micheline - octez-libs.tezos-event-logging + octez-libs.error-monad + octez-libs.rpc + octez-libs.micheline + octez-libs.event-logging ptime ptime.clock.os ezjsonm diff --git a/src/lib_base/p2p_identity_file/dune b/src/lib_base/p2p_identity_file/dune index ccd19e5c2379..289f92a0ab79 100644 --- a/src/lib_base/p2p_identity_file/dune +++ b/src/lib_base/p2p_identity_file/dune @@ -3,11 +3,11 @@ (library (name tezos_base_p2p_identity_file) - (public_name octez-libs.tezos-base.p2p-identity-file) + (public_name octez-libs.base.p2p-identity-file) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix) + octez-libs.base + octez-libs.stdlib-unix) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune index 115c8f944116..4fb2dced466a 100644 --- a/src/lib_base/test/dune +++ b/src/lib_base/test/dune @@ -8,10 +8,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-error-monad + octez-libs.base + octez-libs.error-monad data-encoding - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest octez-alcotezt) (js_of_ocaml) diff --git a/src/lib_base/test_helpers/dune b/src/lib_base/test_helpers/dune index 9e25d00204d2..59f16d46664e 100644 --- a/src/lib_base/test_helpers/dune +++ b/src/lib_base/test_helpers/dune @@ -3,13 +3,13 @@ (library (name tezos_base_test_helpers) - (public_name octez-libs.tezos-base-test-helpers) + (public_name octez-libs.base-test-helpers) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-event-logging-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.event-logging-test-helpers + octez-libs.test-helpers octez-alcotezt qcheck-alcotest) (library_flags (:standard -linkall)) diff --git a/src/lib_base/unix/dune b/src/lib_base/unix/dune index 19dc0fc507e7..e288c4218b31 100644 --- a/src/lib_base/unix/dune +++ b/src/lib_base/unix/dune @@ -3,18 +3,18 @@ (library (name tezos_base_unix) - (public_name octez-libs.tezos-base.unix) + (public_name octez-libs.base.unix) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-error-monad - octez-libs.tezos-crypto - octez-libs.tezos-base - octez-libs.tezos-hacl - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix + octez-libs.error-monad + octez-libs.crypto + octez-libs.base + octez-libs.hacl + octez-libs.stdlib + octez-libs.stdlib-unix data-encoding uri - octez-libs.tezos-event-logging) + octez-libs.event-logging) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) (flags diff --git a/src/lib_base/unix/test/dune b/src/lib_base/unix/test/dune index d41336c91afd..5bb5699458c1 100644 --- a/src/lib_base/unix/test/dune +++ b/src/lib_base/unix/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-error-monad + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.error-monad data-encoding - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest octez-alcotezt tezt) diff --git a/src/lib_benchmark/dune b/src/lib_benchmark/dune index ea3b934e9a3c..75c00befbb2c 100644 --- a/src/lib_benchmark/dune +++ b/src/lib_benchmark/dune @@ -7,11 +7,11 @@ (instrumentation (backend bisect_ppx)) (libraries str - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix - octez-libs.tezos-crypto - octez-libs.tezos-micheline - octez-libs.tezos-clic + octez-libs.base + octez-libs.stdlib-unix + octez-libs.crypto + octez-libs.micheline + octez-libs.clic data-encoding prbnmcn-linalg prbnmcn-stats diff --git a/src/lib_benchmark/example/dune b/src/lib_benchmark/example/dune index 2d68cde5f02e..b26a70efb36a 100644 --- a/src/lib_benchmark/example/dune +++ b/src/lib_benchmark/example/dune @@ -6,9 +6,9 @@ (public_name tezos-benchmark-examples) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix - octez-libs.tezos-crypto + octez-libs.base + octez-libs.stdlib-unix + octez-libs.crypto tezos-benchmark) (flags (:standard) diff --git a/src/lib_benchmark/lib_micheline_rewriting/dune b/src/lib_benchmark/lib_micheline_rewriting/dune index 6c4c7a2a6d87..bfe5bd406798 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/dune @@ -8,10 +8,10 @@ (libraries zarith zarith_stubs_js - octez-libs.tezos-stdlib - octez-libs.tezos-crypto - octez-libs.tezos-error-monad - octez-libs.tezos-micheline) + octez-libs.stdlib + octez-libs.crypto + octez-libs.error-monad + octez-libs.micheline) (flags (:standard) -open Tezos_stdlib diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune index 32a4f92720a4..5007c81f6025 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/test/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-micheline + octez-libs.micheline tezos-micheline-rewriting tezos-protocol-alpha.protocol - octez-libs.tezos-error-monad + octez-libs.error-monad octez-protocol-alpha-libs.client) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune index b0259d22cfed..4b2642c83610 100644 --- a/src/lib_benchmark/test/dune +++ b/src/lib_benchmark/test/dune @@ -7,11 +7,11 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-micheline - octez-libs.tezos-crypto + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.micheline + octez-libs.crypto tezos-benchmark tezos-benchmark-examples) (library_flags (:standard -linkall)) diff --git a/src/lib_bls12_381_hash/dune b/src/lib_bls12_381_hash/dune index 3171bd8ef00d..f708295ee501 100644 --- a/src/lib_bls12_381_hash/dune +++ b/src/lib_bls12_381_hash/dune @@ -3,7 +3,7 @@ (library (name bls12_381_hash) - (public_name octez-libs.octez-bls12-381-hash) + (public_name octez-libs.bls12-381-hash) (instrumentation (backend bisect_ppx)) (libraries bls12-381) diff --git a/src/lib_bls12_381_hash/test/dune b/src/lib_bls12_381_hash/test/dune index c2f20d2bcb70..88d48159830e 100644 --- a/src/lib_bls12_381_hash/test/dune +++ b/src/lib_bls12_381_hash/test/dune @@ -8,7 +8,7 @@ tezt.core octez-alcotezt bls12-381 - octez-libs.octez-bls12-381-hash) + octez-libs.bls12-381-hash) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_bls12_381_polynomial/dune b/src/lib_bls12_381_polynomial/dune index 75f2c8d4eceb..fb13c5397281 100644 --- a/src/lib_bls12_381_polynomial/dune +++ b/src/lib_bls12_381_polynomial/dune @@ -3,7 +3,7 @@ (library (name octez_bls12_381_polynomial) - (public_name octez-libs.octez-bls12-381-polynomial) + (public_name octez-libs.bls12-381-polynomial) (instrumentation (backend bisect_ppx)) (libraries bls12-381 diff --git a/src/lib_bls12_381_polynomial/test/dune b/src/lib_bls12_381_polynomial/test/dune index c41ddadbe9bd..5d0ff4b55bed 100644 --- a/src/lib_bls12_381_polynomial/test/dune +++ b/src/lib_bls12_381_polynomial/test/dune @@ -8,9 +8,9 @@ tezt.core octez-alcotezt qcheck-alcotest - octez-libs.octez-polynomial + octez-libs.polynomial bls12-381 - octez-libs.octez-bls12-381-polynomial) + octez-libs.bls12-381-polynomial) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_bls12_381_signature/dune b/src/lib_bls12_381_signature/dune index a5385219c951..c6540e14ff7c 100644 --- a/src/lib_bls12_381_signature/dune +++ b/src/lib_bls12_381_signature/dune @@ -5,7 +5,7 @@ (library (name bls12_381_signature) - (public_name octez-libs.octez-bls12-381-signature) + (public_name octez-libs.bls12-381-signature) (instrumentation (backend bisect_ppx)) (libraries bls12-381) diff --git a/src/lib_bls12_381_signature/test/dune b/src/lib_bls12_381_signature/test/dune index 4fe3df8699ca..3021eadbc928 100644 --- a/src/lib_bls12_381_signature/test/dune +++ b/src/lib_bls12_381_signature/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381 - octez-libs.octez-bls12-381-signature + octez-libs.bls12-381-signature octez-alcotezt integers_stubs_js) (library_flags (:standard -linkall)) diff --git a/src/lib_clic/dune b/src/lib_clic/dune index 34ab7d25a477..8ed1a08ebcd5 100644 --- a/src/lib_clic/dune +++ b/src/lib_clic/dune @@ -3,14 +3,14 @@ (library (name tezos_clic) - (public_name octez-libs.tezos-clic) + (public_name octez-libs.clic) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib + octez-libs.stdlib lwt re - octez-libs.tezos-error-monad - octez-libs.tezos-lwt-result-stdlib) + octez-libs.error-monad + octez-libs.lwt-result-stdlib) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_clic/examples/dune b/src/lib_clic/examples/dune index f1691cce4903..fe2d3a891ef7 100644 --- a/src/lib_clic/examples/dune +++ b/src/lib_clic/examples/dune @@ -4,5 +4,5 @@ (executable (name clic_example) (libraries - octez-libs.tezos-clic + octez-libs.clic lwt.unix)) diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune index b5e3a6b77673..b548c6150bdf 100644 --- a/src/lib_clic/test/dune +++ b/src/lib_clic/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib - octez-libs.tezos-clic + octez-libs.stdlib + octez-libs.clic lwt.unix octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_clic/unix/dune b/src/lib_clic/unix/dune index 4217a92c2deb..4b7b2d26bad0 100644 --- a/src/lib_clic/unix/dune +++ b/src/lib_clic/unix/dune @@ -3,14 +3,14 @@ (library (name tezos_clic_unix) - (public_name octez-libs.tezos-clic.unix) + (public_name octez-libs.clic.unix) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-clic - octez-libs.tezos-stdlib-unix - octez-libs.tezos-error-monad - octez-libs.tezos-lwt-result-stdlib) + octez-libs.stdlib + octez-libs.clic + octez-libs.stdlib-unix + octez-libs.error-monad + octez-libs.lwt-result-stdlib) (flags (:standard) -open Tezos_stdlib diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune index 99322c4751aa..afc68dbc4b09 100644 --- a/src/lib_client_base/dune +++ b/src/lib_client_base/dune @@ -8,9 +8,9 @@ (public_name octez-shell-libs.client-base) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-rpc + octez-libs.base + octez-libs.clic + octez-libs.rpc octez-shell-libs.shell-services octez-libs.tezos-sapling uri) diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune index 3789adbe2fb8..61a2c722799e 100644 --- a/src/lib_client_base/test/dune +++ b/src/lib_client_base/test/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base octez-shell-libs.client-base octez-alcotezt) (js_of_ocaml) diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index 5b1b1ceab1fd..fff76b9def43 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -6,14 +6,14 @@ (public_name octez-shell-libs.client-base-unix) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-clic - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-client-unix + octez-libs.base + octez-libs.base.unix + octez-libs.clic + octez-libs.rpc + octez-libs.rpc-http + octez-libs.rpc-http-client-unix octez-shell-libs.shell-services - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.client-commands octez-shell-libs.mockup diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune index bbc945be0bae..0654698fe180 100644 --- a/src/lib_client_base_unix/test/dune +++ b/src/lib_client_base_unix/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base octez-shell-libs.mockup-commands octez-shell-libs.client-base-unix - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index 77605660e64e..ad9671c7fe68 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -6,15 +6,15 @@ (public_name octez-shell-libs.client-commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-rpc - octez-libs.tezos-clic - octez-libs.tezos-clic.unix + octez-libs.base + octez-libs.rpc + octez-libs.clic + octez-libs.clic.unix octez-shell-libs.client-base octez-shell-libs.shell-services octez-libs.tezos-p2p-services - octez-libs.tezos-stdlib-unix - octez-libs.tezos-base.unix + octez-libs.stdlib-unix + octez-libs.base.unix octez-shell-libs.signer-backends data-encoding uri) diff --git a/src/lib_context/disk/dune b/src/lib_context/disk/dune index 4bee93503931..aa4bd6faf471 100644 --- a/src/lib_context/disk/dune +++ b/src/lib_context/disk/dune @@ -6,16 +6,16 @@ (public_name octez-libs.tezos-context.disk) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base bigstringaf fmt irmin irmin-pack irmin-pack.unix logs.fmt - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib - octez-libs.tezos-context.sigs + octez-libs.stdlib-unix + octez-libs.stdlib + octez-libs.context.sigs octez-libs.tezos-context.helpers octez-libs.tezos-context.encoding octez-libs.tezos-context.memory diff --git a/src/lib_context/dump/dune b/src/lib_context/dump/dune index a9ada4044f37..0fbf57f65859 100644 --- a/src/lib_context/dump/dune +++ b/src/lib_context/dump/dune @@ -6,8 +6,8 @@ (public_name octez-libs.tezos-context.dump) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.stdlib-unix fmt) (flags (:standard) diff --git a/src/lib_context/encoding/dune b/src/lib_context/encoding/dune index 9d35152f2072..4bd5f5f1ed22 100644 --- a/src/lib_context/encoding/dune +++ b/src/lib_context/encoding/dune @@ -6,8 +6,8 @@ (public_name octez-libs.tezos-context.encoding) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib + octez-libs.base + octez-libs.stdlib irmin irmin-pack) (flags diff --git a/src/lib_context/helpers/dune b/src/lib_context/helpers/dune index 5336086afa08..8545db7b2618 100644 --- a/src/lib_context/helpers/dune +++ b/src/lib_context/helpers/dune @@ -6,10 +6,10 @@ (public_name octez-libs.tezos-context.helpers) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib + octez-libs.base + octez-libs.stdlib octez-libs.tezos-context.encoding - octez-libs.tezos-context.sigs + octez-libs.context.sigs octez-libs.tezos-context.merkle_proof_encoding irmin irmin-pack) diff --git a/src/lib_context/memory/dune b/src/lib_context/memory/dune index e7cc2b354d98..4f841ac94dd1 100644 --- a/src/lib_context/memory/dune +++ b/src/lib_context/memory/dune @@ -6,11 +6,11 @@ (public_name octez-libs.tezos-context.memory) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib + octez-libs.base + octez-libs.stdlib irmin-pack irmin-pack.mem - octez-libs.tezos-context.sigs + octez-libs.context.sigs octez-libs.tezos-context.encoding octez-libs.tezos-context.helpers) (flags diff --git a/src/lib_context/memory/test/dune b/src/lib_context/memory/test/dune index 9a54c63ecb74..d933cc2edc35 100644 --- a/src/lib_context/memory/test/dune +++ b/src/lib_context/memory/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix octez-libs.tezos-context.disk octez-libs.tezos-context.memory - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-alcotezt) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_context/merkle_proof_encoding/dune b/src/lib_context/merkle_proof_encoding/dune index 4ea6fd61a23e..9cce4773c23b 100644 --- a/src/lib_context/merkle_proof_encoding/dune +++ b/src/lib_context/merkle_proof_encoding/dune @@ -8,9 +8,9 @@ (public_name octez-libs.tezos-context.merkle_proof_encoding) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib - octez-libs.tezos-context.sigs) + octez-libs.base + octez-libs.stdlib + octez-libs.context.sigs) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_context/sigs/dune b/src/lib_context/sigs/dune index 8863074fe351..b91eb9605596 100644 --- a/src/lib_context/sigs/dune +++ b/src/lib_context/sigs/dune @@ -5,11 +5,11 @@ (library (name tezos_context_sigs) - (public_name octez-libs.tezos-context.sigs) + (public_name octez-libs.context.sigs) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib) + octez-libs.base + octez-libs.stdlib) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune index 53c4b73c2470..e066e74c0355 100644 --- a/src/lib_context/test/dune +++ b/src/lib_context/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-context.sigs + octez-libs.base + octez-libs.base.unix + octez-libs.context.sigs octez-libs.tezos-context.disk octez-libs.tezos-context.memory octez-libs.tezos-context.encoding - octez-libs.tezos-stdlib-unix - octez-libs.tezos-test-helpers + octez-libs.stdlib-unix + octez-libs.test-helpers qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_crawler/dune b/src/lib_crawler/dune index 0df8bf62bd49..fbd9a54bc44a 100644 --- a/src/lib_crawler/dune +++ b/src/lib_crawler/dune @@ -6,10 +6,10 @@ (public_name octez-crawler) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-rpc-http - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.rpc-http + octez-libs.base.unix + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.shell) (flags diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune index 41a47f9dff2e..40b03dd96c29 100644 --- a/src/lib_crypto/dune +++ b/src/lib_crypto/dune @@ -5,22 +5,22 @@ (library (name tezos_crypto) - (public_name octez-libs.tezos-crypto) + (public_name octez-libs.crypto) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib + octez-libs.stdlib data-encoding - octez-libs.tezos-lwt-result-stdlib + octez-libs.lwt-result-stdlib lwt - octez-libs.tezos-hacl + octez-libs.hacl secp256k1-internal - octez-libs.tezos-error-monad - octez-libs.tezos-rpc + octez-libs.error-monad + octez-libs.rpc aches zarith zarith_stubs_js bls12-381 - octez-libs.octez-bls12-381-signature) + octez-libs.bls12-381-signature) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_crypto/test-unix/dune b/src/lib_crypto/test-unix/dune index 1b297cc44211..a2ef828418e7 100644 --- a/src/lib_crypto/test-unix/dune +++ b/src/lib_crypto/test-unix/dune @@ -6,17 +6,17 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib - octez-libs.tezos-crypto - octez-libs.tezos-error-monad + octez-libs.stdlib + octez-libs.crypto + octez-libs.error-monad zarith zarith_stubs_js - octez-libs.tezos-hacl + octez-libs.hacl data-encoding octez-alcotezt lwt.unix qcheck-alcotest - octez-libs.tezos-test-helpers) + octez-libs.test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune index 80bdcdbf9ab0..734d6990eaae 100644 --- a/src/lib_crypto/test/dune +++ b/src/lib_crypto/test/dune @@ -8,16 +8,16 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib - octez-libs.tezos-crypto - octez-libs.tezos-error-monad + octez-libs.stdlib + octez-libs.crypto + octez-libs.error-monad zarith zarith_stubs_js - octez-libs.tezos-hacl + octez-libs.hacl data-encoding octez-alcotezt qcheck-alcotest - octez-libs.tezos-test-helpers) + octez-libs.test-helpers) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_crypto_dal/dal_config/dune b/src/lib_crypto_dal/dal_config/dune index 7e0326af6600..d558b8aeaebf 100644 --- a/src/lib_crypto_dal/dal_config/dune +++ b/src/lib_crypto_dal/dal_config/dune @@ -3,7 +3,7 @@ (library (name tezos_crypto_dal_octez_dal_config) - (public_name octez-libs.tezos-crypto-dal.octez-dal-config) + (public_name octez-libs.crypto-dal.dal-config) (instrumentation (backend bisect_ppx)) (libraries data-encoding) diff --git a/src/lib_crypto_dal/dune b/src/lib_crypto_dal/dune index 047c3673e9f7..216097b580bf 100644 --- a/src/lib_crypto_dal/dune +++ b/src/lib_crypto_dal/dune @@ -3,15 +3,15 @@ (library (name tezos_crypto_dal) - (public_name octez-libs.tezos-crypto-dal) + (public_name octez-libs.crypto-dal) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-error-monad + octez-libs.stdlib + octez-libs.error-monad data-encoding - octez-libs.tezos-crypto-dal.octez-dal-config - octez-libs.tezos-crypto - octez-libs.octez-bls12-381-polynomial + octez-libs.crypto-dal.dal-config + octez-libs.crypto + octez-libs.bls12-381-polynomial lwt.unix) (flags (:standard) diff --git a/src/lib_crypto_dal/test/dune b/src/lib_crypto_dal/test/dune index fe20fe882370..6590376bc9b8 100644 --- a/src/lib_crypto_dal/test/dune +++ b/src/lib_crypto_dal/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib - octez-libs.tezos-crypto-dal - octez-libs.tezos-crypto-dal.octez-dal-config - octez-libs.tezos-error-monad + octez-libs.stdlib + octez-libs.crypto-dal + octez-libs.crypto-dal.dal-config + octez-libs.error-monad data-encoding octez-alcotezt qcheck-alcotest - octez-libs.octez-bls12-381-polynomial - octez-libs.tezos-test-helpers) + octez-libs.bls12-381-polynomial + octez-libs.test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_dac/dune b/src/lib_dac/dune index 58365f51f535..ecb02d595a61 100644 --- a/src/lib_dac/dune +++ b/src/lib_dac/dune @@ -6,7 +6,7 @@ (public_name tezos-dac-lib) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.protocol-updater) (flags (:standard) diff --git a/src/lib_dac/test/dune b/src/lib_dac/test/dune index f0f7f0ebc2e8..97c621f9bd5d 100644 --- a/src/lib_dac/test/dune +++ b/src/lib_dac/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix - octez-libs.tezos-base - octez-libs.tezos-test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.stdlib + octez-libs.stdlib-unix + octez-libs.base + octez-libs.test-helpers + octez-libs.base-test-helpers tezos-dac-lib octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_dac_client/dune b/src/lib_dac_client/dune index ce122353e582..b59fdec01dd1 100644 --- a/src/lib_dac_client/dune +++ b/src/lib_dac_client/dune @@ -6,11 +6,11 @@ (public_name tezos-dac-client-lib) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix octez-shell-libs.client-base octez-shell-libs.client-base-unix - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-dac-lib) (flags (:standard) diff --git a/src/lib_dac_node/dune b/src/lib_dac_node/dune index f12c2be6e297..2c94bfe3f1ca 100644 --- a/src/lib_dac_node/dune +++ b/src/lib_dac_node/dune @@ -6,13 +6,13 @@ (package tezos-dac-node-lib) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix octez-shell-libs.client-base octez-shell-libs.client-base-unix - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-l2-libs.layer2_store - octez-libs.tezos-rpc-http-server + octez-libs.rpc-http-server tezos-dac-lib tezos-dac-client-lib) (flags diff --git a/src/lib_dac_node/test/dune b/src/lib_dac_node/test/dune index bf0946c00e53..7e6a346c6e87 100644 --- a/src/lib_dac_node/test/dune +++ b/src/lib_dac_node/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix - octez-libs.tezos-base - octez-libs.tezos-test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.stdlib + octez-libs.stdlib-unix + octez-libs.base + octez-libs.test-helpers + octez-libs.base-test-helpers tezos_dac_node_lib octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_dal_node/dune b/src/lib_dal_node/dune index 1677daa71fb3..e2cffe304b31 100644 --- a/src/lib_dal_node/dune +++ b/src/lib_dal_node/dune @@ -6,14 +6,14 @@ (public_name tezos-dal-node-lib) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix tezos-dal-node-services octez-shell-libs.client-base octez-shell-libs.protocol-updater octez-shell-libs.client-base-unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-crypto-dal + octez-libs.stdlib-unix + octez-libs.crypto-dal octez-shell-libs.p2p octez-libs.tezos-p2p-services) (flags diff --git a/src/lib_dal_node/gossipsub/dune b/src/lib_dal_node/gossipsub/dune index fbdbf41ab7b2..c4032a49778d 100644 --- a/src/lib_dal_node/gossipsub/dune +++ b/src/lib_dal_node/gossipsub/dune @@ -6,12 +6,12 @@ (public_name tezos-dal-node-lib.gossipsub) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-crypto-dal + octez-libs.base + octez-libs.crypto-dal octez-libs.tezos-gossipsub octez-shell-libs.p2p octez-libs.tezos-p2p-services - octez-libs.tezos-crypto) + octez-libs.crypto) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_dal_node_services/dune b/src/lib_dal_node_services/dune index 227582c3a08f..b6eeda6439b0 100644 --- a/src/lib_dal_node_services/dune +++ b/src/lib_dal_node_services/dune @@ -6,9 +6,9 @@ (public_name tezos-dal-node-services) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-rpc - octez-libs.tezos-crypto-dal) + octez-libs.base + octez-libs.rpc + octez-libs.crypto-dal) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_distributed_plonk/communication/dune b/src/lib_distributed_plonk/communication/dune index 4401ae600ea9..33d2a347bbb0 100644 --- a/src/lib_distributed_plonk/communication/dune +++ b/src/lib_distributed_plonk/communication/dune @@ -3,12 +3,12 @@ (library (name communication) - (public_name octez-libs.octez-plonk.communication) + (public_name octez-libs.plonk.communication) (instrumentation (backend bisect_ppx)) (libraries logs octez-distributed-lwt-internal - octez-libs.octez-plonk.distribution) + octez-libs.plonk.distribution) (preprocess (pps ppx_repr)) (flags (:standard) diff --git a/src/lib_distributed_plonk/distribution/dune b/src/lib_distributed_plonk/distribution/dune index ccbb00690914..408734f8cf34 100644 --- a/src/lib_distributed_plonk/distribution/dune +++ b/src/lib_distributed_plonk/distribution/dune @@ -3,9 +3,9 @@ (library (name distribution) - (public_name octez-libs.octez-plonk.distribution) + (public_name octez-libs.plonk.distribution) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.octez-plonk - octez-libs.octez-plonk.aggregation) + octez-libs.plonk + octez-libs.plonk.aggregation) (preprocess (pps ppx_repr))) diff --git a/src/lib_distributed_plonk/distribution/test/dune b/src/lib_distributed_plonk/distribution/test/dune index 912953f9172b..d433942f537d 100644 --- a/src/lib_distributed_plonk/distribution/test/dune +++ b/src/lib_distributed_plonk/distribution/test/dune @@ -5,8 +5,8 @@ (name main) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.octez-plonk.aggregation - octez-libs.octez-plonk.plonk-test) + octez-libs.plonk.aggregation + octez-libs.plonk.plonk-test) (modules main test_polynomial_commitment)) (rule diff --git a/src/lib_distributed_plonk/dune b/src/lib_distributed_plonk/dune index 7bc83600dcdd..757601a5ac23 100644 --- a/src/lib_distributed_plonk/dune +++ b/src/lib_distributed_plonk/dune @@ -3,13 +3,13 @@ (library (name distributed_plonk) - (public_name octez-libs.octez-distributed-plonk) + (public_name octez-libs.distributed-plonk) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.octez-aplonk - octez-libs.octez-plonk.communication - octez-libs.octez-plonk - octez-libs.octez-plonk.plonk-test) + octez-libs.aplonk + octez-libs.plonk.communication + octez-libs.plonk + octez-libs.plonk.plonk-test) (preprocess (pps ppx_repr)) (flags (:standard) @@ -24,14 +24,14 @@ (executable (name worker_runner) (libraries - octez-libs.octez-distributed-plonk - octez-libs.octez-plonk.distribution) + octez-libs.distributed-plonk + octez-libs.plonk.distribution) (modules worker_runner)) (executable (name distribution) (libraries - octez-libs.octez-distributed-plonk) + octez-libs.distributed-plonk) (flags (:standard) -open Distributed_plonk) @@ -40,7 +40,7 @@ (executable (name distribution_meta) (libraries - octez-libs.octez-distributed-plonk) + octez-libs.distributed-plonk) (flags (:standard) -open Distributed_plonk) diff --git a/src/lib_distributed_plonk/test/dune b/src/lib_distributed_plonk/test/dune index 1f1a283bda3a..6b73caa0a029 100644 --- a/src/lib_distributed_plonk/test/dune +++ b/src/lib_distributed_plonk/test/dune @@ -4,12 +4,12 @@ (executable (name main) (libraries - octez-libs.octez-distributed-plonk - octez-libs.octez-plonk - octez-libs.octez-plonk.aggregation - octez-libs.octez-plonk.distribution - octez-libs.octez-aplonk - octez-libs.octez-plonk.plonk-test)) + octez-libs.distributed-plonk + octez-libs.plonk + octez-libs.plonk.aggregation + octez-libs.plonk.distribution + octez-libs.aplonk + octez-libs.plonk.plonk-test)) (rule (alias runtest) diff --git a/src/lib_epoxy_tx/dune b/src/lib_epoxy_tx/dune index 05385d364ef5..23abb98e6a72 100644 --- a/src/lib_epoxy_tx/dune +++ b/src/lib_epoxy_tx/dune @@ -3,11 +3,11 @@ (library (name epoxy_tx) - (public_name octez-libs.octez-epoxy-tx) + (public_name octez-libs.epoxy-tx) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.octez-plompiler + octez-libs.plompiler hex stdint - octez-libs.octez-plonk - octez-libs.octez-mec)) + octez-libs.plonk + octez-libs.mec)) diff --git a/src/lib_epoxy_tx/test/dune b/src/lib_epoxy_tx/test/dune index 0a0729527294..043bb3c91d29 100644 --- a/src/lib_epoxy_tx/test/dune +++ b/src/lib_epoxy_tx/test/dune @@ -5,9 +5,9 @@ (name main) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.octez-epoxy-tx - octez-libs.octez-plonk.plonk-test - octez-libs.octez-aplonk)) + octez-libs.epoxy-tx + octez-libs.plonk.plonk-test + octez-libs.aplonk)) (rule (alias runtest) diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune index 25c0e1dc5ff3..6d8a4321f3b4 100644 --- a/src/lib_error_monad/dune +++ b/src/lib_error_monad/dune @@ -3,14 +3,14 @@ (library (name tezos_error_monad) - (public_name octez-libs.tezos-error-monad) + (public_name octez-libs.error-monad) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib + octez-libs.stdlib data-encoding lwt-canceler lwt - octez-libs.tezos-lwt-result-stdlib) + octez-libs.lwt-result-stdlib) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune index 1b90349ef60a..aa692ecde6bb 100644 --- a/src/lib_error_monad/test/dune +++ b/src/lib_error_monad/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-error-monad + octez-libs.error-monad data-encoding octez-alcotezt) (js_of_ocaml) diff --git a/src/lib_event_logging/dune b/src/lib_event_logging/dune index 72eb70f0b244..97d40a67a610 100644 --- a/src/lib_event_logging/dune +++ b/src/lib_event_logging/dune @@ -3,13 +3,13 @@ (library (name tezos_event_logging) - (public_name octez-libs.tezos-event-logging) + (public_name octez-libs.event-logging) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib + octez-libs.stdlib data-encoding - octez-libs.tezos-error-monad - octez-libs.tezos-lwt-result-stdlib + octez-libs.error-monad + octez-libs.lwt-result-stdlib uri) (js_of_ocaml) (flags diff --git a/src/lib_event_logging/test_helpers/dune b/src/lib_event_logging/test_helpers/dune index f082fdbe1f6c..02df20ce04bd 100644 --- a/src/lib_event_logging/test_helpers/dune +++ b/src/lib_event_logging/test_helpers/dune @@ -3,14 +3,14 @@ (library (name tezos_event_logging_test_helpers) - (public_name octez-libs.tezos-event-logging-test-helpers) + (public_name octez-libs.event-logging-test-helpers) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-lwt-result-stdlib + octez-libs.stdlib + octez-libs.lwt-result-stdlib data-encoding - octez-libs.tezos-error-monad - octez-libs.tezos-event-logging - octez-libs.tezos-test-helpers + octez-libs.error-monad + octez-libs.event-logging + octez-libs.test-helpers octez-alcotezt) (js_of_ocaml) (library_flags (:standard -linkall)) diff --git a/src/lib_expect_helper/dune b/src/lib_expect_helper/dune index e193793da838..2b301162dac4 100644 --- a/src/lib_expect_helper/dune +++ b/src/lib_expect_helper/dune @@ -3,5 +3,5 @@ (library (name tezos_expect_helper) - (public_name octez-libs.tezos-expect-helper) + (public_name octez-libs.expect-helper) (instrumentation (backend bisect_ppx))) diff --git a/src/lib_expect_helper/test/dune b/src/lib_expect_helper/test/dune index ca4a1147e51e..3c5a9c117084 100644 --- a/src/lib_expect_helper/test/dune +++ b/src/lib_expect_helper/test/dune @@ -6,6 +6,6 @@ (package octez-libs) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-expect-helper) + octez-libs.expect-helper) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect))) diff --git a/src/lib_gossipsub/dune b/src/lib_gossipsub/dune index f2c28e2886e2..3816ea4e11a5 100644 --- a/src/lib_gossipsub/dune +++ b/src/lib_gossipsub/dune @@ -9,12 +9,12 @@ ringo aches fmt - octez-libs.tezos-error-monad - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib - octez-libs.tezos-version) + octez-libs.error-monad + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.stdlib + octez-libs.version) (flags (:standard) -open Tezos_error_monad diff --git a/src/lib_gossipsub/test/dune b/src/lib_gossipsub/test/dune index 160647b2a288..40fa201f777a 100644 --- a/src/lib_gossipsub/test/dune +++ b/src/lib_gossipsub/test/dune @@ -5,12 +5,12 @@ (name test_gossipsub) (libraries fmt - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix octez-libs.tezos-gossipsub tezt qcheck-core - octez-libs.tezos-test-helpers) + octez-libs.test-helpers) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_hacl/dune b/src/lib_hacl/dune index 9512e7629092..3a7a67ef8247 100644 --- a/src/lib_hacl/dune +++ b/src/lib_hacl/dune @@ -5,7 +5,7 @@ (library (name tezos_hacl) - (public_name octez-libs.tezos-hacl) + (public_name octez-libs.hacl) (instrumentation (backend bisect_ppx)) (libraries hacl-star diff --git a/src/lib_hacl/test/dune b/src/lib_hacl/test/dune index a7c56f4a0c3d..a8115c6dc5f4 100644 --- a/src/lib_hacl/test/dune +++ b/src/lib_hacl/test/dune @@ -8,16 +8,16 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib - octez-libs.tezos-error-monad - octez-libs.tezos-lwt-result-stdlib + octez-libs.stdlib + octez-libs.error-monad + octez-libs.lwt-result-stdlib zarith zarith_stubs_js data-encoding - octez-libs.tezos-hacl + octez-libs.hacl qcheck-alcotest octez-alcotezt - octez-libs.tezos-test-helpers) + octez-libs.test-helpers) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_injector/dune b/src/lib_injector/dune index 215bfab1dc47..92aa4259f611 100644 --- a/src/lib_injector/dune +++ b/src/lib_injector/dune @@ -6,12 +6,12 @@ (public_name octez-injector) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base logs.lwt - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-crypto - octez-libs.tezos-micheline + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.crypto + octez-libs.micheline octez-shell-libs.client-base octez-libs.tezos-workers octez-shell-libs.shell diff --git a/src/lib_layer2_store/dune b/src/lib_layer2_store/dune index 4da66c7215e7..2167a2b3504c 100644 --- a/src/lib_layer2_store/dune +++ b/src/lib_layer2_store/dune @@ -7,12 +7,12 @@ (instrumentation (backend bisect_ppx)) (libraries index - octez-libs.tezos-base + octez-libs.base irmin-pack irmin-pack.unix irmin aches-lwt - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-libs.tezos-context.encoding) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_layer2_store/test/dune b/src/lib_layer2_store/test/dune index afdb234debc4..db3eaf3919b1 100644 --- a/src/lib_layer2_store/test/dune +++ b/src/lib_layer2_store/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-error-monad + octez-libs.error-monad octez-l2-libs.layer2_store qcheck-alcotest octez-alcotezt) diff --git a/src/lib_lazy_containers/dune b/src/lib_lazy_containers/dune index aebc6053dbfc..25f5a67aa5e6 100644 --- a/src/lib_lazy_containers/dune +++ b/src/lib_lazy_containers/dune @@ -3,8 +3,8 @@ (library (name tezos_lazy_containers) - (public_name octez-libs.tezos-lazy-containers) + (public_name octez-libs.lazy-containers) (instrumentation (backend bisect_ppx)) (libraries zarith - octez-libs.tezos-tree-encoding)) + octez-libs.tree-encoding)) diff --git a/src/lib_lazy_containers/test/dune b/src/lib_lazy_containers/test/dune index 98fda0e2013f..cf2684396662 100644 --- a/src/lib_lazy_containers/test/dune +++ b/src/lib_lazy_containers/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-lazy-containers + octez-libs.lazy-containers qcheck-core qcheck-alcotest lwt.unix diff --git a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune index eca2e26415ef..6c184b695a03 100644 --- a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune @@ -3,7 +3,7 @@ (library (name bare_functor_outputs) - (public_name octez-libs.tezos-lwt-result-stdlib.bare.functor-outputs) + (public_name octez-libs.lwt-result-stdlib.bare.functor-outputs) (instrumentation (backend bisect_ppx)) (libraries lwt) diff --git a/src/lib_lwt_result_stdlib/bare/sigs/dune b/src/lib_lwt_result_stdlib/bare/sigs/dune index 38a5e298ca6d..561af8963433 100644 --- a/src/lib_lwt_result_stdlib/bare/sigs/dune +++ b/src/lib_lwt_result_stdlib/bare/sigs/dune @@ -3,10 +3,10 @@ (library (name bare_sigs) - (public_name octez-libs.tezos-lwt-result-stdlib.bare.sigs) + (public_name octez-libs.lwt-result-stdlib.bare.sigs) (instrumentation (backend bisect_ppx)) (libraries seqes lwt - octez-libs.tezos-lwt-result-stdlib.bare.functor-outputs) + octez-libs.lwt-result-stdlib.bare.functor-outputs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/bare/structs/dune b/src/lib_lwt_result_stdlib/bare/structs/dune index 711ccc12cb5a..56c23fcc1642 100644 --- a/src/lib_lwt_result_stdlib/bare/structs/dune +++ b/src/lib_lwt_result_stdlib/bare/structs/dune @@ -3,10 +3,10 @@ (library (name bare_structs) - (public_name octez-libs.tezos-lwt-result-stdlib.bare.structs) + (public_name octez-libs.lwt-result-stdlib.bare.structs) (instrumentation (backend bisect_ppx)) (libraries seqes lwt - octez-libs.tezos-lwt-result-stdlib.bare.sigs) + octez-libs.lwt-result-stdlib.bare.sigs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/dune b/src/lib_lwt_result_stdlib/dune index d7891ab8aa91..5a03968952db 100644 --- a/src/lib_lwt_result_stdlib/dune +++ b/src/lib_lwt_result_stdlib/dune @@ -3,14 +3,14 @@ (library (name tezos_lwt_result_stdlib) - (public_name octez-libs.tezos-lwt-result-stdlib) + (public_name octez-libs.lwt-result-stdlib) (instrumentation (backend bisect_ppx)) (libraries lwt - octez-libs.tezos-lwt-result-stdlib.bare.sigs - octez-libs.tezos-lwt-result-stdlib.bare.structs - octez-libs.tezos-lwt-result-stdlib.traced.sigs - octez-libs.tezos-lwt-result-stdlib.traced.structs) + octez-libs.lwt-result-stdlib.bare.sigs + octez-libs.lwt-result-stdlib.bare.structs + octez-libs.lwt-result-stdlib.traced.sigs + octez-libs.lwt-result-stdlib.traced.structs) (js_of_ocaml)) (documentation (package octez-libs) (mld_files tezos_lwt_result_stdlib)) diff --git a/src/lib_lwt_result_stdlib/examples/traces/dune b/src/lib_lwt_result_stdlib/examples/traces/dune index f77cf6ff11f9..e139911a92be 100644 --- a/src/lib_lwt_result_stdlib/examples/traces/dune +++ b/src/lib_lwt_result_stdlib/examples/traces/dune @@ -3,9 +3,9 @@ (library (name traces) - (public_name octez-libs.tezos-lwt-result-stdlib.examples.traces) + (public_name octez-libs.lwt-result-stdlib.examples.traces) (instrumentation (backend bisect_ppx)) (libraries lwt - octez-libs.tezos-lwt-result-stdlib.bare.structs - octez-libs.tezos-lwt-result-stdlib.traced.sigs)) + octez-libs.lwt-result-stdlib.bare.structs + octez-libs.lwt-result-stdlib.traced.sigs)) diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune index c1e443424b9a..1cc4c9d87ca5 100644 --- a/src/lib_lwt_result_stdlib/test/dune +++ b/src/lib_lwt_result_stdlib/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-lwt-result-stdlib - octez-libs.tezos-lwt-result-stdlib.examples.traces + octez-libs.lwt-result-stdlib + octez-libs.lwt-result-stdlib.examples.traces lwt.unix octez-alcotezt qcheck-alcotest - octez-libs.tezos-test-helpers) + octez-libs.test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune index d4fb0e8ba29e..d6f24ff8774c 100644 --- a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune @@ -3,9 +3,9 @@ (library (name traced_functor_outputs) - (public_name octez-libs.tezos-lwt-result-stdlib.traced.functor-outputs) + (public_name octez-libs.lwt-result-stdlib.traced.functor-outputs) (instrumentation (backend bisect_ppx)) (libraries lwt - octez-libs.tezos-lwt-result-stdlib.bare.sigs) + octez-libs.lwt-result-stdlib.bare.sigs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/traced/sigs/dune b/src/lib_lwt_result_stdlib/traced/sigs/dune index 9504b8d93b3a..156b9c3bfa3f 100644 --- a/src/lib_lwt_result_stdlib/traced/sigs/dune +++ b/src/lib_lwt_result_stdlib/traced/sigs/dune @@ -3,11 +3,11 @@ (library (name traced_sigs) - (public_name octez-libs.tezos-lwt-result-stdlib.traced.sigs) + (public_name octez-libs.lwt-result-stdlib.traced.sigs) (instrumentation (backend bisect_ppx)) (libraries lwt - octez-libs.tezos-lwt-result-stdlib.bare.sigs - octez-libs.tezos-lwt-result-stdlib.bare.structs - octez-libs.tezos-lwt-result-stdlib.traced.functor-outputs) + octez-libs.lwt-result-stdlib.bare.sigs + octez-libs.lwt-result-stdlib.bare.structs + octez-libs.lwt-result-stdlib.traced.functor-outputs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/traced/structs/dune b/src/lib_lwt_result_stdlib/traced/structs/dune index de70664091f6..c2c1943d569a 100644 --- a/src/lib_lwt_result_stdlib/traced/structs/dune +++ b/src/lib_lwt_result_stdlib/traced/structs/dune @@ -3,10 +3,10 @@ (library (name traced_structs) - (public_name octez-libs.tezos-lwt-result-stdlib.traced.structs) + (public_name octez-libs.lwt-result-stdlib.traced.structs) (instrumentation (backend bisect_ppx)) (libraries lwt - octez-libs.tezos-lwt-result-stdlib.traced.sigs - octez-libs.tezos-lwt-result-stdlib.bare.structs) + octez-libs.lwt-result-stdlib.traced.sigs + octez-libs.lwt-result-stdlib.bare.structs) (js_of_ocaml)) diff --git a/src/lib_mec/dune b/src/lib_mec/dune index 6662301a0d1e..04023252e1c2 100644 --- a/src/lib_mec/dune +++ b/src/lib_mec/dune @@ -3,7 +3,7 @@ (library (name mec) - (public_name octez-libs.octez-mec) + (public_name octez-libs.mec) (instrumentation (backend bisect_ppx)) (libraries alcotest diff --git a/src/lib_mec/test/dune b/src/lib_mec/test/dune index ed6bcbddfaa6..0752b1d8e539 100644 --- a/src/lib_mec/test/dune +++ b/src/lib_mec/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-alcotezt - octez-libs.octez-mec) + octez-libs.mec) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune index 191904f1abe1..5955a166b6b5 100644 --- a/src/lib_micheline/dune +++ b/src/lib_micheline/dune @@ -3,14 +3,14 @@ (library (name tezos_micheline) - (public_name octez-libs.tezos-micheline) + (public_name octez-libs.micheline) (instrumentation (backend bisect_ppx)) (libraries uutf zarith zarith_stubs_js - octez-libs.tezos-stdlib - octez-libs.tezos-error-monad + octez-libs.stdlib + octez-libs.error-monad data-encoding) (inline_tests (flags -verbose) (modes native js)) (preprocess (pps ppx_expect)) diff --git a/src/lib_micheline/test/dune b/src/lib_micheline/test/dune index 31762daa75dd..6832930594bd 100644 --- a/src/lib_micheline/test/dune +++ b/src/lib_micheline/test/dune @@ -6,7 +6,7 @@ (package octez-libs) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-micheline) + octez-libs.micheline) (inline_tests (flags -verbose) (modes native js)) (preprocess (pps ppx_expect)) (js_of_ocaml) @@ -20,7 +20,7 @@ (package octez-libs) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-micheline) + octez-libs.micheline) (inline_tests (flags -verbose) (modes native js)) (preprocess (pps ppx_expect)) (js_of_ocaml) diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index 181552e14959..d4a4778c990e 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -6,7 +6,7 @@ (public_name octez-shell-libs.mockup-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.client-base octez-shell-libs.shell-services octez-proto-libs.protocol-environment @@ -21,18 +21,18 @@ (public_name octez-shell-libs.mockup) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix octez-shell-libs.client-base octez-shell-libs.mockup-proxy resto-cohttp-self-serving-client - octez-libs.tezos-rpc + octez-libs.rpc octez-libs.tezos-p2p-services octez-shell-libs.p2p octez-proto-libs.protocol-environment - octez-libs.tezos-stdlib-unix - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-client + octez-libs.stdlib-unix + octez-libs.rpc-http + octez-libs.rpc-http-client octez-shell-libs.mockup-registration) (flags (:standard) @@ -51,8 +51,8 @@ (public_name octez-shell-libs.mockup-commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.client-commands octez-shell-libs.client-base octez-shell-libs.mockup diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune index 22fa071263fa..63ec793bca1f 100644 --- a/src/lib_mockup/test/dune +++ b/src/lib_mockup/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers - octez-libs.tezos-rpc + octez-libs.base + octez-libs.base-test-helpers + octez-libs.test-helpers + octez-libs.rpc octez-shell-libs.mockup octez-shell-libs.mockup-registration octez-shell-libs.client-base diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune index c735f245c41d..81437aab8aeb 100644 --- a/src/lib_mockup_proxy/dune +++ b/src/lib_mockup_proxy/dune @@ -6,12 +6,12 @@ (public_name octez-shell-libs.mockup-proxy) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.client-base octez-proto-libs.protocol-environment - octez-libs.tezos-rpc-http + octez-libs.rpc-http resto-cohttp-self-serving-client - octez-libs.tezos-rpc-http-client + octez-libs.rpc-http-client octez-shell-libs.shell-services uri) (flags diff --git a/src/lib_node_config/dune b/src/lib_node_config/dune index 321a86ad70fc..047410e8f4c6 100644 --- a/src/lib_node_config/dune +++ b/src/lib_node_config/dune @@ -6,12 +6,12 @@ (public_name octez-node-config) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix octez-shell-libs.shell-services - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server + octez-libs.rpc-http + octez-libs.rpc-http-server octez-libs.tezos-context octez-shell-libs.store octez-shell-libs.validation) diff --git a/src/lib_octogram/dune b/src/lib_octogram/dune index b0d839cc5207..efa418a93473 100644 --- a/src/lib_octogram/dune +++ b/src/lib_octogram/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-shell-libs.shell-services - octez-libs.tezos-rpc-http-client-unix + octez-libs.rpc-http-client-unix tezt tezt-tezos jingoo diff --git a/src/lib_p2p/dune b/src/lib_p2p/dune index 6ac21e731be9..21ae2d40cdc3 100644 --- a/src/lib_p2p/dune +++ b/src/lib_p2p/dune @@ -10,14 +10,14 @@ lwt-canceler ringo aches - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.stdlib octez-libs.tezos-p2p-services - octez-libs.tezos-version + octez-libs.version prometheus - octez-libs.tezos-base.p2p-identity-file) + octez-libs.base.p2p-identity-file) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_p2p/test/common/dune b/src/lib_p2p/test/common/dune index ba7e9ee73ca6..796ad0429c8d 100644 --- a/src/lib_p2p/test/common/dune +++ b/src/lib_p2p/test/common/dune @@ -7,10 +7,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.stdlib octez-shell-libs.p2p octez-libs.tezos-p2p-services) (flags diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index e492dad111d2..6302b22e7286 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -15,14 +15,14 @@ test_p2p_maintenance) (instrumentation (backend bisect_ppx --bisect-sigterm)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.stdlib octez-shell-libs.p2p - octez-libs.tezos-test-helpers - octez-libs.tezos-base-test-helpers - octez-libs.tezos-event-logging-test-helpers + octez-libs.test-helpers + octez-libs.base-test-helpers + octez-libs.event-logging-test-helpers octez-shell-libs.p2p_test_common octez-libs.tezos-p2p-services tezt-tezos diff --git a/src/lib_p2p/tezt/dune b/src/lib_p2p/tezt/dune index 570e10295f6f..46ff01506e3d 100644 --- a/src/lib_p2p/tezt/dune +++ b/src/lib_p2p/tezt/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.stdlib octez-shell-libs.p2p octez-libs.tezos-p2p-services - octez-libs.tezos-test-helpers - octez-libs.tezos-base-test-helpers - octez-libs.tezos-event-logging-test-helpers + octez-libs.test-helpers + octez-libs.base-test-helpers + octez-libs.event-logging-test-helpers octez-shell-libs.p2p_test_common) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_p2p_services/dune b/src/lib_p2p_services/dune index 6d706385af3a..3e28d10ab4ed 100644 --- a/src/lib_p2p_services/dune +++ b/src/lib_p2p_services/dune @@ -8,8 +8,8 @@ (public_name octez-libs.tezos-p2p-services) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-rpc) + octez-libs.base + octez-libs.rpc) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_plompiler/dune b/src/lib_plompiler/dune index 6c3712c55f77..70e887514be5 100644 --- a/src/lib_plompiler/dune +++ b/src/lib_plompiler/dune @@ -3,13 +3,13 @@ (library (name plompiler) - (public_name octez-libs.octez-plompiler) + (public_name octez-libs.plompiler) (instrumentation (backend bisect_ppx)) (libraries repr stdint hacl-star - octez-libs.octez-bls12-381-hash - octez-libs.octez-polynomial - octez-libs.octez-mec) + octez-libs.bls12-381-hash + octez-libs.polynomial + octez-libs.mec) (preprocess (staged_pps ppx_repr ppx_deriving.show))) diff --git a/src/lib_plonk/dune b/src/lib_plonk/dune index 78ce62ed6fda..a38189c452f1 100644 --- a/src/lib_plonk/dune +++ b/src/lib_plonk/dune @@ -3,14 +3,14 @@ (library (name plonk) - (public_name octez-libs.octez-plonk) + (public_name octez-libs.plonk) (instrumentation (backend bisect_ppx)) (libraries repr hacl-star data-encoding - octez-libs.octez-bls12-381-polynomial - octez-libs.octez-plompiler + octez-libs.bls12-381-polynomial + octez-libs.plompiler str) (preprocess (pps ppx_repr)) (flags diff --git a/src/lib_plonk/test/dune b/src/lib_plonk/test/dune index 787ed42601a2..d3735adea05e 100644 --- a/src/lib_plonk/test/dune +++ b/src/lib_plonk/test/dune @@ -3,12 +3,12 @@ (library (name plonk_test) - (public_name octez-libs.octez-plonk.plonk-test) + (public_name octez-libs.plonk.plonk-test) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.octez-plonk - octez-libs.octez-plonk.aggregation - octez-libs.octez-plonk.distribution) + octez-libs.plonk + octez-libs.plonk.aggregation + octez-libs.plonk.distribution) (preprocess (pps ppx_repr)) (modules helpers cases)) @@ -34,9 +34,9 @@ (executable (name main) (libraries - octez-libs.octez-plonk.plonk-test + octez-libs.plonk.plonk-test qcheck-alcotest - octez-libs.octez-bls12-381-polynomial) + octez-libs.bls12-381-polynomial) (flags (:standard) -open Octez_bls12_381_polynomial) @@ -57,5 +57,5 @@ (executable (name bench) (libraries - octez-libs.octez-plonk.plonk-test) + octez-libs.plonk.plonk-test) (modules bench)) diff --git a/src/lib_plonk/test_plompiler/dune b/src/lib_plonk/test_plompiler/dune index fe46d7ee0a80..9234277e0b67 100644 --- a/src/lib_plonk/test_plompiler/dune +++ b/src/lib_plonk/test_plompiler/dune @@ -4,15 +4,15 @@ (executable (name afl) (libraries - octez-libs.octez-plompiler - octez-libs.octez-plonk + octez-libs.plompiler + octez-libs.plonk bls12-381) (modules afl)) (executable (name main) (libraries - octez-libs.octez-plonk.plonk-test) + octez-libs.plonk.plonk-test) (modules bench_poseidon benchmark diff --git a/src/lib_polynomial/dune b/src/lib_polynomial/dune index 9dde4ad109c8..8c75460587ff 100644 --- a/src/lib_polynomial/dune +++ b/src/lib_polynomial/dune @@ -3,7 +3,7 @@ (library (name polynomial) - (public_name octez-libs.octez-polynomial) + (public_name octez-libs.polynomial) (instrumentation (backend bisect_ppx)) (libraries bls12-381 diff --git a/src/lib_polynomial/test/dune b/src/lib_polynomial/test/dune index 1c115f4df4b1..534bc67e6806 100644 --- a/src/lib_polynomial/test/dune +++ b/src/lib_polynomial/test/dune @@ -7,9 +7,9 @@ (libraries tezt.core bls12-381 - octez-libs.octez-mec + octez-libs.mec octez-alcotezt - octez-libs.octez-polynomial) + octez-libs.polynomial) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_protocol_compiler/bin/dune b/src/lib_protocol_compiler/bin/dune index 03407500dbb6..f59ccedc80bd 100644 --- a/src/lib_protocol_compiler/bin/dune +++ b/src/lib_protocol_compiler/bin/dune @@ -29,8 +29,8 @@ (package octez-protocol-compiler) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.stdlib-unix octez-protocol-compiler) (link_flags (:standard) @@ -49,9 +49,9 @@ (instrumentation (backend bisect_ppx)) (modes native) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix) + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index 3f565280e68b..9e4300a4f68f 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-compiler) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix octez-proto-libs.protocol-environment.sigs - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix compiler-libs.common lwt.unix ocplib-ocamlres @@ -74,7 +74,7 @@ (public_name octez-protocol-compiler.native) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-protocol-compiler compiler-libs.optcomp) (flags diff --git a/src/lib_protocol_compiler/registerer/dune b/src/lib_protocol_compiler/registerer/dune index 3dad3ef8ce52..f4499b0f86f6 100644 --- a/src/lib_protocol_compiler/registerer/dune +++ b/src/lib_protocol_compiler/registerer/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-compiler.registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment.sigs) (flags (:standard) diff --git a/src/lib_protocol_environment/context_ops/dune b/src/lib_protocol_environment/context_ops/dune index ef8b77bac515..917ea3933f83 100644 --- a/src/lib_protocol_environment/context_ops/dune +++ b/src/lib_protocol_environment/context_ops/dune @@ -6,8 +6,8 @@ (public_name octez-shell-libs.context-ops) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-error-monad + octez-libs.base + octez-libs.error-monad octez-proto-libs.protocol-environment octez-libs.tezos-context octez-shell-libs.shell-context) diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index 39a2ed20dd19..9faa82f4a53f 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -9,19 +9,19 @@ zarith zarith_stubs_js bls12-381 - octez-libs.octez-plonk - octez-libs.tezos-crypto-dal + octez-libs.plonk + octez-libs.crypto-dal class_group_vdf aches aches-lwt - octez-libs.tezos-base + octez-libs.base octez-libs.tezos-sapling octez-proto-libs.protocol-environment.sigs octez-proto-libs.protocol-environment.structs - octez-libs.tezos-micheline + octez-libs.micheline octez-libs.tezos-context.memory octez-l2-libs.scoru-wasm - octez-libs.tezos-event-logging) + octez-libs.event-logging) (flags (:standard) -open Plonk diff --git a/src/lib_protocol_environment/shell_context/dune b/src/lib_protocol_environment/shell_context/dune index b119e228b533..8dd2ce73b84b 100644 --- a/src/lib_protocol_environment/shell_context/dune +++ b/src/lib_protocol_environment/shell_context/dune @@ -6,7 +6,7 @@ (public_name octez-shell-libs.shell-context) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment octez-libs.tezos-context) (flags diff --git a/src/lib_protocol_environment/structs/dune b/src/lib_protocol_environment/structs/dune index 1dfd02753491..c204612d1623 100644 --- a/src/lib_protocol_environment/structs/dune +++ b/src/lib_protocol_environment/structs/dune @@ -6,13 +6,13 @@ (public_name octez-proto-libs.protocol-environment.structs) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-crypto - octez-libs.tezos-lwt-result-stdlib + octez-libs.stdlib + octez-libs.crypto + octez-libs.lwt-result-stdlib octez-l2-libs.scoru-wasm data-encoding bls12-381 - octez-libs.octez-plonk) + octez-libs.plonk) (flags (:standard) -open Plonk)) diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune index 09a1ad4b525d..3487222a694b 100644 --- a/src/lib_protocol_environment/test/dune +++ b/src/lib_protocol_environment/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix octez-proto-libs.protocol-environment octez-alcotezt - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest lwt.unix) (library_flags (:standard -linkall)) diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune index 9ee02ee86bb0..4ada56e1232a 100644 --- a/src/lib_protocol_environment/test_shell_context/dune +++ b/src/lib_protocol_environment/test_shell_context/dune @@ -8,8 +8,8 @@ tezt.core octez-shell-libs.shell-context octez-alcotezt - octez-libs.tezos-test-helpers - octez-libs.tezos-base + octez-libs.test-helpers + octez-libs.base octez-proto-libs.protocol-environment) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune index 9d7e34008dd2..9abeb5553645 100644 --- a/src/lib_protocol_updater/dune +++ b/src/lib_protocol_updater/dune @@ -6,9 +6,9 @@ (public_name octez-shell-libs.protocol-updater) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix - octez-libs.tezos-micheline + octez-libs.base + octez-libs.stdlib-unix + octez-libs.micheline octez-shell-libs.shell-services octez-proto-libs.protocol-environment octez-shell-libs.shell-context diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune index 86e1c9b4064c..1e4d1802b346 100644 --- a/src/lib_proxy/dune +++ b/src/lib_proxy/dune @@ -8,11 +8,11 @@ (libraries aches aches-lwt - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.client-base octez-proto-libs.protocol-environment - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.shell-services octez-libs.tezos-context.memory uri) diff --git a/src/lib_proxy/rpc/dune b/src/lib_proxy/rpc/dune index 1b8a77c618cd..0fff1d19643b 100644 --- a/src/lib_proxy/rpc/dune +++ b/src/lib_proxy/rpc/dune @@ -6,10 +6,10 @@ (public_name octez-shell-libs.proxy.rpc) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.client-base octez-shell-libs.mockup-proxy - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.proxy uri) (flags diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index 34159ca41a17..6a30cc01e8d5 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix octez-shell-libs.proxy - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base-test-helpers + octez-libs.test-helpers tezos_proxy_test_helpers_shell_services qcheck-alcotest octez-alcotezt diff --git a/src/lib_proxy/test_helpers/shell_services/dune b/src/lib_proxy/test_helpers/shell_services/dune index 78024d57725b..e8e0eacb385a 100644 --- a/src/lib_proxy/test_helpers/shell_services/dune +++ b/src/lib_proxy/test_helpers/shell_services/dune @@ -4,9 +4,9 @@ (library (name tezos_proxy_test_helpers_shell_services) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.shell-services - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-core octez-libs.tezos-context.memory lwt.unix diff --git a/src/lib_proxy/test_helpers/shell_services/test/dune b/src/lib_proxy/test_helpers/shell_services/test/dune index 6dcab7122b06..ca30a339fac0 100644 --- a/src/lib_proxy/test_helpers/shell_services/test/dune +++ b/src/lib_proxy/test_helpers/shell_services/test/dune @@ -6,9 +6,9 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-test-helpers + octez-libs.base + octez-libs.base.unix + octez-libs.test-helpers octez-shell-libs.shell-services tezos_proxy_test_helpers_shell_services qcheck-alcotest diff --git a/src/lib_proxy_server_config/dune b/src/lib_proxy_server_config/dune index 74367086f702..70c723b128cf 100644 --- a/src/lib_proxy_server_config/dune +++ b/src/lib_proxy_server_config/dune @@ -6,8 +6,8 @@ (public_name tezos-proxy-server-config) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.stdlib-unix uri) (flags (:standard) diff --git a/src/lib_proxy_server_config/test/dune b/src/lib_proxy_server_config/test/dune index 1c163d0463e6..1ec7a620b967 100644 --- a/src/lib_proxy_server_config/test/dune +++ b/src/lib_proxy_server_config/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix tezos-proxy-server-config - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest octez-alcotezt uri) diff --git a/src/lib_requester/dune b/src/lib_requester/dune index da9b68a9b1b9..2e40733529af 100644 --- a/src/lib_requester/dune +++ b/src/lib_requester/dune @@ -3,11 +3,11 @@ (library (name tezos_requester) - (public_name octez-libs.tezos-requester) + (public_name octez-libs.requester) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.stdlib-unix lwt-watcher) (flags (:standard) diff --git a/src/lib_requester/test/dune b/src/lib_requester/test/dune index 5ce93ef95e5c..af8d39d0fa7d 100644 --- a/src/lib_requester/test/dune +++ b/src/lib_requester/test/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-test-helpers - octez-libs.tezos-base-test-helpers - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix - octez-libs.tezos-requester + octez-libs.base + octez-libs.base.unix + octez-libs.test-helpers + octez-libs.base-test-helpers + octez-libs.stdlib + octez-libs.stdlib-unix + octez-libs.requester octez-alcotezt qcheck-alcotest) (library_flags (:standard -linkall)) diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune index 094efd228c19..b3aa7ec449db 100644 --- a/src/lib_rpc/dune +++ b/src/lib_rpc/dune @@ -3,11 +3,11 @@ (library (name tezos_rpc) - (public_name octez-libs.tezos-rpc) + (public_name octez-libs.rpc) (instrumentation (backend bisect_ppx)) (libraries data-encoding - octez-libs.tezos-error-monad + octez-libs.error-monad resto resto-directory uri) diff --git a/src/lib_rpc_http/dune b/src/lib_rpc_http/dune index b76b01637e5f..ac82773be4d2 100644 --- a/src/lib_rpc_http/dune +++ b/src/lib_rpc_http/dune @@ -3,11 +3,11 @@ (library (name tezos_rpc_http) - (public_name octez-libs.tezos-rpc-http) + (public_name octez-libs.rpc-http) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-rpc + octez-libs.base + octez-libs.rpc resto-cohttp uri) (flags @@ -17,13 +17,13 @@ (library (name tezos_rpc_http_client) - (public_name octez-libs.tezos-rpc-http-client) + (public_name octez-libs.rpc-http-client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base resto-cohttp-client - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http) + octez-libs.rpc + octez-libs.rpc-http) (flags (:standard) -open Tezos_base.TzPervasives @@ -32,15 +32,15 @@ (library (name tezos_rpc_http_client_unix) - (public_name octez-libs.tezos-rpc-http-client-unix) + (public_name octez-libs.rpc-http-client-unix) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib-unix - octez-libs.tezos-base + octez-libs.stdlib-unix + octez-libs.base cohttp-lwt-unix resto-cohttp-client - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http-client) + octez-libs.rpc + octez-libs.rpc-http-client) (flags (:standard) -open Tezos_base.TzPervasives @@ -49,16 +49,16 @@ (library (name tezos_rpc_http_server) - (public_name octez-libs.tezos-rpc-http-server) + (public_name octez-libs.rpc-http-server) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.stdlib-unix cohttp-lwt-unix resto-cohttp-server resto-acl - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http) + octez-libs.rpc + octez-libs.rpc-http) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_rpc_http/test/dune b/src/lib_rpc_http/test/dune index d98bc811e5bd..702e92001273 100644 --- a/src/lib_rpc_http/test/dune +++ b/src/lib_rpc_http/test/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix - octez-libs.tezos-test-helpers - octez-libs.tezos-base-test-helpers - octez-libs.tezos-rpc-http-server + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib + octez-libs.stdlib-unix + octez-libs.test-helpers + octez-libs.base-test-helpers + octez-libs.rpc-http-server qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_sapling/dune b/src/lib_sapling/dune index d3396f3bc68f..375820da35b9 100644 --- a/src/lib_sapling/dune +++ b/src/lib_sapling/dune @@ -13,10 +13,10 @@ ctypes ctypes_stubs_js data-encoding - octez-libs.tezos-stdlib - octez-libs.tezos-crypto - octez-libs.tezos-error-monad - octez-libs.tezos-lwt-result-stdlib) + octez-libs.stdlib + octez-libs.crypto + octez-libs.error-monad + octez-libs.lwt-result-stdlib) (js_of_ocaml (javascript_files runtime.js)) (flags (:standard) diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune index eeca0bd46cfb..3febd9dca182 100644 --- a/src/lib_sapling/test/dune +++ b/src/lib_sapling/test/dune @@ -9,14 +9,14 @@ (libraries tezt.core octez-libs.tezos-sapling - octez-libs.tezos-crypto + octez-libs.crypto str - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib + octez-libs.stdlib-unix data-encoding - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -42,7 +42,7 @@ (modes js) (libraries octez-libs.tezos-sapling - octez-libs.tezos-hacl) + octez-libs.hacl) (js_of_ocaml) (link_flags (:standard) diff --git a/src/lib_scoru_sequencer/dune b/src/lib_scoru_sequencer/dune index 73725f12b8a7..2334ecda75fe 100644 --- a/src/lib_scoru_sequencer/dune +++ b/src/lib_scoru_sequencer/dune @@ -6,7 +6,7 @@ (package octez-smart-rollup-sequencer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-protocol-alpha-libs.smart-rollup-layer2 tezos-protocol-alpha.protocol octez_smart_rollup_node_alpha @@ -14,9 +14,9 @@ octez-smart-rollup-node-lib octez-l2-libs.smart-rollup octez-shell-libs.client-base - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server) + octez-libs.rpc + octez-libs.rpc-http + octez-libs.rpc-http-server) (flags (:standard) -open Tezos_base diff --git a/src/lib_scoru_sequencer/test/dune b/src/lib_scoru_sequencer/test/dune index 494975ca96bd..1ab038244513 100644 --- a/src/lib_scoru_sequencer/test/dune +++ b/src/lib_scoru_sequencer/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez_smart_rollup_sequencer - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base-test-helpers + octez-libs.test-helpers qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_scoru_wasm/bench/dune b/src/lib_scoru_wasm/bench/dune index 9a6f2bd0ad04..312676802b30 100644 --- a/src/lib_scoru_wasm/bench/dune +++ b/src/lib_scoru_wasm/bench/dune @@ -6,7 +6,7 @@ (public_name octez-l2-libs.smart_rollup_wasm_benchmark_lib) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezt octez-l2-libs.webassembly-interpreter octez-libs.tezos-context.memory diff --git a/src/lib_scoru_wasm/bench/executable/dune b/src/lib_scoru_wasm/bench/executable/dune index 5785c64a89af..0c54e4960f2d 100644 --- a/src/lib_scoru_wasm/bench/executable/dune +++ b/src/lib_scoru_wasm/bench/executable/dune @@ -5,7 +5,7 @@ (name octez_smart_rollup_wasm_benchmark) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-l2-libs.smart_rollup_wasm_benchmark_lib) (preprocess (pps ppx_deriving.show)) (flags diff --git a/src/lib_scoru_wasm/dune b/src/lib_scoru_wasm/dune index 1cc81848cc22..7c6ff3c2d81e 100644 --- a/src/lib_scoru_wasm/dune +++ b/src/lib_scoru_wasm/dune @@ -6,13 +6,13 @@ (public_name octez-l2-libs.scoru-wasm) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-tree-encoding - octez-libs.tezos-lazy-containers + octez-libs.base + octez-libs.tree-encoding + octez-libs.lazy-containers octez-l2-libs.webassembly-interpreter - octez-libs.tezos-context.sigs + octez-libs.context.sigs octez-libs.tezos-context.memory - octez-libs.tezos-lwt-result-stdlib + octez-libs.lwt-result-stdlib data-encoding) (flags (:standard) diff --git a/src/lib_scoru_wasm/fast/dune b/src/lib_scoru_wasm/fast/dune index f856151919df..4fe14613fa85 100644 --- a/src/lib_scoru_wasm/fast/dune +++ b/src/lib_scoru_wasm/fast/dune @@ -6,10 +6,10 @@ (public_name octez-l2-libs.scoru-wasm-fast) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-tree-encoding + octez-libs.base + octez-libs.tree-encoding octez-l2-libs.webassembly-interpreter - octez-libs.tezos-lazy-containers + octez-libs.lazy-containers octez-l2-libs.scoru-wasm octez-l2-libs.wasmer) (flags diff --git a/src/lib_scoru_wasm/fast/test/dune b/src/lib_scoru_wasm/fast/test/dune index c6d0f92526f8..9ad1e2a01fe1 100644 --- a/src/lib_scoru_wasm/fast/test/dune +++ b/src/lib_scoru_wasm/fast/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-tree-encoding - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.tree-encoding + octez-libs.base.unix octez-libs.tezos-context.disk - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-l2-libs.scoru-wasm-helpers octez-l2-libs.scoru_wasm_test_helpers - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-l2-libs.scoru-wasm octez-l2-libs.scoru-wasm-fast qcheck-alcotest diff --git a/src/lib_scoru_wasm/helpers/dune b/src/lib_scoru_wasm/helpers/dune index 4c3d8fde5a9b..d350907ef32f 100644 --- a/src/lib_scoru_wasm/helpers/dune +++ b/src/lib_scoru_wasm/helpers/dune @@ -6,9 +6,9 @@ (public_name octez-l2-libs.scoru-wasm-helpers) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-tree-encoding - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.tree-encoding + octez-libs.base.unix octez-libs.tezos-context.disk octez-l2-libs.scoru-wasm octez-l2-libs.scoru-wasm-fast diff --git a/src/lib_scoru_wasm/regressions/dune b/src/lib_scoru_wasm/regressions/dune index 0ad781034fae..bc6ff2b2cfc8 100644 --- a/src/lib_scoru_wasm/regressions/dune +++ b/src/lib_scoru_wasm/regressions/dune @@ -6,10 +6,10 @@ (package tezos-scoru-wasm-regressions) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-l2-libs.scoru-wasm octez-l2-libs.scoru-wasm-helpers - octez-libs.tezos-test-helpers + octez-libs.test-helpers tezos-protocol-alpha.protocol octez-protocol-alpha-libs.smart-rollup tezos-protocol-alpha.parameters diff --git a/src/lib_scoru_wasm/test/dune b/src/lib_scoru_wasm/test/dune index 1ad93deb13e8..0cec6b0dca9b 100644 --- a/src/lib_scoru_wasm/test/dune +++ b/src/lib_scoru_wasm/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-tree-encoding - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.tree-encoding + octez-libs.base.unix octez-libs.tezos-context.disk - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base-test-helpers + octez-libs.test-helpers octez-l2-libs.scoru-wasm qcheck-alcotest octez-alcotezt diff --git a/src/lib_scoru_wasm/test/durable_snapshot/dune b/src/lib_scoru_wasm/test/durable_snapshot/dune index 3d6891f94629..aeca685300a8 100644 --- a/src/lib_scoru_wasm/test/durable_snapshot/dune +++ b/src/lib_scoru_wasm/test/durable_snapshot/dune @@ -6,8 +6,8 @@ (public_name octez-l2-libs.scoru_wasm_durable_snapshot) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-tree-encoding + octez-libs.base + octez-libs.tree-encoding octez-l2-libs.webassembly-interpreter-extra) (preprocess (staged_pps ppx_import ppx_deriving.show)) (flags diff --git a/src/lib_scoru_wasm/test/helpers/dune b/src/lib_scoru_wasm/test/helpers/dune index b70c4d75d399..86f544157aa4 100644 --- a/src/lib_scoru_wasm/test/helpers/dune +++ b/src/lib_scoru_wasm/test/helpers/dune @@ -6,12 +6,12 @@ (public_name octez-l2-libs.scoru_wasm_test_helpers) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-tree-encoding - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.tree-encoding + octez-libs.base.unix octez-libs.tezos-context.disk - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base-test-helpers + octez-libs.test-helpers octez-l2-libs.scoru-wasm octez-l2-libs.scoru_wasm_durable_snapshot octez-l2-libs.scoru-wasm-fast diff --git a/src/lib_shell/dune b/src/lib_shell/dune index 079c1d7816dd..741e609f346d 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -9,9 +9,9 @@ lwt-watcher lwt-canceler prometheus - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-rpc + octez-libs.base + octez-libs.base.unix + octez-libs.rpc octez-libs.tezos-context octez-shell-libs.store octez-shell-libs.store.shared @@ -19,15 +19,15 @@ octez-shell-libs.context-ops octez-shell-libs.shell-context octez-shell-libs.p2p - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.shell-services octez-libs.tezos-p2p-services octez-shell-libs.protocol-updater - octez-libs.tezos-requester + octez-libs.requester octez-libs.tezos-workers octez-shell-libs.validation - octez-libs.tezos-version - octez-libs.tezos-crypto-dal.octez-dal-config + octez-libs.version + octez-libs.crypto-dal.dal-config lwt-exit) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 35616680a754..3b68962d553c 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base-test-helpers + octez-libs.base + octez-libs.base-test-helpers octez-shell-libs.store octez-shell-libs.store.shared octez-libs.tezos-context @@ -16,14 +16,14 @@ octez-shell-libs.protocol-updater octez-shell-libs.p2p octez-libs.tezos-p2p-services - octez-libs.tezos-requester + octez-libs.requester octez-shell-libs.shell octez-shell-libs.shell-services tezos-protocol-demo-noops.embedded-protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.validation - octez-libs.tezos-event-logging-test-helpers - octez-libs.tezos-test-helpers + octez-libs.event-logging-test-helpers + octez-libs.test-helpers octez-alcotezt tezos-version.value) (library_flags (:standard -linkall)) diff --git a/src/lib_shell_benchmarks/dune b/src/lib_shell_benchmarks/dune index 489fb832d027..8e0f27c4bde4 100644 --- a/src/lib_shell_benchmarks/dune +++ b/src/lib_shell_benchmarks/dune @@ -6,15 +6,15 @@ (public_name octez-shell-libs.shell-benchmarks) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-base - octez-libs.tezos-error-monad + octez-libs.stdlib + octez-libs.base + octez-libs.error-monad tezos-benchmark - octez-libs.tezos-crypto + octez-libs.crypto octez-libs.tezos-context octez-shell-libs.shell-context octez-shell-libs.store - octez-libs.tezos-micheline) + octez-libs.micheline) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_shell_services/dune b/src/lib_shell_services/dune index a4ee09752fec..2ded885afd47 100644 --- a/src/lib_shell_services/dune +++ b/src/lib_shell_services/dune @@ -8,13 +8,13 @@ (public_name octez-shell-libs.shell-services) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-rpc + octez-libs.base + octez-libs.rpc octez-libs.tezos-p2p-services - octez-libs.tezos-version - octez-libs.tezos-context.sigs + octez-libs.version + octez-libs.context.sigs octez-libs.tezos-context.merkle_proof_encoding - octez-libs.tezos-crypto-dal.octez-dal-config) + octez-libs.crypto-dal.dal-config) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune index 31722d124647..da42455cacf7 100644 --- a/src/lib_shell_services/test/dune +++ b/src/lib_shell_services/test/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base octez-shell-libs.shell-services octez-alcotezt) (js_of_ocaml) diff --git a/src/lib_signer_backends/dune b/src/lib_signer_backends/dune index e8eb440be0df..1b3a7c82ba4b 100644 --- a/src/lib_signer_backends/dune +++ b/src/lib_signer_backends/dune @@ -6,11 +6,11 @@ (public_name octez-shell-libs.signer-backends) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib + octez-libs.base + octez-libs.stdlib octez-shell-libs.client-base - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-client + octez-libs.rpc-http + octez-libs.rpc-http-client octez-shell-libs.signer-services octez-shell-libs.shell-services uri) diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index 35ff89aced3d..9493ac797bdf 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib - octez-libs.tezos-error-monad - octez-libs.tezos-crypto + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib + octez-libs.error-monad + octez-libs.crypto octez-shell-libs.client-base octez-shell-libs.signer-backends octez-alcotezt diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune index dd7c278b9e48..1efb70bae610 100644 --- a/src/lib_signer_backends/unix/dune +++ b/src/lib_signer_backends/unix/dune @@ -8,15 +8,15 @@ (libraries ocplib-endian.bigstring fmt - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-clic - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib + octez-libs.base + octez-libs.base.unix + octez-libs.clic + octez-libs.stdlib-unix + octez-libs.stdlib octez-shell-libs.client-base - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-client - octez-libs.tezos-rpc-http-client-unix + octez-libs.rpc-http + octez-libs.rpc-http-client + octez-libs.rpc-http-client-unix octez-shell-libs.signer-services octez-shell-libs.signer-backends octez-shell-libs.shell-services diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune index 5b80eb2566a5..cfc0786ab87d 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -6,9 +6,9 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-error-monad - octez-libs.tezos-stdlib - octez-libs.tezos-crypto + octez-libs.error-monad + octez-libs.stdlib + octez-libs.crypto octez-shell-libs.client-base octez-shell-libs.signer-backends.unix octez-alcotezt) diff --git a/src/lib_signer_services/dune b/src/lib_signer_services/dune index 1a636494cca7..f4291c62cd4b 100644 --- a/src/lib_signer_services/dune +++ b/src/lib_signer_services/dune @@ -8,8 +8,8 @@ (public_name octez-shell-libs.signer-services) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-rpc + octez-libs.base + octez-libs.rpc octez-shell-libs.client-base) (js_of_ocaml) (library_flags (:standard -linkall)) diff --git a/src/lib_smart_rollup/dune b/src/lib_smart_rollup/dune index 4c53d64f1043..197bb53eff2b 100644 --- a/src/lib_smart_rollup/dune +++ b/src/lib_smart_rollup/dune @@ -6,11 +6,11 @@ (public_name octez-l2-libs.smart-rollup) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-crypto - octez-libs.tezos-crypto-dal) + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.crypto + octez-libs.crypto-dal) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_smart_rollup_node/dune b/src/lib_smart_rollup_node/dune index 8b992886e437..027b9a150231 100644 --- a/src/lib_smart_rollup_node/dune +++ b/src/lib_smart_rollup_node/dune @@ -6,10 +6,10 @@ (public_name octez-smart-rollup-node-lib) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix - octez-libs.tezos-crypto + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix + octez-libs.crypto octez-shell-libs.client-base octez-shell-libs.client-base-unix cohttp-lwt-unix diff --git a/src/lib_srs_extraction/dune b/src/lib_srs_extraction/dune index 0ec4cea83ecd..35810b9c038b 100644 --- a/src/lib_srs_extraction/dune +++ b/src/lib_srs_extraction/dune @@ -3,10 +3,10 @@ (library (name octez_srs_extraction) - (public_name octez-libs.octez-srs-extraction) + (public_name octez-libs.srs-extraction) (libraries bls12-381 - octez-libs.octez-bls12-381-polynomial) + octez-libs.bls12-381-polynomial) (flags (:standard) -open Octez_bls12_381_polynomial) @@ -15,11 +15,11 @@ (executable (name srs_extraction_main) (libraries - octez-libs.octez-srs-extraction + octez-libs.srs-extraction cmdliner unix bls12-381 - octez-libs.octez-bls12-381-polynomial) + octez-libs.bls12-381-polynomial) (flags (:standard) -open Octez_srs_extraction diff --git a/src/lib_srs_extraction/test/dune b/src/lib_srs_extraction/test/dune index 7297d0b942cd..1d3ba69b7676 100644 --- a/src/lib_srs_extraction/test/dune +++ b/src/lib_srs_extraction/test/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.octez-srs-extraction + octez-libs.srs-extraction octez-alcotezt) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune index 8f505d43dc18..2234e92aa224 100644 --- a/src/lib_stdlib/dune +++ b/src/lib_stdlib/dune @@ -3,7 +3,7 @@ (library (name tezos_stdlib) - (public_name octez-libs.tezos-stdlib) + (public_name octez-libs.stdlib) (instrumentation (backend bisect_ppx)) (libraries hex diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune index d54ad041b0a2..4194f69b4cc4 100644 --- a/src/lib_stdlib/test-unix/dune +++ b/src/lib_stdlib/test-unix/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib + octez-libs.stdlib octez-alcotezt bigstring lwt.unix - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune index b132aa3e9d47..e6e13aaf0a14 100644 --- a/src/lib_stdlib/test/dune +++ b/src/lib_stdlib/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib + octez-libs.stdlib octez-alcotezt bigstring - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest) (js_of_ocaml) (library_flags (:standard -linkall)) diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune index ac9959436ad3..60493475455a 100644 --- a/src/lib_stdlib_unix/dune +++ b/src/lib_stdlib_unix/dune @@ -3,14 +3,14 @@ (library (name tezos_stdlib_unix) - (public_name octez-libs.tezos-stdlib-unix) + (public_name octez-libs.stdlib-unix) (instrumentation (backend bisect_ppx)) (libraries unix - octez-libs.tezos-error-monad - octez-libs.tezos-lwt-result-stdlib - octez-libs.tezos-event-logging - octez-libs.tezos-stdlib + octez-libs.error-monad + octez-libs.lwt-result-stdlib + octez-libs.event-logging + octez-libs.stdlib data-encoding aches-lwt lwt.unix diff --git a/src/lib_stdlib_unix/test/dune b/src/lib_stdlib_unix/test/dune index 1acb9ca1ee54..b05b181da283 100644 --- a/src/lib_stdlib_unix/test/dune +++ b/src/lib_stdlib_unix/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-error-monad - octez-libs.tezos-stdlib-unix - octez-libs.tezos-event-logging - octez-libs.tezos-test-helpers + octez-libs.error-monad + octez-libs.stdlib-unix + octez-libs.event-logging + octez-libs.test-helpers qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_store/dune b/src/lib_store/dune index d069275156a0..c504a93cb3e7 100644 --- a/src/lib_store/dune +++ b/src/lib_store/dune @@ -6,9 +6,9 @@ (public_name octez-shell-libs.store) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-crypto - octez-libs.tezos-rpc + octez-libs.base + octez-libs.crypto + octez-libs.rpc lwt-watcher octez-shell-libs.shell-services octez-shell-libs.validation diff --git a/src/lib_store/mocked/dune b/src/lib_store/mocked/dune index 4b4c40bc2c76..6fb87b39a0eb 100644 --- a/src/lib_store/mocked/dune +++ b/src/lib_store/mocked/dune @@ -7,8 +7,8 @@ (implements octez-shell-libs.store) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-crypto + octez-libs.base + octez-libs.crypto octez-shell-libs.shell-services octez-libs.tezos-context.memory octez-shell-libs.context-ops diff --git a/src/lib_store/shared/dune b/src/lib_store/shared/dune index beb56eb19951..d2ba5b996ece 100644 --- a/src/lib_store/shared/dune +++ b/src/lib_store/shared/dune @@ -6,9 +6,9 @@ (public_name octez-shell-libs.store.shared) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib-unix - octez-libs.tezos-base - octez-libs.tezos-crypto + octez-libs.stdlib-unix + octez-libs.base + octez-libs.crypto octez-shell-libs.shell-services aches aches-lwt diff --git a/src/lib_store/unix/dune b/src/lib_store/unix/dune index 1df685a9f754..c38869f5a903 100644 --- a/src/lib_store/unix/dune +++ b/src/lib_store/unix/dune @@ -7,8 +7,8 @@ (instrumentation (backend bisect_ppx)) (libraries octez-shell-libs.shell-services - octez-libs.tezos-base - octez-libs.tezos-version + octez-libs.base + octez-libs.version index irmin-pack octez-shell-libs.store.shared @@ -18,9 +18,9 @@ octez-shell-libs.shell-context octez-shell-libs.validation octez-shell-libs.protocol-updater - octez-libs.tezos-stdlib-unix - octez-libs.tezos-stdlib - octez-libs.tezos-crypto + octez-libs.stdlib-unix + octez-libs.stdlib + octez-libs.crypto lwt-watcher aches aches-lwt @@ -58,9 +58,9 @@ (public_name octez-shell-libs.store.unix-reconstruction) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix - octez-libs.tezos-crypto + octez-libs.base + octez-libs.stdlib-unix + octez-libs.crypto octez-shell-libs.shell-services octez-shell-libs.protocol-updater octez-shell-libs.validation @@ -86,9 +86,9 @@ (public_name octez-shell-libs.store.unix-snapshots) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix - octez-libs.tezos-crypto + octez-libs.base + octez-libs.stdlib-unix + octez-libs.crypto octez-shell-libs.shell-services octez-libs.tezos-context octez-shell-libs.validation diff --git a/src/lib_store/unix/test/bench/dune b/src/lib_store/unix/test/bench/dune index bb0c34944336..e6225bf18615 100644 --- a/src/lib_store/unix/test/bench/dune +++ b/src/lib_store/unix/test/bench/dune @@ -5,7 +5,7 @@ (name bench) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezt octez-alcotezt src_lib_store_unix_test_tezt_lib) diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index 2e7245668b5a..a5d01a65fdfd 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-crypto + octez-libs.base + octez-libs.crypto octez-shell-libs.context-ops octez-shell-libs.store.shared octez-shell-libs.store.unix octez-shell-libs.store.unix-reconstruction octez-shell-libs.store.unix-snapshots octez-shell-libs.shell-services - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.validation octez-shell-libs.protocol-updater tezos-protocol-demo-noops.embedded-protocol @@ -23,7 +23,7 @@ tezos-protocol-alpha.parameters octez-protocol-alpha-libs.plugin octez-alcotezt - octez-libs.tezos-test-helpers) + octez-libs.test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_store/unix/test/slow/dune b/src/lib_store/unix/test/slow/dune index 5dbeba350788..e7d8f51c97f8 100644 --- a/src/lib_store/unix/test/slow/dune +++ b/src/lib_store/unix/test/slow/dune @@ -5,7 +5,7 @@ (name test_slow) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezt octez-alcotezt src_lib_store_unix_test_tezt_lib) diff --git a/src/lib_test/dune b/src/lib_test/dune index 44ae1a69153e..4d7475135873 100644 --- a/src/lib_test/dune +++ b/src/lib_test/dune @@ -3,7 +3,7 @@ (library (name tezos_test_helpers) - (public_name octez-libs.tezos-test-helpers) + (public_name octez-libs.test-helpers) (instrumentation (backend bisect_ppx)) (libraries uri diff --git a/src/lib_tree_encoding/dune b/src/lib_tree_encoding/dune index 8aa81d6d2319..61a71212903c 100644 --- a/src/lib_tree_encoding/dune +++ b/src/lib_tree_encoding/dune @@ -3,12 +3,12 @@ (library (name tezos_tree_encoding) - (public_name octez-libs.tezos-tree-encoding) + (public_name octez-libs.tree-encoding) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-context.sigs - octez-libs.tezos-lwt-result-stdlib + octez-libs.base + octez-libs.context.sigs + octez-libs.lwt-result-stdlib data-encoding) (flags (:standard) diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune index f092f45ab683..a00ef209c758 100644 --- a/src/lib_tree_encoding/test/dune +++ b/src/lib_tree_encoding/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-tree-encoding - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.tree-encoding + octez-libs.base.unix octez-libs.tezos-context.disk - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base-test-helpers + octez-libs.test-helpers octez-l2-libs.webassembly-interpreter qcheck-alcotest octez-alcotezt) diff --git a/src/lib_validation/dune b/src/lib_validation/dune index dda9937c893d..3b2d728fc083 100644 --- a/src/lib_validation/dune +++ b/src/lib_validation/dune @@ -7,15 +7,15 @@ (instrumentation (backend bisect_ppx)) (instrumentation (backend tezos-time-measurement)) (libraries - octez-libs.tezos-base - octez-libs.tezos-crypto - octez-libs.tezos-rpc + octez-libs.base + octez-libs.crypto + octez-libs.rpc octez-libs.tezos-context octez-shell-libs.context-ops octez-shell-libs.shell-context octez-shell-libs.shell-services octez-shell-libs.protocol-updater - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-version.value) (flags (:standard) diff --git a/src/lib_version/dune b/src/lib_version/dune index 2149ba5e69d7..7ea69d18dfc4 100644 --- a/src/lib_version/dune +++ b/src/lib_version/dune @@ -5,11 +5,11 @@ (library (name tezos_version) - (public_name octez-libs.tezos-version) + (public_name octez-libs.version) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-version.parser) + octez-libs.base + octez-libs.version.parser) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune index daa80e6bc32f..b17e21eb98d5 100644 --- a/src/lib_version/exe/dune +++ b/src/lib_version/exe/dune @@ -5,7 +5,7 @@ (name get_git_info) (libraries dune-configurator - octez-libs.tezos-version.parser) + octez-libs.version.parser) (modules get_git_info)) (executable @@ -14,8 +14,8 @@ (package tezos-version) (libraries tezos-version.value - octez-libs.tezos-version - octez-libs.tezos-base.unix) + octez-libs.version + octez-libs.base.unix) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp)) diff --git a/src/lib_version/parser/dune b/src/lib_version/parser/dune index 59bdfe72db2e..8d8f2f935b07 100644 --- a/src/lib_version/parser/dune +++ b/src/lib_version/parser/dune @@ -3,7 +3,7 @@ (library (name tezos_version_parser) - (public_name octez-libs.tezos-version.parser) + (public_name octez-libs.version.parser) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_deriving.show)) (js_of_ocaml)) diff --git a/src/lib_version/test/dune b/src/lib_version/test/dune index 1e23f9967a37..d5a2a029b4ec 100644 --- a/src/lib_version/test/dune +++ b/src/lib_version/test/dune @@ -8,8 +8,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-version - octez-libs.tezos-version.parser + octez-libs.version + octez-libs.version.parser octez-alcotezt) (js_of_ocaml) (library_flags (:standard -linkall)) diff --git a/src/lib_version/value/dune b/src/lib_version/value/dune index 3f2f3d385dff..19dd8b903bed 100644 --- a/src/lib_version/value/dune +++ b/src/lib_version/value/dune @@ -8,9 +8,9 @@ (public_name tezos-version.value) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-version - octez-libs.tezos-version.parser) + octez-libs.base + octez-libs.version + octez-libs.version.parser) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_webassembly/bin/dune b/src/lib_webassembly/bin/dune index ab857ad4bef5..2e40e6f6b311 100644 --- a/src/lib_webassembly/bin/dune +++ b/src/lib_webassembly/bin/dune @@ -8,8 +8,8 @@ octez-l2-libs.webassembly-interpreter octez-l2-libs.webassembly-interpreter-extra lwt.unix - octez-libs.tezos-tree-encoding - octez-libs.tezos-lazy-containers) + octez-libs.tree-encoding + octez-libs.lazy-containers) (flags (:standard) -open Tezos_webassembly_interpreter diff --git a/src/lib_webassembly/dune b/src/lib_webassembly/dune index 553b9d4c6b62..ef8aaccbb423 100644 --- a/src/lib_webassembly/dune +++ b/src/lib_webassembly/dune @@ -6,11 +6,11 @@ (public_name octez-l2-libs.webassembly-interpreter) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-lwt-result-stdlib - octez-libs.tezos-stdlib - octez-libs.tezos-error-monad + octez-libs.lwt-result-stdlib + octez-libs.stdlib + octez-libs.error-monad zarith - octez-libs.tezos-lazy-containers) + octez-libs.lazy-containers) (preprocess (pps ppx_deriving.show)) (flags (:standard) diff --git a/src/lib_webassembly/extra/dune b/src/lib_webassembly/extra/dune index 0677ea44a0ce..9cbc9e36ac40 100644 --- a/src/lib_webassembly/extra/dune +++ b/src/lib_webassembly/extra/dune @@ -8,7 +8,7 @@ (libraries octez-l2-libs.webassembly-interpreter lwt.unix - octez-libs.tezos-lazy-containers) + octez-libs.lazy-containers) (flags (:standard) -open Tezos_webassembly_interpreter diff --git a/src/lib_workers/dune b/src/lib_workers/dune index 63d9bb26b2a7..e657f7efd9c8 100644 --- a/src/lib_workers/dune +++ b/src/lib_workers/dune @@ -6,8 +6,8 @@ (public_name octez-libs.tezos-workers) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix) + octez-libs.base + octez-libs.stdlib-unix) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_workers/test/dune b/src/lib_workers/test/dune index d7d3a5f9b4de..44e6552b9719 100644 --- a/src/lib_workers/test/dune +++ b/src/lib_workers/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix - octez-libs.tezos-base + octez-libs.stdlib + octez-libs.stdlib-unix + octez-libs.base octez-libs.tezos-workers - octez-libs.tezos-test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.test-helpers + octez-libs.base-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune index aab64641d679..d40532b6bc53 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune +++ b/src/proto_000_Ps9mPmXa/lib_client/dune @@ -5,15 +5,15 @@ (name tezos_client_000_Ps9mPmXa) (public_name octez-protocol-000-Ps9mPmXa-libs.client) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-000-Ps9mPmXa.protocol tezos-protocol-000-Ps9mPmXa.protocol.lifted - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-commands - octez-libs.tezos-stdlib-unix) + octez-libs.stdlib-unix) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune index 4d646c54c829..4dd3fc11f856 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune +++ b/src/proto_001_PtCJ7pwo/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_001_PtCJ7pwo) (public_name octez-protocol-001-PtCJ7pwo-libs.client) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-001-PtCJ7pwo.protocol tezos-protocol-001-PtCJ7pwo.protocol.lifted octez-shell-libs.signer-backends - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune index 417c5fd0d2ef..a424359382d5 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_001_PtCJ7pwo_commands) (public_name octez-protocol-001-PtCJ7pwo-libs.client.commands) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-001-PtCJ7pwo.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-001-PtCJ7pwo-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,8 +32,8 @@ (name tezos_client_001_PtCJ7pwo_commands_registration) (public_name octez-protocol-001-PtCJ7pwo-libs.client.commands-registration) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-001-PtCJ7pwo.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -41,7 +41,7 @@ octez-protocol-001-PtCJ7pwo-libs.client octez-shell-libs.client-commands octez-protocol-001-PtCJ7pwo-libs.client.commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune index bf1a004ef775..e1e27327e535 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune +++ b/src/proto_002_PsYLVpVv/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_002_PsYLVpVv) (public_name octez-protocol-002-PsYLVpVv-libs.client) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-002-PsYLVpVv.protocol tezos-protocol-002-PsYLVpVv.protocol.lifted octez-shell-libs.signer-backends - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune index 593b56efe24f..8caf64a3e445 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_002_PsYLVpVv_commands) (public_name octez-protocol-002-PsYLVpVv-libs.client.commands) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-002-PsYLVpVv.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-002-PsYLVpVv-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,8 +32,8 @@ (name tezos_client_002_PsYLVpVv_commands_registration) (public_name octez-protocol-002-PsYLVpVv-libs.client.commands-registration) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-002-PsYLVpVv.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -41,7 +41,7 @@ octez-protocol-002-PsYLVpVv-libs.client octez-shell-libs.client-commands octez-protocol-002-PsYLVpVv-libs.client.commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune index f1de1f96af37..951085bd6cfe 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune +++ b/src/proto_003_PsddFKi3/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_003_PsddFKi3) (public_name octez-protocol-003-PsddFKi3-libs.client) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-003-PsddFKi3.protocol tezos-protocol-003-PsddFKi3.protocol.lifted octez-shell-libs.signer-backends - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune index a6a63769a737..4f1306da6013 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_003_PsddFKi3_commands) (public_name octez-protocol-003-PsddFKi3-libs.client.commands) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-003-PsddFKi3.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-003-PsddFKi3-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,8 +32,8 @@ (name tezos_client_003_PsddFKi3_commands_registration) (public_name octez-protocol-003-PsddFKi3-libs.client.commands-registration) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-003-PsddFKi3.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -41,7 +41,7 @@ octez-protocol-003-PsddFKi3-libs.client octez-shell-libs.client-commands octez-protocol-003-PsddFKi3-libs.client.commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune index 440a5629164c..e51e3821fed0 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune +++ b/src/proto_004_Pt24m4xi/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_004_Pt24m4xi) (public_name octez-protocol-004-Pt24m4xi-libs.client) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-004-Pt24m4xi.protocol tezos-protocol-004-Pt24m4xi.protocol.lifted octez-shell-libs.signer-backends - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune index 47d10de2489a..cc92a990af2a 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_004_Pt24m4xi_commands) (public_name octez-protocol-004-Pt24m4xi-libs.client.commands) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-004-Pt24m4xi.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-004-Pt24m4xi-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,8 +32,8 @@ (name tezos_client_004_Pt24m4xi_commands_registration) (public_name octez-protocol-004-Pt24m4xi-libs.client.commands-registration) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-004-Pt24m4xi.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -41,7 +41,7 @@ octez-protocol-004-Pt24m4xi-libs.client octez-shell-libs.client-commands octez-protocol-004-Pt24m4xi-libs.client.commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune index 4c3884c1269e..333ed2598f9e 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune +++ b/src/proto_005_PsBabyM1/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_005_PsBabyM1) (public_name octez-protocol-005-PsBabyM1-libs.client) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-005-PsBabyM1.protocol tezos-protocol-005-PsBabyM1.protocol.lifted octez-shell-libs.signer-backends - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune index b4aea26cfa0f..7a52393ab24a 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_005_PsBabyM1_commands) (public_name octez-protocol-005-PsBabyM1-libs.client.commands) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-005-PsBabyM1.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-005-PsBabyM1-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,8 +32,8 @@ (name tezos_client_005_PsBabyM1_commands_registration) (public_name octez-protocol-005-PsBabyM1-libs.client.commands-registration) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-005-PsBabyM1.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -41,7 +41,7 @@ octez-protocol-005-PsBabyM1-libs.client octez-shell-libs.client-commands octez-protocol-005-PsBabyM1-libs.client.commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune index 9fba49701ad3..965e76b8d7af 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune +++ b/src/proto_006_PsCARTHA/lib_client/dune @@ -5,14 +5,14 @@ (name tezos_client_006_PsCARTHA) (public_name octez-protocol-006-PsCARTHA-libs.client) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-006-PsCARTHA.protocol tezos-protocol-006-PsCARTHA.protocol.lifted octez-shell-libs.signer-backends - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune index 8bcfcff8add7..b34c33b240fc 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_006_PsCARTHA_commands) (public_name octez-protocol-006-PsCARTHA-libs.client.commands) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-006-PsCARTHA.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-006-PsCARTHA-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,8 +32,8 @@ (name tezos_client_006_PsCARTHA_commands_registration) (public_name octez-protocol-006-PsCARTHA-libs.client.commands-registration) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-006-PsCARTHA.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -41,7 +41,7 @@ octez-protocol-006-PsCARTHA-libs.client octez-shell-libs.client-commands octez-protocol-006-PsCARTHA-libs.client.commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune index 2cabd800ecd6..41ec2f6763a9 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune +++ b/src/proto_007_PsDELPH1/lib_client/dune @@ -5,15 +5,15 @@ (name tezos_client_007_PsDELPH1) (public_name octez-protocol-007-PsDELPH1-libs.client) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-007-PsDELPH1.protocol tezos-protocol-007-PsDELPH1.protocol.lifted octez-shell-libs.signer-backends octez-protocol-007-PsDELPH1-libs.plugin - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune index 1c14de8747cc..386da8ff0be4 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune @@ -5,16 +5,16 @@ (name tezos_client_007_PsDELPH1_commands) (public_name octez-protocol-007-PsDELPH1-libs.client.commands) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-007-PsDELPH1.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-007-PsDELPH1-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) @@ -32,8 +32,8 @@ (name tezos_client_007_PsDELPH1_commands_registration) (public_name octez-protocol-007-PsDELPH1-libs.client.commands-registration) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-007-PsDELPH1.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -41,7 +41,7 @@ octez-protocol-007-PsDELPH1-libs.client octez-shell-libs.client-commands octez-protocol-007-PsDELPH1-libs.client.commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_007_PsDELPH1/lib_plugin/dune b/src/proto_007_PsDELPH1/lib_plugin/dune index 9ebb141fa29f..67974f704927 100644 --- a/src/proto_007_PsDELPH1/lib_plugin/dune +++ b/src/proto_007_PsDELPH1/lib_plugin/dune @@ -5,7 +5,7 @@ (name tezos_protocol_plugin_007_PsDELPH1) (public_name octez-protocol-007-PsDELPH1-libs.plugin) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-007-PsDELPH1.protocol) (flags (:standard) @@ -20,7 +20,7 @@ (name tezos_protocol_plugin_007_PsDELPH1_registerer) (public_name octez-protocol-007-PsDELPH1-libs.plugin-registerer) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-007-PsDELPH1.embedded-protocol octez-protocol-007-PsDELPH1-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune index b42446805507..2adf84bef6d9 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/dune +++ b/src/proto_008_PtEdo2Zk/lib_client/dune @@ -6,15 +6,15 @@ (public_name octez-protocol-008-PtEdo2Zk-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-008-PtEdo2Zk.protocol tezos-protocol-008-PtEdo2Zk.protocol.lifted octez-shell-libs.signer-backends octez-protocol-008-PtEdo2Zk-libs.plugin - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune index 5a1888046805..1b0196ab8992 100644 --- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune +++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune @@ -6,16 +6,16 @@ (public_name octez-protocol-008-PtEdo2Zk-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-008-PtEdo2Zk.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-008-PtEdo2Zk-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-008-PtEdo2Zk-libs.plugin) (library_flags (:standard -linkall)) (flags @@ -36,8 +36,8 @@ (public_name octez-protocol-008-PtEdo2Zk-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-008-PtEdo2Zk.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -45,7 +45,7 @@ octez-protocol-008-PtEdo2Zk-libs.client octez-shell-libs.client-commands octez-protocol-008-PtEdo2Zk-libs.client.commands - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-008-PtEdo2Zk-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_008_PtEdo2Zk/lib_plugin/dune b/src/proto_008_PtEdo2Zk/lib_plugin/dune index c5207b41c3ab..1de2bf1c4d1b 100644 --- a/src/proto_008_PtEdo2Zk/lib_plugin/dune +++ b/src/proto_008_PtEdo2Zk/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-008-PtEdo2Zk-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-008-PtEdo2Zk.protocol) (flags (:standard) @@ -22,7 +22,7 @@ (public_name octez-protocol-008-PtEdo2Zk-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-008-PtEdo2Zk.embedded-protocol octez-protocol-008-PtEdo2Zk-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index 24167503becc..32b7a3bbd53b 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -6,15 +6,15 @@ (public_name octez-protocol-009-PsFLoren-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-009-PsFLoren.protocol tezos-protocol-009-PsFLoren.protocol.lifted octez-shell-libs.signer-backends octez-protocol-009-PsFLoren-libs.plugin - octez-libs.tezos-rpc + octez-libs.rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune index be6a7302c5e9..381137dc0824 100644 --- a/src/proto_009_PsFLoren/lib_client_commands/dune +++ b/src/proto_009_PsFLoren/lib_client_commands/dune @@ -6,16 +6,16 @@ (public_name octez-protocol-009-PsFLoren-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-009-PsFLoren.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-009-PsFLoren-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-009-PsFLoren-libs.plugin) (library_flags (:standard -linkall)) @@ -38,8 +38,8 @@ (public_name octez-protocol-009-PsFLoren-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-009-PsFLoren.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -47,7 +47,7 @@ octez-protocol-009-PsFLoren-libs.client octez-shell-libs.client-commands octez-protocol-009-PsFLoren-libs.client.commands - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-009-PsFLoren-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_009_PsFLoren/lib_plugin/dune b/src/proto_009_PsFLoren/lib_plugin/dune index 9c7d8d189abb..2022846fce45 100644 --- a/src/proto_009_PsFLoren/lib_plugin/dune +++ b/src/proto_009_PsFLoren/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-009-PsFLoren-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-009-PsFLoren.protocol) (flags (:standard) @@ -22,7 +22,7 @@ (public_name octez-protocol-009-PsFLoren-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-009-PsFLoren.embedded-protocol octez-protocol-009-PsFLoren-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index 7dc02d2028f8..7d3353881d84 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -6,15 +6,15 @@ (public_name octez-protocol-010-PtGRANAD-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-010-PtGRANAD.protocol tezos-protocol-010-PtGRANAD.protocol.lifted octez-shell-libs.signer-backends octez-protocol-010-PtGRANAD-libs.plugin - octez-libs.tezos-rpc + octez-libs.rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune index 9cfe91b126b3..4b6c57302de4 100644 --- a/src/proto_010_PtGRANAD/lib_client_commands/dune +++ b/src/proto_010_PtGRANAD/lib_client_commands/dune @@ -6,16 +6,16 @@ (public_name octez-protocol-010-PtGRANAD-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-010-PtGRANAD.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-010-PtGRANAD-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-010-PtGRANAD-libs.plugin) (library_flags (:standard -linkall)) @@ -38,8 +38,8 @@ (public_name octez-protocol-010-PtGRANAD-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-010-PtGRANAD.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -47,7 +47,7 @@ octez-protocol-010-PtGRANAD-libs.client octez-shell-libs.client-commands octez-protocol-010-PtGRANAD-libs.client.commands - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-010-PtGRANAD-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_010_PtGRANAD/lib_plugin/dune b/src/proto_010_PtGRANAD/lib_plugin/dune index 8d49915575f6..05e71a57bd61 100644 --- a/src/proto_010_PtGRANAD/lib_plugin/dune +++ b/src/proto_010_PtGRANAD/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-010-PtGRANAD-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-010-PtGRANAD.protocol) (flags (:standard) @@ -22,7 +22,7 @@ (public_name octez-protocol-010-PtGRANAD-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-010-PtGRANAD.embedded-protocol octez-protocol-010-PtGRANAD-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index d80aa1a5047b..3137a865514d 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-011-PtHangz2-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-011-PtHangz2.protocol @@ -17,7 +17,7 @@ octez-shell-libs.signer-backends octez-protocol-011-PtHangz2-libs.plugin tezos-protocol-011-PtHangz2.parameters - octez-libs.tezos-rpc + octez-libs.rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune index d2367867e071..84da0b54270f 100644 --- a/src/proto_011_PtHangz2/lib_client_commands/dune +++ b/src/proto_011_PtHangz2/lib_client_commands/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-011-PtHangz2-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-011-PtHangz2.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.mockup @@ -18,7 +18,7 @@ octez-shell-libs.client-base octez-protocol-011-PtHangz2-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-011-PtHangz2-libs.plugin uri) @@ -42,8 +42,8 @@ (public_name octez-protocol-011-PtHangz2-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-011-PtHangz2.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -52,7 +52,7 @@ octez-shell-libs.client-commands octez-protocol-011-PtHangz2-libs.client.commands octez-protocol-011-PtHangz2-libs.client.sapling - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-011-PtHangz2-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune index c7f06c9f449c..2bdc3cf996bc 100644 --- a/src/proto_011_PtHangz2/lib_client_sapling/dune +++ b/src/proto_011_PtHangz2/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-011-PtHangz2-libs.client.sapling) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-crypto - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.clic + octez-libs.crypto + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.signer-backends octez-protocol-011-PtHangz2-libs.client diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune index 38f75b802bf7..f6e966e9bcc9 100644 --- a/src/proto_011_PtHangz2/lib_parameters/dune +++ b/src/proto_011_PtHangz2/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-011-PtHangz2.parameters) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment tezos-protocol-011-PtHangz2.protocol) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-011-PtHangz2.parameters) (link_flags (:standard) diff --git a/src/proto_011_PtHangz2/lib_plugin/dune b/src/proto_011_PtHangz2/lib_plugin/dune index cc4bc0f68ca8..065c79bae8a5 100644 --- a/src/proto_011_PtHangz2/lib_plugin/dune +++ b/src/proto_011_PtHangz2/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-011-PtHangz2-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-011-PtHangz2.protocol) (flags (:standard) @@ -22,7 +22,7 @@ (public_name octez-protocol-011-PtHangz2-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-011-PtHangz2.embedded-protocol octez-protocol-011-PtHangz2-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index 0dc63ec821ed..f4a8285dc90c 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-012-Psithaca-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-012-Psithaca.protocol @@ -17,7 +17,7 @@ octez-shell-libs.signer-backends octez-protocol-012-Psithaca-libs.plugin tezos-protocol-012-Psithaca.parameters - octez-libs.tezos-rpc + octez-libs.rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune index 3b0c2a57de22..97b13228a873 100644 --- a/src/proto_012_Psithaca/lib_client_commands/dune +++ b/src/proto_012_Psithaca/lib_client_commands/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-012-Psithaca-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-012-Psithaca.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.mockup @@ -18,7 +18,7 @@ octez-shell-libs.client-base octez-protocol-012-Psithaca-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-012-Psithaca-libs.plugin uri) @@ -42,8 +42,8 @@ (public_name octez-protocol-012-Psithaca-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-012-Psithaca.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -52,7 +52,7 @@ octez-shell-libs.client-commands octez-protocol-012-Psithaca-libs.client.commands octez-protocol-012-Psithaca-libs.client.sapling - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-012-Psithaca-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune index b876066b70ec..63fad41561a5 100644 --- a/src/proto_012_Psithaca/lib_client_sapling/dune +++ b/src/proto_012_Psithaca/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-012-Psithaca-libs.client.sapling) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-crypto - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.clic + octez-libs.crypto + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.signer-backends octez-protocol-012-Psithaca-libs.client diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune index 2e3a4949f13a..24378cc65894 100644 --- a/src/proto_012_Psithaca/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-012-Psithaca.parameters) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment tezos-protocol-012-Psithaca.protocol) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-012-Psithaca.parameters tezos-protocol-012-Psithaca.protocol) (link_flags diff --git a/src/proto_012_Psithaca/lib_plugin/dune b/src/proto_012_Psithaca/lib_plugin/dune index 0a2e628bc26b..09334f74bd44 100644 --- a/src/proto_012_Psithaca/lib_plugin/dune +++ b/src/proto_012_Psithaca/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-012-Psithaca-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-012-Psithaca.protocol) (flags (:standard) @@ -22,7 +22,7 @@ (public_name octez-protocol-012-Psithaca-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-012-Psithaca.embedded-protocol octez-protocol-012-Psithaca-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index 60cfcfe8e95a..46488a78d089 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-013-PtJakart-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-013-PtJakart.protocol @@ -17,7 +17,7 @@ octez-shell-libs.signer-backends octez-protocol-013-PtJakart-libs.plugin tezos-protocol-013-PtJakart.parameters - octez-libs.tezos-rpc + octez-libs.rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune index 866cb6d813c7..3aab512b4bd1 100644 --- a/src/proto_013_PtJakart/lib_client_commands/dune +++ b/src/proto_013_PtJakart/lib_client_commands/dune @@ -6,11 +6,11 @@ (public_name octez-protocol-013-PtJakart-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-013-PtJakart.protocol tezos-protocol-013-PtJakart.parameters - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.mockup @@ -19,7 +19,7 @@ octez-shell-libs.client-base octez-protocol-013-PtJakart-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-013-PtJakart-libs.plugin uri) @@ -44,8 +44,8 @@ (public_name octez-protocol-013-PtJakart-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-013-PtJakart.protocol tezos-protocol-013-PtJakart.parameters octez-proto-libs.protocol-environment @@ -55,7 +55,7 @@ octez-shell-libs.client-commands octez-protocol-013-PtJakart-libs.client.commands octez-protocol-013-PtJakart-libs.client.sapling - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-013-PtJakart-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune index bdab87172204..d462f0a0eb5d 100644 --- a/src/proto_013_PtJakart/lib_client_sapling/dune +++ b/src/proto_013_PtJakart/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-013-PtJakart-libs.client.sapling) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-crypto - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.clic + octez-libs.crypto + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.signer-backends octez-protocol-013-PtJakart-libs.client diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune index e442ef75c4cb..ca02bce0290c 100644 --- a/src/proto_013_PtJakart/lib_parameters/dune +++ b/src/proto_013_PtJakart/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-013-PtJakart.parameters) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment tezos-protocol-013-PtJakart.protocol) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-013-PtJakart.parameters tezos-protocol-013-PtJakart.protocol) (link_flags diff --git a/src/proto_013_PtJakart/lib_plugin/dune b/src/proto_013_PtJakart/lib_plugin/dune index a502989893f9..216162f23d80 100644 --- a/src/proto_013_PtJakart/lib_plugin/dune +++ b/src/proto_013_PtJakart/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-013-PtJakart-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-013-PtJakart.protocol) (flags (:standard) @@ -22,7 +22,7 @@ (public_name octez-protocol-013-PtJakart-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-013-PtJakart.embedded-protocol octez-protocol-013-PtJakart-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune index 00cb8adf85bd..1b4e81f17ae5 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-014-PtKathma-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-014-PtKathma.protocol @@ -17,7 +17,7 @@ octez-shell-libs.signer-backends octez-protocol-014-PtKathma-libs.plugin tezos-protocol-014-PtKathma.parameters - octez-libs.tezos-rpc + octez-libs.rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune index bf54239ad05c..e2a311cb39c0 100644 --- a/src/proto_014_PtKathma/lib_client_commands/dune +++ b/src/proto_014_PtKathma/lib_client_commands/dune @@ -6,11 +6,11 @@ (public_name octez-protocol-014-PtKathma-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-014-PtKathma.protocol tezos-protocol-014-PtKathma.parameters - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.mockup @@ -19,7 +19,7 @@ octez-shell-libs.client-base octez-protocol-014-PtKathma-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-014-PtKathma-libs.plugin uri) @@ -44,8 +44,8 @@ (public_name octez-protocol-014-PtKathma-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-014-PtKathma.protocol tezos-protocol-014-PtKathma.parameters octez-proto-libs.protocol-environment @@ -55,7 +55,7 @@ octez-shell-libs.client-commands octez-protocol-014-PtKathma-libs.client.commands octez-protocol-014-PtKathma-libs.client.sapling - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-014-PtKathma-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_014_PtKathma/lib_client_sapling/dune b/src/proto_014_PtKathma/lib_client_sapling/dune index f9c74bf26deb..61b05445e7b1 100644 --- a/src/proto_014_PtKathma/lib_client_sapling/dune +++ b/src/proto_014_PtKathma/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-014-PtKathma-libs.client.sapling) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-crypto - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.clic + octez-libs.crypto + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.signer-backends octez-protocol-014-PtKathma-libs.client diff --git a/src/proto_014_PtKathma/lib_parameters/dune b/src/proto_014_PtKathma/lib_parameters/dune index fc52a73090e7..81bcf159a71e 100644 --- a/src/proto_014_PtKathma/lib_parameters/dune +++ b/src/proto_014_PtKathma/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-014-PtKathma.parameters) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment tezos-protocol-014-PtKathma.protocol) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-014-PtKathma.parameters tezos-protocol-014-PtKathma.protocol) (link_flags diff --git a/src/proto_014_PtKathma/lib_plugin/dune b/src/proto_014_PtKathma/lib_plugin/dune index 8c355da52458..f89f3adac5f0 100644 --- a/src/proto_014_PtKathma/lib_plugin/dune +++ b/src/proto_014_PtKathma/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-014-PtKathma-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-014-PtKathma.protocol) (flags (:standard) @@ -22,7 +22,7 @@ (public_name octez-protocol-014-PtKathma-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-014-PtKathma.embedded-protocol octez-protocol-014-PtKathma-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_015_PtLimaPt/lib_client/dune b/src/proto_015_PtLimaPt/lib_client/dune index 6fd077dee725..da7225d6b9bc 100644 --- a/src/proto_015_PtLimaPt/lib_client/dune +++ b/src/proto_015_PtLimaPt/lib_client/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-015-PtLimaPt-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-015-PtLimaPt.protocol @@ -17,7 +17,7 @@ octez-shell-libs.signer-backends octez-protocol-015-PtLimaPt-libs.plugin tezos-protocol-015-PtLimaPt.parameters - octez-libs.tezos-rpc + octez-libs.rpc uri) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_015_PtLimaPt/lib_client_commands/dune b/src/proto_015_PtLimaPt/lib_client_commands/dune index 3e1effbf8686..c078dcf07a4f 100644 --- a/src/proto_015_PtLimaPt/lib_client_commands/dune +++ b/src/proto_015_PtLimaPt/lib_client_commands/dune @@ -6,11 +6,11 @@ (public_name octez-protocol-015-PtLimaPt-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-015-PtLimaPt.protocol tezos-protocol-015-PtLimaPt.parameters - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.mockup @@ -19,7 +19,7 @@ octez-shell-libs.client-base octez-protocol-015-PtLimaPt-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-015-PtLimaPt-libs.plugin uri) @@ -43,8 +43,8 @@ (public_name octez-protocol-015-PtLimaPt-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-015-PtLimaPt.protocol tezos-protocol-015-PtLimaPt.parameters octez-proto-libs.protocol-environment @@ -54,7 +54,7 @@ octez-shell-libs.client-commands octez-protocol-015-PtLimaPt-libs.client.commands octez-protocol-015-PtLimaPt-libs.client.sapling - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-015-PtLimaPt-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_015_PtLimaPt/lib_client_sapling/dune b/src/proto_015_PtLimaPt/lib_client_sapling/dune index 39e8f13ce838..abb08a6bf504 100644 --- a/src/proto_015_PtLimaPt/lib_client_sapling/dune +++ b/src/proto_015_PtLimaPt/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-015-PtLimaPt-libs.client.sapling) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-crypto - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.clic + octez-libs.crypto + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.signer-backends octez-protocol-015-PtLimaPt-libs.client diff --git a/src/proto_015_PtLimaPt/lib_parameters/dune b/src/proto_015_PtLimaPt/lib_parameters/dune index 5eb803d39d05..83306c5ee184 100644 --- a/src/proto_015_PtLimaPt/lib_parameters/dune +++ b/src/proto_015_PtLimaPt/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-015-PtLimaPt.parameters) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment tezos-protocol-015-PtLimaPt.protocol) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-015-PtLimaPt.parameters tezos-protocol-015-PtLimaPt.protocol) (link_flags diff --git a/src/proto_015_PtLimaPt/lib_plugin/dune b/src/proto_015_PtLimaPt/lib_plugin/dune index dfefd49129b2..86690df5190b 100644 --- a/src/proto_015_PtLimaPt/lib_plugin/dune +++ b/src/proto_015_PtLimaPt/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-015-PtLimaPt-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-015-PtLimaPt.protocol) (flags (:standard) @@ -22,7 +22,7 @@ (public_name octez-protocol-015-PtLimaPt-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-015-PtLimaPt.embedded-protocol octez-protocol-015-PtLimaPt-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_016_PtMumbai/lib_client/dune b/src/proto_016_PtMumbai/lib_client/dune index 1f211ac111a2..321e4483820e 100644 --- a/src/proto_016_PtMumbai/lib_client/dune +++ b/src/proto_016_PtMumbai/lib_client/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-016-PtMumbai-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-016-PtMumbai.protocol @@ -17,7 +17,7 @@ octez-shell-libs.signer-backends octez-protocol-016-PtMumbai-libs.plugin tezos-protocol-016-PtMumbai.parameters - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-016-PtMumbai-libs.smart-rollup uri) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_016_PtMumbai/lib_client_commands/dune b/src/proto_016_PtMumbai/lib_client_commands/dune index 712a3ca28273..9929baf24940 100644 --- a/src/proto_016_PtMumbai/lib_client_commands/dune +++ b/src/proto_016_PtMumbai/lib_client_commands/dune @@ -6,11 +6,11 @@ (public_name octez-protocol-016-PtMumbai-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-016-PtMumbai.protocol tezos-protocol-016-PtMumbai.parameters - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.mockup @@ -19,7 +19,7 @@ octez-shell-libs.client-base octez-protocol-016-PtMumbai-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-016-PtMumbai-libs.plugin uri) @@ -43,8 +43,8 @@ (public_name octez-protocol-016-PtMumbai-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-016-PtMumbai.protocol tezos-protocol-016-PtMumbai.parameters octez-proto-libs.protocol-environment @@ -54,7 +54,7 @@ octez-shell-libs.client-commands octez-protocol-016-PtMumbai-libs.client.commands octez-protocol-016-PtMumbai-libs.client.sapling - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-016-PtMumbai-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_client_sapling/dune b/src/proto_016_PtMumbai/lib_client_sapling/dune index ac6ebd7ea329..46186c005afa 100644 --- a/src/proto_016_PtMumbai/lib_client_sapling/dune +++ b/src/proto_016_PtMumbai/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-016-PtMumbai-libs.client.sapling) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-crypto - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.clic + octez-libs.crypto + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.signer-backends octez-protocol-016-PtMumbai-libs.client diff --git a/src/proto_016_PtMumbai/lib_layer2_utils/dune b/src/proto_016_PtMumbai/lib_layer2_utils/dune index 2088c1645044..a40105ae5603 100644 --- a/src/proto_016_PtMumbai/lib_layer2_utils/dune +++ b/src/proto_016_PtMumbai/lib_layer2_utils/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-016-PtMumbai-libs.layer2-utils) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-016-PtMumbai.protocol octez-protocol-016-PtMumbai-libs.client) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_016_PtMumbai/lib_parameters/dune b/src/proto_016_PtMumbai/lib_parameters/dune index 2af168d0679b..b7155fb50434 100644 --- a/src/proto_016_PtMumbai/lib_parameters/dune +++ b/src/proto_016_PtMumbai/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-016-PtMumbai.parameters) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment tezos-protocol-016-PtMumbai.protocol) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-016-PtMumbai.parameters tezos-protocol-016-PtMumbai.protocol) (link_flags diff --git a/src/proto_016_PtMumbai/lib_plugin/dune b/src/proto_016_PtMumbai/lib_plugin/dune index a41bf941cae7..81fc3d87e283 100644 --- a/src/proto_016_PtMumbai/lib_plugin/dune +++ b/src/proto_016_PtMumbai/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-016-PtMumbai-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-016-PtMumbai.protocol octez-protocol-016-PtMumbai-libs.smart-rollup) (flags @@ -24,7 +24,7 @@ (public_name octez-protocol-016-PtMumbai-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-016-PtMumbai.embedded-protocol octez-protocol-016-PtMumbai-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup/dune b/src/proto_016_PtMumbai/lib_sc_rollup/dune index 26daa2ab4d74..dc1b5d18811c 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-016-PtMumbai-libs.smart-rollup) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-016-PtMumbai.protocol) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune index 04b1e42256be..2bb88d94b87b 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup_layer2/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-016-PtMumbai-libs.smart-rollup-layer2) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-016-PtMumbai.protocol octez-injector octez-l2-libs.smart-rollup) diff --git a/src/proto_017_PtNairob/bin_accuser/dune b/src/proto_017_PtNairob/bin_accuser/dune index c3f036b9c3ae..fa09ae7e415b 100644 --- a/src/proto_017_PtNairob/bin_accuser/dune +++ b/src/proto_017_PtNairob/bin_accuser/dune @@ -7,13 +7,13 @@ (package octez-accuser-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.client octez-shell-libs.client-commands octez-protocol-017-PtNairob-libs.baking-commands - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base-unix) (link_flags (:standard) diff --git a/src/proto_017_PtNairob/bin_baker/dune b/src/proto_017_PtNairob/bin_baker/dune index e104534ea6c1..0c3eaff57151 100644 --- a/src/proto_017_PtNairob/bin_baker/dune +++ b/src/proto_017_PtNairob/bin_baker/dune @@ -7,13 +7,13 @@ (package octez-baker-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.client octez-shell-libs.client-commands octez-protocol-017-PtNairob-libs.baking-commands - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base-unix) (link_flags (:standard) diff --git a/src/proto_017_PtNairob/bin_sc_rollup_client/dune b/src/proto_017_PtNairob/bin_sc_rollup_client/dune index 502aa538c4e1..2bbf8b2bead6 100644 --- a/src/proto_017_PtNairob/bin_sc_rollup_client/dune +++ b/src/proto_017_PtNairob/bin_sc_rollup_client/dune @@ -7,8 +7,8 @@ (package octez-smart-rollup-client-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-017-PtNairob.protocol octez_smart_rollup_client_PtNairob tezos-version.value) diff --git a/src/proto_017_PtNairob/bin_sc_rollup_node/dune b/src/proto_017_PtNairob/bin_sc_rollup_node/dune index de8abc28d522..ed63ea51a006 100644 --- a/src/proto_017_PtNairob/bin_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/bin_sc_rollup_node/dune @@ -7,8 +7,8 @@ (package octez-smart-rollup-node-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-017-PtNairob.protocol octez-shell-libs.shell-services octez-shell-libs.client-base diff --git a/src/proto_017_PtNairob/lib_benchmark/dune b/src/proto_017_PtNairob/lib_benchmark/dune index ab02b689e045..30ab99198aaa 100644 --- a/src/proto_017_PtNairob/lib_benchmark/dune +++ b/src/proto_017_PtNairob/lib_benchmark/dune @@ -5,15 +5,15 @@ (name tezos_benchmark_017_PtNairob) (public_name tezos-benchmark-017-PtNairob) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-base - octez-libs.tezos-error-monad - octez-libs.tezos-micheline + octez-libs.stdlib + octez-libs.base + octez-libs.error-monad + octez-libs.micheline tezos-micheline-rewriting tezos-benchmark tezos-benchmark-type-inference-017-PtNairob tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-crypto + octez-libs.crypto tezos-protocol-017-PtNairob.parameters hashcons octez-protocol-017-PtNairob-libs.test-helpers diff --git a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune index 0be6fec4941c..c5e98d57dc8d 100644 --- a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/dune @@ -6,10 +6,10 @@ (public_name tezos-benchmark-type-inference-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-error-monad - octez-libs.tezos-crypto - octez-libs.tezos-micheline + octez-libs.stdlib + octez-libs.error-monad + octez-libs.crypto + octez-libs.micheline tezos-micheline-rewriting tezos-protocol-017-PtNairob.protocol hashcons) diff --git a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune index edada2f46f7c..4962b1c6fb1e 100644 --- a/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_017_PtNairob/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,11 +4,11 @@ (executables (names test_uf test_inference) (libraries - octez-libs.tezos-micheline + octez-libs.micheline tezos-micheline-rewriting tezos-benchmark-type-inference-017-PtNairob tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-error-monad + octez-libs.error-monad octez-protocol-017-PtNairob-libs.client) (link_flags (:standard) diff --git a/src/proto_017_PtNairob/lib_benchmark/test/dune b/src/proto_017_PtNairob/lib_benchmark/test/dune index 46b8270c9888..95c6cfb7bdfe 100644 --- a/src/proto_017_PtNairob/lib_benchmark/test/dune +++ b/src/proto_017_PtNairob/lib_benchmark/test/dune @@ -8,15 +8,15 @@ test_autocompletion test_distribution) (libraries - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline tezos-micheline-rewriting tezos-protocol-017-PtNairob.protocol tezos-benchmark tezos-benchmark-type-inference-017-PtNairob tezos-benchmark-017-PtNairob octez-protocol-017-PtNairob-libs.test-helpers - octez-libs.tezos-error-monad + octez-libs.error-monad prbnmcn-stats) (link_flags (:standard) diff --git a/src/proto_017_PtNairob/lib_benchmarks_proto/dune b/src/proto_017_PtNairob/lib_benchmarks_proto/dune index b58e1aab0881..804f0ea1e15e 100644 --- a/src/proto_017_PtNairob/lib_benchmarks_proto/dune +++ b/src/proto_017_PtNairob/lib_benchmarks_proto/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries str - octez-libs.tezos-stdlib - octez-libs.tezos-base - octez-libs.tezos-error-monad + octez-libs.stdlib + octez-libs.base + octez-libs.error-monad tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-lazy-containers + octez-libs.lazy-containers tezos-benchmark tezos-benchmark-017-PtNairob tezos-benchmark-type-inference-017-PtNairob tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-crypto + octez-libs.crypto octez-shell-libs.shell-benchmarks - octez-libs.tezos-micheline + octez-libs.micheline octez-protocol-017-PtNairob-libs.test-helpers octez-libs.tezos-sapling octez-protocol-017-PtNairob-libs.client diff --git a/src/proto_017_PtNairob/lib_client/dune b/src/proto_017_PtNairob/lib_client/dune index 83c8447c91ff..62f36ef8d890 100644 --- a/src/proto_017_PtNairob/lib_client/dune +++ b/src/proto_017_PtNairob/lib_client/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-017-PtNairob-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-017-PtNairob.protocol @@ -17,7 +17,7 @@ octez-shell-libs.signer-backends octez-protocol-017-PtNairob-libs.plugin tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-017-PtNairob-libs.smart-rollup uri) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_017_PtNairob/lib_client/test/dune b/src/proto_017_PtNairob/lib_client/test/dune index 4c8a725ed059..710ac2f9ca36 100644 --- a/src/proto_017_PtNairob/lib_client/test/dune +++ b/src/proto_017_PtNairob/lib_client/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline octez-protocol-017-PtNairob-libs.client tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base-test-helpers + octez-libs.test-helpers octez-alcotezt qcheck-alcotest) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_client_commands/dune b/src/proto_017_PtNairob/lib_client_commands/dune index 7f77be5c9fa3..37d2b9df602b 100644 --- a/src/proto_017_PtNairob/lib_client_commands/dune +++ b/src/proto_017_PtNairob/lib_client_commands/dune @@ -6,11 +6,11 @@ (public_name octez-protocol-017-PtNairob-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-017-PtNairob.protocol tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.mockup @@ -19,7 +19,7 @@ octez-shell-libs.client-base octez-protocol-017-PtNairob-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-017-PtNairob-libs.plugin uri) @@ -43,8 +43,8 @@ (public_name octez-protocol-017-PtNairob-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-017-PtNairob.protocol tezos-protocol-017-PtNairob.parameters octez-proto-libs.protocol-environment @@ -54,7 +54,7 @@ octez-shell-libs.client-commands octez-protocol-017-PtNairob-libs.client.commands octez-protocol-017-PtNairob-libs.client.sapling - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-017-PtNairob-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_client_sapling/dune b/src/proto_017_PtNairob/lib_client_sapling/dune index e65030063889..4feca5866b4f 100644 --- a/src/proto_017_PtNairob/lib_client_sapling/dune +++ b/src/proto_017_PtNairob/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-017-PtNairob-libs.client.sapling) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-crypto - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.clic + octez-libs.crypto + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.signer-backends octez-protocol-017-PtNairob-libs.client diff --git a/src/proto_017_PtNairob/lib_dac_plugin/dune b/src/proto_017_PtNairob/lib_dac_plugin/dune index 9929658d67be..ab548602e292 100644 --- a/src/proto_017_PtNairob/lib_dac_plugin/dune +++ b/src/proto_017_PtNairob/lib_dac_plugin/dune @@ -6,9 +6,9 @@ (public_name octez-protocol-017-PtNairob-libs.dac) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-protocol-compiler.registerer - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-dac-lib tezos-dac-client-lib octez-protocol-017-PtNairob-libs.client diff --git a/src/proto_017_PtNairob/lib_dac_plugin/test/dune b/src/proto_017_PtNairob/lib_dac_plugin/test/dune index 35e289605a55..cd3da527cff4 100644 --- a/src/proto_017_PtNairob/lib_dac_plugin/test/dune +++ b/src/proto_017_PtNairob/lib_dac_plugin/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base octez-protocol-017-PtNairob-libs.dac tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-017-PtNairob-libs.test-helpers tezos-dac-lib tezos_dac_node_lib diff --git a/src/proto_017_PtNairob/lib_dal/dune b/src/proto_017_PtNairob/lib_dal/dune index 1644079b7e7d..6bbb739b91a3 100644 --- a/src/proto_017_PtNairob/lib_dal/dune +++ b/src/proto_017_PtNairob/lib_dal/dune @@ -6,9 +6,9 @@ (public_name octez-protocol-017-PtNairob-libs.dal) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-protocol-compiler.registerer - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-dal-node-lib octez-protocol-017-PtNairob-libs.client octez-protocol-017-PtNairob-libs.plugin diff --git a/src/proto_017_PtNairob/lib_dal/test/dune b/src/proto_017_PtNairob/lib_dal/test/dune index 7f1b6f3e48c3..a11e9eb55907 100644 --- a/src/proto_017_PtNairob/lib_dal/test/dune +++ b/src/proto_017_PtNairob/lib_dal/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base octez-protocol-017-PtNairob-libs.dal tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-017-PtNairob-libs.test-helpers octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_delegate/dune b/src/proto_017_PtNairob/lib_delegate/dune index c1e5898af545..fc7f63e25ec3 100644 --- a/src/proto_017_PtNairob/lib_delegate/dune +++ b/src/proto_017_PtNairob/lib_delegate/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-017-PtNairob-libs.baking) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-version.value tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.plugin @@ -16,15 +16,15 @@ octez-shell-libs.client-base octez-protocol-017-PtNairob-libs.client octez-shell-libs.client-commands - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix + octez-libs.stdlib + octez-libs.stdlib-unix octez-shell-libs.shell-context octez-libs.tezos-context octez-libs.tezos-context.memory - octez-libs.tezos-rpc-http-client-unix + octez-libs.rpc-http-client-unix octez-shell-libs.context-ops - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http + octez-libs.rpc + octez-libs.rpc-http tezos-dal-node-services lwt-canceler lwt-exit @@ -53,16 +53,16 @@ (public_name octez-protocol-017-PtNairob-libs.baking-commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-017-PtNairob-libs.client octez-shell-libs.client-commands octez-protocol-017-PtNairob-libs.baking - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags @@ -83,7 +83,7 @@ (public_name octez-protocol-017-PtNairob-libs.baking-commands.registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -92,7 +92,7 @@ octez-shell-libs.client-commands octez-protocol-017-PtNairob-libs.baking octez-protocol-017-PtNairob-libs.baking-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_delegate/test/dune b/src/proto_017_PtNairob/lib_delegate/test/dune index 2a00e7e39288..4db0f9b93291 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline octez-protocol-017-PtNairob-libs.client tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-017-PtNairob-libs.bakings.mockup-simulator octez-protocol-017-PtNairob-libs.baking tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-crypto + octez-libs.crypto octez-alcotezt uri) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune index 6028fb874a68..961dc08c895d 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/mockup_simulator/dune @@ -5,12 +5,12 @@ (name tezos_017_PtNairob_mockup_simulator) (public_name octez-protocol-017-PtNairob-libs.bakings.mockup-simulator) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.client octez-shell-libs.client-commands octez-protocol-017-PtNairob-libs.baking - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base-unix tezos-protocol-017-PtNairob.parameters octez-shell-libs.mockup diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune index 428107fbeb09..3202475e1f7e 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.client-base octez-protocol-017-PtNairob-libs.client tezos-protocol-017-PtNairob.protocol diff --git a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune index af79ae7c7f61..5955632c7b2c 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/tenderbrute/lib/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-017-PtNairob-libs.baking.tenderbrute) (libraries data-encoding - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix tezos-protocol-017-PtNairob.protocol octez-shell-libs.client-base octez-protocol-017-PtNairob-libs.client) diff --git a/src/proto_017_PtNairob/lib_injector/dune b/src/proto_017_PtNairob/lib_injector/dune index 9932ef9a751b..13a753baf4e8 100644 --- a/src/proto_017_PtNairob/lib_injector/dune +++ b/src/proto_017_PtNairob/lib_injector/dune @@ -6,7 +6,7 @@ (package tezos-injector-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-injector octez-protocol-017-PtNairob-libs.client diff --git a/src/proto_017_PtNairob/lib_layer2_utils/dune b/src/proto_017_PtNairob/lib_layer2_utils/dune index fe01297abc1b..52b6261c3e2d 100644 --- a/src/proto_017_PtNairob/lib_layer2_utils/dune +++ b/src/proto_017_PtNairob/lib_layer2_utils/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-017-PtNairob-libs.layer2-utils) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.client) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_017_PtNairob/lib_parameters/dune b/src/proto_017_PtNairob/lib_parameters/dune index c7885ff4b383..b9910e8e2f11 100644 --- a/src/proto_017_PtNairob/lib_parameters/dune +++ b/src/proto_017_PtNairob/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-017-PtNairob.parameters) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment tezos-protocol-017-PtNairob.protocol) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.parameters tezos-protocol-017-PtNairob.protocol) (link_flags diff --git a/src/proto_017_PtNairob/lib_plugin/dune b/src/proto_017_PtNairob/lib_plugin/dune index a58032836f3f..e3ad1a5b4f7e 100644 --- a/src/proto_017_PtNairob/lib_plugin/dune +++ b/src/proto_017_PtNairob/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-017-PtNairob-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.smart-rollup) (flags @@ -24,7 +24,7 @@ (public_name octez-protocol-017-PtNairob-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.embedded-protocol octez-protocol-017-PtNairob-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_017_PtNairob/lib_plugin/test/dune b/src/proto_017_PtNairob/lib_plugin/test/dune index 0e50e3c2670a..8912cb97b707 100644 --- a/src/proto_017_PtNairob/lib_plugin/test/dune +++ b/src/proto_017_PtNairob/lib_plugin/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base-test-helpers - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base-test-helpers + octez-libs.base.unix octez-alcotezt - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest - octez-libs.tezos-stdlib-unix - octez-libs.tezos-micheline + octez-libs.stdlib-unix + octez-libs.micheline octez-protocol-017-PtNairob-libs.plugin tezos-protocol-017-PtNairob.protocol tezos-protocol-017-PtNairob.parameters diff --git a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune index 1115c6895c7f..2f3d735803d2 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries qcheck-alcotest - octez-libs.tezos-test-helpers - octez-libs.tezos-base - octez-libs.tezos-micheline - octez-libs.tezos-stdlib-unix + octez-libs.test-helpers + octez-libs.base + octez-libs.micheline + octez-libs.stdlib-unix tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.client tezos-protocol-017-PtNairob.parameters octez-proto-libs.protocol-environment octez-protocol-017-PtNairob-libs.plugin octez-shell-libs.shell-services - octez-libs.octez-plompiler - octez-libs.tezos-crypto-dal) + octez-libs.plompiler + octez-libs.crypto-dal) (flags (:standard) -open Tezos_test_helpers diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune index 4f4ea46d8ac6..231ccb2b94d2 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune @@ -8,10 +8,10 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers tezos-protocol-017-PtNairob.parameters octez-protocol-017-PtNairob-libs.plugin) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/dune index 04ac249f8fee..06c7e892b215 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/dune @@ -9,12 +9,12 @@ tezt octez-libs.tezos-context octez-alcotezt - octez-libs.tezos-base + octez-libs.base octez-protocol-017-PtNairob-libs.client tezos-protocol-017-PtNairob.protocol tezos-protocol-017-PtNairob.parameters octez-protocol-017-PtNairob-libs.test-helpers - octez-libs.tezos-base-test-helpers) + octez-libs.base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune index c367b9b0e196..6151921ca209 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune @@ -7,10 +7,10 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.test-helpers - octez-libs.tezos-base-test-helpers) + octez-libs.base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune index 90647598d890..262c10969ad8 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune @@ -8,13 +8,13 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-017-PtNairob-libs.client tezos-benchmark - octez-libs.tezos-micheline + octez-libs.micheline tezos-benchmark-017-PtNairob tezos-benchmark-type-inference-017-PtNairob octez-protocol-017-PtNairob-libs.plugin diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune index bd2d3844ed2e..0aadf08a0ddd 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune @@ -8,11 +8,11 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.client octez-protocol-017-PtNairob-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-017-PtNairob-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune index b9e4b3211427..7cf7d5ff2cab 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune @@ -7,13 +7,13 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol qcheck-alcotest octez-protocol-017-PtNairob-libs.client - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-017-PtNairob-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-017-PtNairob-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune index 43f1ece40b49..6f2377cf5a46 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline octez-protocol-017-PtNairob-libs.client tezos-protocol-017-PtNairob.protocol octez-libs.tezos-context.merkle_proof_encoding - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-017-PtNairob-libs.test-helpers octez-alcotezt qcheck-alcotest @@ -19,8 +19,8 @@ tezos-benchmark-017-PtNairob tezos-benchmark-type-inference-017-PtNairob octez-protocol-017-PtNairob-libs.smart-rollup - octez-libs.tezos-crypto-dal - octez-libs.tezos-base-test-helpers + octez-libs.crypto-dal + octez-libs.base-test-helpers tezos-protocol-017-PtNairob.parameters) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_protocol/test/regression/dune b/src/proto_017_PtNairob/lib_protocol/test/regression/dune index 0d46b9645164..492d41ae2ce1 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/regression/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/regression/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base tezt-tezos tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.client octez-protocol-017-PtNairob-libs.plugin octez-protocol-017-PtNairob-libs.test-helpers - octez-libs.tezos-micheline) + octez-libs.micheline) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune index 19e370fe6a50..cf24ec93d1eb 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune @@ -6,21 +6,21 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base-test-helpers - octez-libs.tezos-micheline + octez-libs.base + octez-libs.base-test-helpers + octez-libs.micheline octez-protocol-017-PtNairob-libs.client octez-shell-libs.client-base tezos-protocol-017-PtNairob.parameters octez-proto-libs.protocol-environment - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-017-PtNairob-libs.test-helpers octez-alcotezt octez-l2-libs.scoru-wasm-helpers - octez-libs.tezos-stdlib - octez-libs.tezos-crypto-dal + octez-libs.stdlib + octez-libs.crypto-dal octez-l2-libs.scoru-wasm octez-l2-libs.webassembly-interpreter-extra) (library_flags (:standard -linkall)) diff --git a/src/proto_017_PtNairob/lib_sc_rollup/dune b/src/proto_017_PtNairob/lib_sc_rollup/dune index e792747bdb96..b0c250c2843b 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-017-PtNairob-libs.smart-rollup) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_client/dune b/src/proto_017_PtNairob/lib_sc_rollup_client/dune index 434a4effb239..09afcc85fafc 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_client/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_client/dune @@ -6,7 +6,7 @@ (package octez-smart-rollup-client-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-shell-libs.client-commands octez-shell-libs.client-base diff --git a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune index d045938136cf..022abf30e998 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_layer2/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-017-PtNairob-libs.smart-rollup-layer2) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol octez-injector octez-l2-libs.smart-rollup) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/dune index f97c68dfe2df..b1d411fa05c8 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dune @@ -6,8 +6,8 @@ (package octez-smart-rollup-node-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.client-base-unix octez-protocol-017-PtNairob-libs.client @@ -16,9 +16,9 @@ tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.plugin tezos-protocol-017-PtNairob.parameters - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server + octez-libs.rpc + octez-libs.rpc-http + octez-libs.rpc-http-server octez-libs.tezos-workers tezos-dal-node-services tezos-dal-node-lib @@ -30,7 +30,7 @@ octez-protocol-017-PtNairob-libs.layer2-utils octez-l2-libs.layer2_store octez-crawler - octez-libs.tezos-tree-encoding + octez-libs.tree-encoding data-encoding irmin-pack irmin-pack.unix @@ -41,7 +41,7 @@ octez-smart-rollup-node-lib octez-l2-libs.scoru-wasm octez-l2-libs.scoru-wasm-fast - octez-libs.tezos-crypto-dal + octez-libs.crypto-dal tezos-version.value) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune index 76e46aee590f..cddeb4f26b69 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune @@ -6,9 +6,9 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-017-PtNairob-libs.smart-rollup-layer2 octez_smart_rollup_node_PtNairob octez-alcotezt diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune index af7ac98b91b7..3e346d622458 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/test/helpers/dune @@ -6,11 +6,11 @@ (package tezos-sc-rollup-node-test) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-017-PtNairob.protocol tezos-protocol-017-PtNairob.parameters octez-protocol-017-PtNairob-libs.client - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest qcheck-core logs.lwt diff --git a/src/proto_018_Proxford/bin_accuser/dune b/src/proto_018_Proxford/bin_accuser/dune index 7317879284e6..a0588604f839 100644 --- a/src/proto_018_Proxford/bin_accuser/dune +++ b/src/proto_018_Proxford/bin_accuser/dune @@ -7,13 +7,13 @@ (package octez-accuser-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.client octez-shell-libs.client-commands octez-protocol-018-Proxford-libs.baking-commands - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base-unix) (link_flags (:standard) diff --git a/src/proto_018_Proxford/bin_baker/dune b/src/proto_018_Proxford/bin_baker/dune index 30fa0b9d1fc8..785ab50c30e5 100644 --- a/src/proto_018_Proxford/bin_baker/dune +++ b/src/proto_018_Proxford/bin_baker/dune @@ -7,13 +7,13 @@ (package octez-baker-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.client octez-shell-libs.client-commands octez-protocol-018-Proxford-libs.baking-commands - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base-unix) (link_flags (:standard) diff --git a/src/proto_018_Proxford/bin_sc_rollup_client/dune b/src/proto_018_Proxford/bin_sc_rollup_client/dune index 02a28d1355a5..b49bfeee94d5 100644 --- a/src/proto_018_Proxford/bin_sc_rollup_client/dune +++ b/src/proto_018_Proxford/bin_sc_rollup_client/dune @@ -7,8 +7,8 @@ (package octez-smart-rollup-client-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-018-Proxford.protocol octez_smart_rollup_client_Proxford tezos-version.value) diff --git a/src/proto_018_Proxford/bin_sc_rollup_node/dune b/src/proto_018_Proxford/bin_sc_rollup_node/dune index 1080a3e2e71a..7b81868f723d 100644 --- a/src/proto_018_Proxford/bin_sc_rollup_node/dune +++ b/src/proto_018_Proxford/bin_sc_rollup_node/dune @@ -7,8 +7,8 @@ (package octez-smart-rollup-node-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-018-Proxford.protocol octez-shell-libs.shell-services octez-shell-libs.client-base diff --git a/src/proto_018_Proxford/lib_benchmark/dune b/src/proto_018_Proxford/lib_benchmark/dune index eef75ef96d5a..61fd6ccb54e4 100644 --- a/src/proto_018_Proxford/lib_benchmark/dune +++ b/src/proto_018_Proxford/lib_benchmark/dune @@ -5,15 +5,15 @@ (name tezos_benchmark_018_Proxford) (public_name tezos-benchmark-018-Proxford) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-base - octez-libs.tezos-error-monad - octez-libs.tezos-micheline + octez-libs.stdlib + octez-libs.base + octez-libs.error-monad + octez-libs.micheline tezos-micheline-rewriting tezos-benchmark tezos-benchmark-type-inference-018-Proxford tezos-protocol-018-Proxford.protocol - octez-libs.tezos-crypto + octez-libs.crypto tezos-protocol-018-Proxford.parameters hashcons octez-protocol-018-Proxford-libs.test-helpers diff --git a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune index 88055e078e4b..fa054e65fa4f 100644 --- a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/dune @@ -6,10 +6,10 @@ (public_name tezos-benchmark-type-inference-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-error-monad - octez-libs.tezos-crypto - octez-libs.tezos-micheline + octez-libs.stdlib + octez-libs.error-monad + octez-libs.crypto + octez-libs.micheline tezos-micheline-rewriting tezos-protocol-018-Proxford.protocol hashcons) diff --git a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune index fff654746e88..2a04d734a0e9 100644 --- a/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_018_Proxford/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,11 +4,11 @@ (executables (names test_uf test_inference) (libraries - octez-libs.tezos-micheline + octez-libs.micheline tezos-micheline-rewriting tezos-benchmark-type-inference-018-Proxford tezos-protocol-018-Proxford.protocol - octez-libs.tezos-error-monad + octez-libs.error-monad octez-protocol-018-Proxford-libs.client) (link_flags (:standard) diff --git a/src/proto_018_Proxford/lib_benchmark/test/dune b/src/proto_018_Proxford/lib_benchmark/test/dune index 9209044a60be..7f68a26fbb8d 100644 --- a/src/proto_018_Proxford/lib_benchmark/test/dune +++ b/src/proto_018_Proxford/lib_benchmark/test/dune @@ -8,15 +8,15 @@ test_autocompletion test_distribution) (libraries - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline tezos-micheline-rewriting tezos-protocol-018-Proxford.protocol tezos-benchmark tezos-benchmark-type-inference-018-Proxford tezos-benchmark-018-Proxford octez-protocol-018-Proxford-libs.test-helpers - octez-libs.tezos-error-monad + octez-libs.error-monad prbnmcn-stats) (link_flags (:standard) diff --git a/src/proto_018_Proxford/lib_benchmarks_proto/dune b/src/proto_018_Proxford/lib_benchmarks_proto/dune index 04d0a41cba7f..163e759cf567 100644 --- a/src/proto_018_Proxford/lib_benchmarks_proto/dune +++ b/src/proto_018_Proxford/lib_benchmarks_proto/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries str - octez-libs.tezos-stdlib - octez-libs.tezos-base - octez-libs.tezos-error-monad + octez-libs.stdlib + octez-libs.base + octez-libs.error-monad tezos-protocol-018-Proxford.parameters - octez-libs.tezos-lazy-containers + octez-libs.lazy-containers tezos-benchmark tezos-benchmark-018-Proxford tezos-benchmark-type-inference-018-Proxford tezos-protocol-018-Proxford.protocol - octez-libs.tezos-crypto + octez-libs.crypto octez-shell-libs.shell-benchmarks - octez-libs.tezos-micheline + octez-libs.micheline octez-protocol-018-Proxford-libs.test-helpers octez-libs.tezos-sapling octez-protocol-018-Proxford-libs.client diff --git a/src/proto_018_Proxford/lib_client/dune b/src/proto_018_Proxford/lib_client/dune index 45a8c3a13af6..65f6483fd28f 100644 --- a/src/proto_018_Proxford/lib_client/dune +++ b/src/proto_018_Proxford/lib_client/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-018-Proxford-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-018-Proxford.protocol @@ -17,7 +17,7 @@ octez-shell-libs.signer-backends octez-protocol-018-Proxford-libs.plugin tezos-protocol-018-Proxford.parameters - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-018-Proxford-libs.smart-rollup uri) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_018_Proxford/lib_client/test/dune b/src/proto_018_Proxford/lib_client/test/dune index 0ea90f01b368..cf3d21a888f4 100644 --- a/src/proto_018_Proxford/lib_client/test/dune +++ b/src/proto_018_Proxford/lib_client/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline octez-protocol-018-Proxford-libs.client tezos-protocol-018-Proxford.protocol - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base-test-helpers + octez-libs.test-helpers octez-alcotezt qcheck-alcotest) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_client_commands/dune b/src/proto_018_Proxford/lib_client_commands/dune index 83ee76460af5..46e40828ab13 100644 --- a/src/proto_018_Proxford/lib_client_commands/dune +++ b/src/proto_018_Proxford/lib_client_commands/dune @@ -6,11 +6,11 @@ (public_name octez-protocol-018-Proxford-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-018-Proxford.protocol tezos-protocol-018-Proxford.parameters - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.mockup @@ -19,7 +19,7 @@ octez-shell-libs.client-base octez-protocol-018-Proxford-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-018-Proxford-libs.plugin uri) @@ -43,8 +43,8 @@ (public_name octez-protocol-018-Proxford-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-018-Proxford.protocol tezos-protocol-018-Proxford.parameters octez-proto-libs.protocol-environment @@ -54,7 +54,7 @@ octez-shell-libs.client-commands octez-protocol-018-Proxford-libs.client.commands octez-protocol-018-Proxford-libs.client.sapling - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-018-Proxford-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_client_sapling/dune b/src/proto_018_Proxford/lib_client_sapling/dune index 074f045138a9..fe9ef21b2f08 100644 --- a/src/proto_018_Proxford/lib_client_sapling/dune +++ b/src/proto_018_Proxford/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-018-Proxford-libs.client.sapling) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-crypto - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.clic + octez-libs.crypto + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.signer-backends octez-protocol-018-Proxford-libs.client diff --git a/src/proto_018_Proxford/lib_dac_plugin/dune b/src/proto_018_Proxford/lib_dac_plugin/dune index 7a4ff987954b..ded1d87d6d7c 100644 --- a/src/proto_018_Proxford/lib_dac_plugin/dune +++ b/src/proto_018_Proxford/lib_dac_plugin/dune @@ -6,9 +6,9 @@ (public_name octez-protocol-018-Proxford-libs.dac) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-protocol-compiler.registerer - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-dac-lib tezos-dac-client-lib octez-protocol-018-Proxford-libs.client diff --git a/src/proto_018_Proxford/lib_dac_plugin/test/dune b/src/proto_018_Proxford/lib_dac_plugin/test/dune index 128d320cffa4..39c0dc7929e6 100644 --- a/src/proto_018_Proxford/lib_dac_plugin/test/dune +++ b/src/proto_018_Proxford/lib_dac_plugin/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base octez-protocol-018-Proxford-libs.dac tezos-protocol-018-Proxford.protocol - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-018-Proxford-libs.test-helpers tezos-dac-lib tezos_dac_node_lib diff --git a/src/proto_018_Proxford/lib_dal/dune b/src/proto_018_Proxford/lib_dal/dune index 0ca68b518f96..eb98552288df 100644 --- a/src/proto_018_Proxford/lib_dal/dune +++ b/src/proto_018_Proxford/lib_dal/dune @@ -6,9 +6,9 @@ (public_name octez-protocol-018-Proxford-libs.dal) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-protocol-compiler.registerer - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-dal-node-lib octez-protocol-018-Proxford-libs.client octez-protocol-018-Proxford-libs.plugin diff --git a/src/proto_018_Proxford/lib_dal/test/dune b/src/proto_018_Proxford/lib_dal/test/dune index 5488983cc211..af23d1979a74 100644 --- a/src/proto_018_Proxford/lib_dal/test/dune +++ b/src/proto_018_Proxford/lib_dal/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base octez-protocol-018-Proxford-libs.dal tezos-protocol-018-Proxford.protocol - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-018-Proxford-libs.test-helpers octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_delegate/dune b/src/proto_018_Proxford/lib_delegate/dune index 1c0fb116e508..16f46cede2ee 100644 --- a/src/proto_018_Proxford/lib_delegate/dune +++ b/src/proto_018_Proxford/lib_delegate/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-018-Proxford-libs.baking) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-version.value tezos-protocol-018-Proxford.protocol tezos-protocol-018-Proxford.protocol.lifted @@ -17,15 +17,15 @@ octez-shell-libs.client-base octez-protocol-018-Proxford-libs.client octez-shell-libs.client-commands - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix + octez-libs.stdlib + octez-libs.stdlib-unix octez-shell-libs.shell-context octez-libs.tezos-context octez-libs.tezos-context.memory - octez-libs.tezos-rpc-http-client-unix + octez-libs.rpc-http-client-unix octez-shell-libs.context-ops - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http + octez-libs.rpc + octez-libs.rpc-http tezos-dal-node-services lwt-canceler lwt-exit @@ -55,17 +55,17 @@ (public_name octez-protocol-018-Proxford-libs.baking-commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol tezos-protocol-018-Proxford.parameters - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-018-Proxford-libs.client octez-shell-libs.client-commands octez-protocol-018-Proxford-libs.baking - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags @@ -87,7 +87,7 @@ (public_name octez-protocol-018-Proxford-libs.baking-commands.registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -96,7 +96,7 @@ octez-shell-libs.client-commands octez-protocol-018-Proxford-libs.baking octez-protocol-018-Proxford-libs.baking-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_delegate/test/dune b/src/proto_018_Proxford/lib_delegate/test/dune index f00f55bed7a7..9592462fe11f 100644 --- a/src/proto_018_Proxford/lib_delegate/test/dune +++ b/src/proto_018_Proxford/lib_delegate/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline octez-protocol-018-Proxford-libs.client tezos-protocol-018-Proxford.protocol - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-018-Proxford-libs.bakings.mockup-simulator octez-protocol-018-Proxford-libs.baking tezos-protocol-018-Proxford.parameters - octez-libs.tezos-crypto + octez-libs.crypto octez-alcotezt uri) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune index a5839f39619e..1c5fa661b8b5 100644 --- a/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_018_Proxford/lib_delegate/test/mockup_simulator/dune @@ -5,12 +5,12 @@ (name tezos_018_Proxford_mockup_simulator) (public_name octez-protocol-018-Proxford-libs.bakings.mockup-simulator) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.client octez-shell-libs.client-commands octez-protocol-018-Proxford-libs.baking - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base-unix tezos-protocol-018-Proxford.parameters octez-shell-libs.mockup diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune index 47f7fb326a82..fd56861d0e8f 100644 --- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune +++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.client-base octez-protocol-018-Proxford-libs.client tezos-protocol-018-Proxford.protocol diff --git a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune index b6a6b6de4123..ec43497d8aaa 100644 --- a/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_018_Proxford/lib_delegate/test/tenderbrute/lib/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-018-Proxford-libs.baking.tenderbrute) (libraries data-encoding - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix tezos-protocol-018-Proxford.protocol octez-shell-libs.client-base octez-protocol-018-Proxford-libs.client) diff --git a/src/proto_018_Proxford/lib_injector/dune b/src/proto_018_Proxford/lib_injector/dune index 830dd853eb01..d56beda14fa6 100644 --- a/src/proto_018_Proxford/lib_injector/dune +++ b/src/proto_018_Proxford/lib_injector/dune @@ -6,7 +6,7 @@ (package tezos-injector-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-injector octez-protocol-018-Proxford-libs.client diff --git a/src/proto_018_Proxford/lib_layer2_utils/dune b/src/proto_018_Proxford/lib_layer2_utils/dune index f34528937a23..7e3c36c244bc 100644 --- a/src/proto_018_Proxford/lib_layer2_utils/dune +++ b/src/proto_018_Proxford/lib_layer2_utils/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-018-Proxford-libs.layer2-utils) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.client) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_018_Proxford/lib_parameters/dune b/src/proto_018_Proxford/lib_parameters/dune index b2bf8a963a69..0d0b29f3cab6 100644 --- a/src/proto_018_Proxford/lib_parameters/dune +++ b/src/proto_018_Proxford/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-018-Proxford.parameters) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment tezos-protocol-018-Proxford.protocol) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.parameters tezos-protocol-018-Proxford.protocol) (link_flags diff --git a/src/proto_018_Proxford/lib_plugin/dune b/src/proto_018_Proxford/lib_plugin/dune index 4fd45199f2d6..30da5983b8cc 100644 --- a/src/proto_018_Proxford/lib_plugin/dune +++ b/src/proto_018_Proxford/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-018-Proxford-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.smart-rollup) (flags @@ -24,7 +24,7 @@ (public_name octez-protocol-018-Proxford-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.embedded-protocol octez-protocol-018-Proxford-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_018_Proxford/lib_plugin/test/dune b/src/proto_018_Proxford/lib_plugin/test/dune index 8ff3303f45f3..886f3c54156f 100644 --- a/src/proto_018_Proxford/lib_plugin/test/dune +++ b/src/proto_018_Proxford/lib_plugin/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base-test-helpers - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base-test-helpers + octez-libs.base.unix octez-alcotezt - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest - octez-libs.tezos-stdlib-unix - octez-libs.tezos-micheline + octez-libs.stdlib-unix + octez-libs.micheline octez-protocol-018-Proxford-libs.plugin tezos-protocol-018-Proxford.protocol tezos-protocol-018-Proxford.parameters diff --git a/src/proto_018_Proxford/lib_protocol/test/helpers/dune b/src/proto_018_Proxford/lib_protocol/test/helpers/dune index 31e99148acc6..729f3cf127e8 100644 --- a/src/proto_018_Proxford/lib_protocol/test/helpers/dune +++ b/src/proto_018_Proxford/lib_protocol/test/helpers/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries qcheck-alcotest - octez-libs.tezos-test-helpers - octez-libs.tezos-base - octez-libs.tezos-micheline - octez-libs.tezos-stdlib-unix + octez-libs.test-helpers + octez-libs.base + octez-libs.micheline + octez-libs.stdlib-unix tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.client tezos-protocol-018-Proxford.parameters octez-proto-libs.protocol-environment octez-protocol-018-Proxford-libs.plugin octez-shell-libs.shell-services - octez-libs.octez-plompiler - octez-libs.tezos-crypto-dal + octez-libs.plompiler + octez-libs.crypto-dal octez-protocol-018-Proxford-libs.smart-rollup) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune b/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune index e12c18bb6b72..b10afc56f17c 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/consensus/dune @@ -8,10 +8,10 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers tezos-protocol-018-Proxford.parameters octez-protocol-018-Proxford-libs.plugin) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/dune b/src/proto_018_Proxford/lib_protocol/test/integration/dune index f1b6cec7d044..893747e0eed4 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/dune @@ -9,12 +9,12 @@ tezt octez-libs.tezos-context octez-alcotezt - octez-libs.tezos-base + octez-libs.base octez-protocol-018-Proxford-libs.client tezos-protocol-018-Proxford.protocol tezos-protocol-018-Proxford.parameters octez-protocol-018-Proxford-libs.test-helpers - octez-libs.tezos-base-test-helpers) + octez-libs.base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune b/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune index 7c2bff8f7485..7472d111a548 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/gas/dune @@ -7,10 +7,10 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.test-helpers - octez-libs.tezos-base-test-helpers) + octez-libs.base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune b/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune index de9bc1997827..011943b55174 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/michelson/dune @@ -8,13 +8,13 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-018-Proxford-libs.client tezos-benchmark - octez-libs.tezos-micheline + octez-libs.micheline tezos-benchmark-018-Proxford tezos-benchmark-type-inference-018-Proxford octez-protocol-018-Proxford-libs.plugin diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune b/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune index 14f25b567add..7043c95dd70e 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/operations/dune @@ -8,11 +8,11 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.client octez-protocol-018-Proxford-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-018-Proxford-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune b/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune index bd54ce916f83..515d3a51b650 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune @@ -7,13 +7,13 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol qcheck-alcotest octez-protocol-018-Proxford-libs.client - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-018-Proxford-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-018-Proxford-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_protocol/test/pbt/dune b/src/proto_018_Proxford/lib_protocol/test/pbt/dune index 0f1c9c9fe271..e9b47600f162 100644 --- a/src/proto_018_Proxford/lib_protocol/test/pbt/dune +++ b/src/proto_018_Proxford/lib_protocol/test/pbt/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline octez-protocol-018-Proxford-libs.client tezos-protocol-018-Proxford.protocol octez-libs.tezos-context.merkle_proof_encoding - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-018-Proxford-libs.test-helpers octez-alcotezt qcheck-alcotest @@ -19,8 +19,8 @@ tezos-benchmark-018-Proxford tezos-benchmark-type-inference-018-Proxford octez-protocol-018-Proxford-libs.smart-rollup - octez-libs.tezos-crypto-dal - octez-libs.tezos-base-test-helpers + octez-libs.crypto-dal + octez-libs.base-test-helpers tezos-protocol-018-Proxford.parameters) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_protocol/test/regression/dune b/src/proto_018_Proxford/lib_protocol/test/regression/dune index 8cb50084545d..71310e28f083 100644 --- a/src/proto_018_Proxford/lib_protocol/test/regression/dune +++ b/src/proto_018_Proxford/lib_protocol/test/regression/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base tezt-tezos tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.client octez-protocol-018-Proxford-libs.plugin octez-protocol-018-Proxford-libs.test-helpers - octez-libs.tezos-micheline) + octez-libs.micheline) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_protocol/test/unit/dune b/src/proto_018_Proxford/lib_protocol/test/unit/dune index bc55798fe2d0..6c23b6e365ea 100644 --- a/src/proto_018_Proxford/lib_protocol/test/unit/dune +++ b/src/proto_018_Proxford/lib_protocol/test/unit/dune @@ -6,21 +6,21 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base-test-helpers - octez-libs.tezos-micheline + octez-libs.base + octez-libs.base-test-helpers + octez-libs.micheline octez-protocol-018-Proxford-libs.client octez-shell-libs.client-base tezos-protocol-018-Proxford.parameters octez-proto-libs.protocol-environment - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-protocol-018-Proxford.protocol - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-018-Proxford-libs.test-helpers octez-alcotezt octez-l2-libs.scoru-wasm-helpers - octez-libs.tezos-stdlib - octez-libs.tezos-crypto-dal + octez-libs.stdlib + octez-libs.crypto-dal octez-l2-libs.scoru-wasm octez-l2-libs.webassembly-interpreter-extra) (library_flags (:standard -linkall)) diff --git a/src/proto_018_Proxford/lib_sc_rollup/dune b/src/proto_018_Proxford/lib_sc_rollup/dune index 9004fa547921..e44a1e478851 100644 --- a/src/proto_018_Proxford/lib_sc_rollup/dune +++ b/src/proto_018_Proxford/lib_sc_rollup/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-018-Proxford-libs.smart-rollup) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_018_Proxford/lib_sc_rollup_client/dune b/src/proto_018_Proxford/lib_sc_rollup_client/dune index 738f64ea1520..f32627ccc370 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_client/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_client/dune @@ -6,7 +6,7 @@ (package octez-smart-rollup-client-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-shell-libs.client-commands octez-shell-libs.client-base diff --git a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune index 1226c858663e..c2c79c69254f 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_layer2/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_layer2/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-018-Proxford-libs.smart-rollup-layer2) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol octez-injector octez-l2-libs.smart-rollup) diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dune b/src/proto_018_Proxford/lib_sc_rollup_node/dune index 145d06f525fa..c9da186bec63 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/dune @@ -6,8 +6,8 @@ (package octez-smart-rollup-node-Proxford) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.client-base-unix octez-protocol-018-Proxford-libs.client @@ -16,9 +16,9 @@ tezos-protocol-018-Proxford.protocol octez-protocol-018-Proxford-libs.plugin tezos-protocol-018-Proxford.parameters - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server + octez-libs.rpc + octez-libs.rpc-http + octez-libs.rpc-http-server octez-libs.tezos-workers tezos-dal-node-services tezos-dal-node-lib @@ -32,7 +32,7 @@ octez-protocol-018-Proxford-libs.layer2-utils octez-l2-libs.layer2_store octez-crawler - octez-libs.tezos-tree-encoding + octez-libs.tree-encoding data-encoding irmin-pack irmin-pack.unix @@ -43,7 +43,7 @@ octez-smart-rollup-node-lib octez-l2-libs.scoru-wasm octez-l2-libs.scoru-wasm-fast - octez-libs.tezos-crypto-dal + octez-libs.crypto-dal tezos-version.value) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/test/dune b/src/proto_018_Proxford/lib_sc_rollup_node/test/dune index 4bf5fbaf39e5..f70ef478ef8a 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/test/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/test/dune @@ -6,9 +6,9 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-018-Proxford-libs.smart-rollup-layer2 octez_smart_rollup_node_Proxford octez-alcotezt diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune b/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune index e3d43c108b50..19d29f9b9e63 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/test/helpers/dune @@ -6,11 +6,11 @@ (package tezos-sc-rollup-node-test) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-018-Proxford.protocol tezos-protocol-018-Proxford.parameters octez-protocol-018-Proxford-libs.client - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest qcheck-core logs.lwt diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index be67e2e1a50c..b6adb507effd 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -7,13 +7,13 @@ (package octez-accuser-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-alpha.protocol octez-protocol-alpha-libs.client octez-shell-libs.client-commands octez-protocol-alpha-libs.baking-commands - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base-unix) (link_flags (:standard) diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index 42dd08f00edc..2dbb38c7985f 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -7,13 +7,13 @@ (package octez-baker-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-alpha.protocol octez-protocol-alpha-libs.client octez-shell-libs.client-commands octez-protocol-alpha-libs.baking-commands - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base-unix) (link_flags (:standard) diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index 655570786ebe..a6e606514563 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -7,8 +7,8 @@ (package octez-smart-rollup-client-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-alpha.protocol octez_smart_rollup_client_alpha tezos-version.value) diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 4101766332f8..55d58ea9bf86 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -7,8 +7,8 @@ (package octez-smart-rollup-node-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-alpha.protocol octez-shell-libs.shell-services octez-shell-libs.client-base diff --git a/src/proto_alpha/lib_benchmark/dune b/src/proto_alpha/lib_benchmark/dune index 71f458abdf4a..779055963c12 100644 --- a/src/proto_alpha/lib_benchmark/dune +++ b/src/proto_alpha/lib_benchmark/dune @@ -5,15 +5,15 @@ (name tezos_benchmark_alpha) (public_name tezos-benchmark-alpha) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-base - octez-libs.tezos-error-monad - octez-libs.tezos-micheline + octez-libs.stdlib + octez-libs.base + octez-libs.error-monad + octez-libs.micheline tezos-micheline-rewriting tezos-benchmark tezos-benchmark-type-inference-alpha tezos-protocol-alpha.protocol - octez-libs.tezos-crypto + octez-libs.crypto tezos-protocol-alpha.parameters hashcons octez-protocol-alpha-libs.test-helpers diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune index b52bc76ca32a..08a40ecc2f85 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/dune @@ -6,10 +6,10 @@ (public_name tezos-benchmark-type-inference-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-stdlib - octez-libs.tezos-error-monad - octez-libs.tezos-crypto - octez-libs.tezos-micheline + octez-libs.stdlib + octez-libs.error-monad + octez-libs.crypto + octez-libs.micheline tezos-micheline-rewriting tezos-protocol-alpha.protocol hashcons) diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune index 153e2d2b196c..72649aa12549 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -4,11 +4,11 @@ (executables (names test_uf test_inference) (libraries - octez-libs.tezos-micheline + octez-libs.micheline tezos-micheline-rewriting tezos-benchmark-type-inference-alpha tezos-protocol-alpha.protocol - octez-libs.tezos-error-monad + octez-libs.error-monad octez-protocol-alpha-libs.client) (link_flags (:standard) diff --git a/src/proto_alpha/lib_benchmark/test/dune b/src/proto_alpha/lib_benchmark/test/dune index 34a15eae98bf..43bedd84fd39 100644 --- a/src/proto_alpha/lib_benchmark/test/dune +++ b/src/proto_alpha/lib_benchmark/test/dune @@ -8,15 +8,15 @@ test_autocompletion test_distribution) (libraries - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline tezos-micheline-rewriting tezos-protocol-alpha.protocol tezos-benchmark tezos-benchmark-type-inference-alpha tezos-benchmark-alpha octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-error-monad + octez-libs.error-monad prbnmcn-stats) (link_flags (:standard) diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune index 04b3f1db3b88..885a8c32c538 100644 --- a/src/proto_alpha/lib_benchmarks_proto/dune +++ b/src/proto_alpha/lib_benchmarks_proto/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries str - octez-libs.tezos-stdlib - octez-libs.tezos-base - octez-libs.tezos-error-monad + octez-libs.stdlib + octez-libs.base + octez-libs.error-monad tezos-protocol-alpha.parameters - octez-libs.tezos-lazy-containers + octez-libs.lazy-containers tezos-benchmark tezos-benchmark-alpha tezos-benchmark-type-inference-alpha tezos-protocol-alpha.protocol - octez-libs.tezos-crypto + octez-libs.crypto octez-shell-libs.shell-benchmarks - octez-libs.tezos-micheline + octez-libs.micheline octez-protocol-alpha-libs.test-helpers octez-libs.tezos-sapling octez-protocol-alpha-libs.client diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index 325299dc1f24..d0e32ae4fd90 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-alpha-libs.client) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic octez-shell-libs.shell-services octez-shell-libs.client-base tezos-protocol-alpha.protocol @@ -17,7 +17,7 @@ octez-shell-libs.signer-backends octez-protocol-alpha-libs.plugin tezos-protocol-alpha.parameters - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-alpha-libs.smart-rollup uri) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune index b6380f653cb9..2cfc5ddf053c 100644 --- a/src/proto_alpha/lib_client/test/dune +++ b/src/proto_alpha/lib_client/test/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline octez-protocol-alpha-libs.client tezos-protocol-alpha.protocol - octez-libs.tezos-base-test-helpers - octez-libs.tezos-test-helpers + octez-libs.base-test-helpers + octez-libs.test-helpers octez-alcotezt qcheck-alcotest) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index 35e4c2b6a863..726fbd533057 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -6,11 +6,11 @@ (public_name octez-protocol-alpha-libs.client.commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-alpha.protocol tezos-protocol-alpha.parameters - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.mockup @@ -19,7 +19,7 @@ octez-shell-libs.client-base octez-protocol-alpha-libs.client octez-shell-libs.client-commands - octez-libs.tezos-rpc + octez-libs.rpc octez-shell-libs.client-base-unix octez-protocol-alpha-libs.plugin uri) @@ -43,8 +43,8 @@ (public_name octez-protocol-alpha-libs.client.commands-registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-protocol-alpha.protocol tezos-protocol-alpha.parameters octez-proto-libs.protocol-environment @@ -54,7 +54,7 @@ octez-shell-libs.client-commands octez-protocol-alpha-libs.client.commands octez-protocol-alpha-libs.client.sapling - octez-libs.tezos-rpc + octez-libs.rpc octez-protocol-alpha-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune index 075deba871ea..bd7bbeb53eaa 100644 --- a/src/proto_alpha/lib_client_sapling/dune +++ b/src/proto_alpha/lib_client_sapling/dune @@ -6,10 +6,10 @@ (public_name octez-protocol-alpha-libs.client.sapling) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic - octez-libs.tezos-crypto - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.clic + octez-libs.crypto + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.signer-backends octez-protocol-alpha-libs.client diff --git a/src/proto_alpha/lib_dac_plugin/dune b/src/proto_alpha/lib_dac_plugin/dune index 4cff67786069..e2e669d4b716 100644 --- a/src/proto_alpha/lib_dac_plugin/dune +++ b/src/proto_alpha/lib_dac_plugin/dune @@ -6,9 +6,9 @@ (public_name octez-protocol-alpha-libs.dac) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-protocol-compiler.registerer - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-dac-lib tezos-dac-client-lib octez-protocol-alpha-libs.client diff --git a/src/proto_alpha/lib_dac_plugin/test/dune b/src/proto_alpha/lib_dac_plugin/test/dune index 312ca91315bd..291f31ef78f8 100644 --- a/src/proto_alpha/lib_dac_plugin/test/dune +++ b/src/proto_alpha/lib_dac_plugin/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base octez-protocol-alpha-libs.dac tezos-protocol-alpha.protocol - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-alpha-libs.test-helpers tezos-dac-lib tezos_dac_node_lib diff --git a/src/proto_alpha/lib_dal/dune b/src/proto_alpha/lib_dal/dune index 070daac7096f..11bf919a9d5f 100644 --- a/src/proto_alpha/lib_dal/dune +++ b/src/proto_alpha/lib_dal/dune @@ -6,9 +6,9 @@ (public_name octez-protocol-alpha-libs.dal) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-protocol-compiler.registerer - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-dal-node-lib octez-protocol-alpha-libs.client octez-protocol-alpha-libs.plugin diff --git a/src/proto_alpha/lib_dal/test/dune b/src/proto_alpha/lib_dal/test/dune index b517412caaed..3465ab5f9c7e 100644 --- a/src/proto_alpha/lib_dal/test/dune +++ b/src/proto_alpha/lib_dal/test/dune @@ -6,10 +6,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base octez-protocol-alpha-libs.dal tezos-protocol-alpha.protocol - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-alpha-libs.test-helpers octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index ce6ab2f3d800..b0b3aa6113d0 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-alpha-libs.baking) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-clic + octez-libs.base + octez-libs.clic tezos-version.value tezos-protocol-alpha.protocol tezos-protocol-alpha.protocol.lifted @@ -17,15 +17,15 @@ octez-shell-libs.client-base octez-protocol-alpha-libs.client octez-shell-libs.client-commands - octez-libs.tezos-stdlib - octez-libs.tezos-stdlib-unix + octez-libs.stdlib + octez-libs.stdlib-unix octez-shell-libs.shell-context octez-libs.tezos-context octez-libs.tezos-context.memory - octez-libs.tezos-rpc-http-client-unix + octez-libs.rpc-http-client-unix octez-shell-libs.context-ops - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http + octez-libs.rpc + octez-libs.rpc-http tezos-dal-node-services lwt-canceler lwt-exit @@ -55,17 +55,17 @@ (public_name octez-protocol-alpha-libs.baking-commands) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol tezos-protocol-alpha.parameters - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-proto-libs.protocol-environment octez-shell-libs.shell-services octez-shell-libs.client-base octez-protocol-alpha-libs.client octez-shell-libs.client-commands octez-protocol-alpha-libs.baking - octez-libs.tezos-rpc + octez-libs.rpc uri) (library_flags (:standard -linkall)) (flags @@ -87,7 +87,7 @@ (public_name octez-protocol-alpha-libs.baking-commands.registration) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-proto-libs.protocol-environment octez-shell-libs.shell-services @@ -96,7 +96,7 @@ octez-shell-libs.client-commands octez-protocol-alpha-libs.baking octez-protocol-alpha-libs.baking-commands - octez-libs.tezos-rpc) + octez-libs.rpc) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune index 1db8ec49b87f..b3e26a7ee53d 100644 --- a/src/proto_alpha/lib_delegate/test/dune +++ b/src/proto_alpha/lib_delegate/test/dune @@ -6,15 +6,15 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline octez-protocol-alpha-libs.client tezos-protocol-alpha.protocol - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-alpha-libs.bakings.mockup-simulator octez-protocol-alpha-libs.baking tezos-protocol-alpha.parameters - octez-libs.tezos-crypto + octez-libs.crypto octez-alcotezt uri) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune index 235c8648dcb9..38debd56560b 100644 --- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune @@ -5,12 +5,12 @@ (name tezos_alpha_mockup_simulator) (public_name octez-protocol-alpha-libs.bakings.mockup-simulator) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-protocol-alpha-libs.client octez-shell-libs.client-commands octez-protocol-alpha-libs.baking - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix octez-shell-libs.client-base-unix tezos-protocol-alpha.parameters octez-shell-libs.mockup diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune index 9108138ca980..2209135c6097 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune @@ -4,7 +4,7 @@ (executable (name tenderbrute_main) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.client-base octez-protocol-alpha-libs.client tezos-protocol-alpha.protocol diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune index 68e7c297e725..f2790a68555d 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/lib/dune @@ -6,8 +6,8 @@ (public_name octez-protocol-alpha-libs.baking.tenderbrute) (libraries data-encoding - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base.unix tezos-protocol-alpha.protocol octez-shell-libs.client-base octez-protocol-alpha-libs.client) diff --git a/src/proto_alpha/lib_injector/dune b/src/proto_alpha/lib_injector/dune index 48cc0bdb3b72..5d09216ad2ee 100644 --- a/src/proto_alpha/lib_injector/dune +++ b/src/proto_alpha/lib_injector/dune @@ -6,7 +6,7 @@ (package tezos-injector-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-injector octez-protocol-alpha-libs.client diff --git a/src/proto_alpha/lib_layer2_utils/dune b/src/proto_alpha/lib_layer2_utils/dune index 486b5a32ddf7..ada5df3d6d20 100644 --- a/src/proto_alpha/lib_layer2_utils/dune +++ b/src/proto_alpha/lib_layer2_utils/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-alpha-libs.layer2-utils) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-protocol-alpha-libs.client) (inline_tests (flags -verbose) (modes native)) diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index ec15c6c28fd8..2ad55ddb06ff 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-alpha.parameters) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-proto-libs.protocol-environment tezos-protocol-alpha.protocol) (library_flags (:standard -linkall)) @@ -19,7 +19,7 @@ (executable (name gen) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.parameters tezos-protocol-alpha.protocol) (link_flags diff --git a/src/proto_alpha/lib_plugin/dune b/src/proto_alpha/lib_plugin/dune index acecc2c26e14..cbff20feaaec 100644 --- a/src/proto_alpha/lib_plugin/dune +++ b/src/proto_alpha/lib_plugin/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-alpha-libs.plugin) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-protocol-alpha-libs.smart-rollup) (flags @@ -24,7 +24,7 @@ (public_name octez-protocol-alpha-libs.plugin-registerer) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.embedded-protocol octez-protocol-alpha-libs.plugin octez-shell-libs.validation) diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune index 8b0fa126c93c..28ee77b1c053 100644 --- a/src/proto_alpha/lib_plugin/test/dune +++ b/src/proto_alpha/lib_plugin/test/dune @@ -6,14 +6,14 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base-test-helpers - octez-libs.tezos-base.unix + octez-libs.base + octez-libs.base-test-helpers + octez-libs.base.unix octez-alcotezt - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest - octez-libs.tezos-stdlib-unix - octez-libs.tezos-micheline + octez-libs.stdlib-unix + octez-libs.micheline octez-protocol-alpha-libs.plugin tezos-protocol-alpha.protocol tezos-protocol-alpha.parameters diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index 6b0a294e450e..16c985ec5275 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries qcheck-alcotest - octez-libs.tezos-test-helpers - octez-libs.tezos-base - octez-libs.tezos-micheline - octez-libs.tezos-stdlib-unix + octez-libs.test-helpers + octez-libs.base + octez-libs.micheline + octez-libs.stdlib-unix tezos-protocol-alpha.protocol octez-protocol-alpha-libs.client tezos-protocol-alpha.parameters octez-proto-libs.protocol-environment octez-protocol-alpha-libs.plugin octez-shell-libs.shell-services - octez-libs.octez-plompiler - octez-libs.tezos-crypto-dal + octez-libs.plompiler + octez-libs.crypto-dal octez-protocol-alpha-libs.smart-rollup) (flags (:standard) diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/dune b/src/proto_alpha/lib_protocol/test/integration/consensus/dune index e0feec1ebba5..58cb3de865e3 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune @@ -7,10 +7,10 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers tezos-protocol-alpha.parameters octez-protocol-alpha-libs.plugin) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_protocol/test/integration/dune b/src/proto_alpha/lib_protocol/test/integration/dune index 770e4bf8c215..4aabd1ffd5eb 100644 --- a/src/proto_alpha/lib_protocol/test/integration/dune +++ b/src/proto_alpha/lib_protocol/test/integration/dune @@ -9,12 +9,12 @@ tezt octez-libs.tezos-context octez-alcotezt - octez-libs.tezos-base + octez-libs.base octez-protocol-alpha-libs.client tezos-protocol-alpha.protocol tezos-protocol-alpha.parameters octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-base-test-helpers) + octez-libs.base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/dune b/src/proto_alpha/lib_protocol/test/integration/gas/dune index 9b686ce48dfd..c31ea7ea4862 100644 --- a/src/proto_alpha/lib_protocol/test/integration/gas/dune +++ b/src/proto_alpha/lib_protocol/test/integration/gas/dune @@ -7,10 +7,10 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-base-test-helpers) + octez-libs.base-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/dune b/src/proto_alpha/lib_protocol/test/integration/michelson/dune index db4e951bc257..e30eacc1c520 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune @@ -7,13 +7,13 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-alpha-libs.client tezos-benchmark - octez-libs.tezos-micheline + octez-libs.micheline tezos-benchmark-alpha tezos-benchmark-type-inference-alpha octez-protocol-alpha-libs.plugin diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/dune b/src/proto_alpha/lib_protocol/test/integration/operations/dune index a55af3331cd1..533a21198b9a 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/dune +++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune @@ -7,11 +7,11 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-protocol-alpha-libs.client octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-alpha-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/dune b/src/proto_alpha/lib_protocol/test/integration/validate/dune index 3699e3394b27..9811a7ed5512 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/dune +++ b/src/proto_alpha/lib_protocol/test/integration/validate/dune @@ -7,13 +7,13 @@ (libraries tezt.core octez-alcotezt - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol qcheck-alcotest octez-protocol-alpha-libs.client - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-base-test-helpers + octez-libs.base-test-helpers octez-protocol-alpha-libs.plugin) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune index 3df5b3c9801e..777918e0b539 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/dune +++ b/src/proto_alpha/lib_protocol/test/pbt/dune @@ -6,12 +6,12 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-micheline + octez-libs.base + octez-libs.micheline octez-protocol-alpha-libs.client tezos-protocol-alpha.protocol octez-libs.tezos-context.merkle_proof_encoding - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-alpha-libs.test-helpers octez-alcotezt qcheck-alcotest @@ -19,8 +19,8 @@ tezos-benchmark-alpha tezos-benchmark-type-inference-alpha octez-protocol-alpha-libs.smart-rollup - octez-libs.tezos-crypto-dal - octez-libs.tezos-base-test-helpers + octez-libs.crypto-dal + octez-libs.base-test-helpers tezos-protocol-alpha.parameters) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune index 3d52b0e5c521..27fe83f719cc 100644 --- a/src/proto_alpha/lib_protocol/test/regression/dune +++ b/src/proto_alpha/lib_protocol/test/regression/dune @@ -6,13 +6,13 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base tezt-tezos tezos-protocol-alpha.protocol octez-protocol-alpha-libs.client octez-protocol-alpha-libs.plugin octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-micheline) + octez-libs.micheline) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index f13ae91c8024..4951fe6eb991 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -6,21 +6,21 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base - octez-libs.tezos-base-test-helpers - octez-libs.tezos-micheline + octez-libs.base + octez-libs.base-test-helpers + octez-libs.micheline octez-protocol-alpha-libs.client octez-shell-libs.client-base tezos-protocol-alpha.parameters octez-proto-libs.protocol-environment - octez-libs.tezos-stdlib-unix + octez-libs.stdlib-unix tezos-protocol-alpha.protocol - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-alpha-libs.test-helpers octez-alcotezt octez-l2-libs.scoru-wasm-helpers - octez-libs.tezos-stdlib - octez-libs.tezos-crypto-dal + octez-libs.stdlib + octez-libs.crypto-dal octez-l2-libs.scoru-wasm octez-l2-libs.webassembly-interpreter-extra) (library_flags (:standard -linkall)) diff --git a/src/proto_alpha/lib_sc_rollup/dune b/src/proto_alpha/lib_sc_rollup/dune index 1abba39af89c..f986ffb86cad 100644 --- a/src/proto_alpha/lib_sc_rollup/dune +++ b/src/proto_alpha/lib_sc_rollup/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-alpha-libs.smart-rollup) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect)) diff --git a/src/proto_alpha/lib_sc_rollup_client/dune b/src/proto_alpha/lib_sc_rollup_client/dune index 114680db506a..22f005221e96 100644 --- a/src/proto_alpha/lib_sc_rollup_client/dune +++ b/src/proto_alpha/lib_sc_rollup_client/dune @@ -6,7 +6,7 @@ (package octez-smart-rollup-client-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-shell-libs.client-commands octez-shell-libs.client-base diff --git a/src/proto_alpha/lib_sc_rollup_layer2/dune b/src/proto_alpha/lib_sc_rollup_layer2/dune index 99977729b7c8..78c8f1425700 100644 --- a/src/proto_alpha/lib_sc_rollup_layer2/dune +++ b/src/proto_alpha/lib_sc_rollup_layer2/dune @@ -6,7 +6,7 @@ (public_name octez-protocol-alpha-libs.smart-rollup-layer2) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol octez-injector octez-l2-libs.smart-rollup) diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune index 7af730be9c98..eeb21d1a88f4 100644 --- a/src/proto_alpha/lib_sc_rollup_node/dune +++ b/src/proto_alpha/lib_sc_rollup_node/dune @@ -6,8 +6,8 @@ (package octez-smart-rollup-node-alpha) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.stdlib-unix octez-shell-libs.client-base octez-shell-libs.client-base-unix octez-protocol-alpha-libs.client @@ -16,9 +16,9 @@ tezos-protocol-alpha.protocol octez-protocol-alpha-libs.plugin tezos-protocol-alpha.parameters - octez-libs.tezos-rpc - octez-libs.tezos-rpc-http - octez-libs.tezos-rpc-http-server + octez-libs.rpc + octez-libs.rpc-http + octez-libs.rpc-http-server octez-libs.tezos-workers tezos-dal-node-services tezos-dal-node-lib @@ -32,7 +32,7 @@ octez-protocol-alpha-libs.layer2-utils octez-l2-libs.layer2_store octez-crawler - octez-libs.tezos-tree-encoding + octez-libs.tree-encoding data-encoding irmin-pack irmin-pack.unix @@ -43,7 +43,7 @@ octez-smart-rollup-node-lib octez-l2-libs.scoru-wasm octez-l2-libs.scoru-wasm-fast - octez-libs.tezos-crypto-dal + octez-libs.crypto-dal tezos-version.value) (flags (:standard) diff --git a/src/proto_alpha/lib_sc_rollup_node/test/dune b/src/proto_alpha/lib_sc_rollup_node/test/dune index 891e9db845a8..0546847863be 100644 --- a/src/proto_alpha/lib_sc_rollup_node/test/dune +++ b/src/proto_alpha/lib_sc_rollup_node/test/dune @@ -6,9 +6,9 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol - octez-libs.tezos-test-helpers + octez-libs.test-helpers octez-protocol-alpha-libs.smart-rollup-layer2 octez_smart_rollup_node_alpha octez-alcotezt diff --git a/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune b/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune index d65499798a70..4b3453cff6bb 100644 --- a/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune +++ b/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune @@ -6,11 +6,11 @@ (package tezos-sc-rollup-node-test) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base tezos-protocol-alpha.protocol tezos-protocol-alpha.parameters octez-protocol-alpha-libs.client - octez-libs.tezos-test-helpers + octez-libs.test-helpers qcheck-alcotest qcheck-core logs.lwt diff --git a/src/proto_demo_counter/lib_client/dune b/src/proto_demo_counter/lib_client/dune index 20729f96bb4d..b25adef99a33 100644 --- a/src/proto_demo_counter/lib_client/dune +++ b/src/proto_demo_counter/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-demo-counter) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.shell-services octez-shell-libs.client-base octez-shell-libs.client-commands diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune index 0411d3622deb..e0ba47c56d65 100644 --- a/src/proto_genesis/lib_client/dune +++ b/src/proto_genesis/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-genesis) (instrumentation (backend bisect_ppx)) (libraries - octez-libs.tezos-base + octez-libs.base octez-shell-libs.shell-services octez-shell-libs.client-base octez-proto-libs.protocol-environment @@ -14,7 +14,7 @@ tezos-protocol-genesis.protocol.lifted octez-shell-libs.client-commands octez-shell-libs.proxy - octez-libs.tezos-stdlib-unix) + octez-libs.stdlib-unix) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/tezt/lib_tezos/dune b/tezt/lib_tezos/dune index 8515f72e6f0e..6516b12e82b7 100644 --- a/tezt/lib_tezos/dune +++ b/tezt/lib_tezos/dune @@ -9,9 +9,9 @@ tezt-tezos.tezt-performance-regression uri hex - octez-libs.tezos-crypto-dal - octez-libs.tezos-base - octez-libs.tezos-base.unix + octez-libs.crypto-dal + octez-libs.base + octez-libs.base.unix cohttp-lwt-unix) (flags (:standard) diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index 24c0e6ad258f..485717d0f2fa 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -7,16 +7,16 @@ tezt tezt-tezos tezt-tezos.tezt-performance-regression - octez-libs.tezos-lwt-result-stdlib + octez-libs.lwt-result-stdlib octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-micheline + octez-libs.micheline tezos-openapi tezos-protocol-alpha.protocol qcheck-core tezos-time-measurement data-encoding - octez-libs.tezos-event-logging - octez-libs.tezos-test-helpers) + octez-libs.event-logging + octez-libs.test-helpers) (link_flags (:standard) (:include %{workspace_root}/macos-link-flags.sexp)) diff --git a/tezt/tests/dune b/tezt/tests/dune index 08a6495f6722..b0ea06930db3 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -5,16 +5,16 @@ (name main) (instrumentation (backend bisect_ppx --bisect-sigterm)) (libraries - octez-libs.tezos-test-helpers + octez-libs.test-helpers tezt str bls12-381 tezt-tezos tezt_ethereum data-encoding - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-stdlib-unix + octez-libs.base + octez-libs.base.unix + octez-libs.stdlib-unix tezos-protocol-alpha.protocol tezos_scoru_wasm_regressions tezt_self_tests_tezt_lib -- GitLab From 1f77b5278623d7ed4351bb4bfac9ceb65107f19b Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Tue, 29 Aug 2023 16:12:02 +0200 Subject: [PATCH 2/6] Manifest, Opam: Rename tezos-version to octez-version --- .gitlab/ci/jobs/packaging/opam_package.yml | 16 ++++++++-------- contrib/bin_codec_kaitai/dune | 2 +- dune-project | 2 +- manifest/main.ml | 9 +++++---- opam/octez-codec-kaitai.opam | 2 +- opam/octez-codec.opam | 2 +- opam/octez-evm-proxy-lib-dev.opam | 2 +- opam/octez-evm-proxy-lib-prod.opam | 2 +- opam/octez-evm-proxy.opam | 2 +- opam/octez-node.opam | 2 +- opam/octez-protocol-017-PtNairob-libs.opam | 2 +- opam/octez-protocol-018-Proxford-libs.opam | 2 +- opam/octez-protocol-alpha-libs.opam | 2 +- opam/octez-protocol-compiler.opam | 2 +- opam/octez-proxy-server.opam | 2 +- opam/octez-shell-libs.opam | 2 +- opam/octez-shell-tests.opam | 2 +- opam/octez-smart-rollup-client-Proxford.opam | 2 +- opam/octez-smart-rollup-client-PtNairob.opam | 2 +- opam/octez-smart-rollup-client-alpha.opam | 2 +- opam/octez-smart-rollup-node-Proxford.opam | 2 +- opam/octez-smart-rollup-node-PtNairob.opam | 2 +- opam/octez-smart-rollup-node-alpha.opam | 2 +- opam/octez-smart-rollup-node-lib.opam | 2 +- opam/octez-smart-rollup-wasm-debugger.opam | 2 +- opam/octez-snoop.opam | 2 +- opam/{tezos-version.opam => octez-version.opam} | 0 scripts/test_release_version.sh | 2 +- src/bin_codec/dune | 2 +- src/bin_evm_proxy/dune | 2 +- src/bin_evm_proxy/lib_dev/dune | 2 +- src/bin_evm_proxy/lib_prod/dune | 2 +- src/bin_node/dune | 2 +- src/bin_proxy_server/dune | 2 +- src/bin_snoop/dune | 2 +- src/bin_wasm_debugger/dune | 2 +- src/lib_client_base_unix/dune | 2 +- src/lib_protocol_compiler/bin/dune | 2 +- src/lib_shell/test/dune | 2 +- src/lib_smart_rollup_node/dune | 2 +- src/lib_validation/dune | 2 +- src/lib_version/exe/dune | 6 +++--- src/lib_version/value/dune | 2 +- src/proto_017_PtNairob/bin_sc_rollup_client/dune | 2 +- src/proto_017_PtNairob/lib_delegate/dune | 2 +- src/proto_017_PtNairob/lib_sc_rollup_node/dune | 2 +- src/proto_018_Proxford/bin_sc_rollup_client/dune | 2 +- src/proto_018_Proxford/lib_delegate/dune | 2 +- src/proto_018_Proxford/lib_sc_rollup_node/dune | 2 +- src/proto_alpha/bin_sc_rollup_client/dune | 2 +- src/proto_alpha/lib_delegate/dune | 2 +- src/proto_alpha/lib_sc_rollup_node/dune | 2 +- 52 files changed, 64 insertions(+), 63 deletions(-) rename opam/{tezos-version.opam => octez-version.opam} (100%) diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index b87b40c2c50d..13d7567c8c3b 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -792,6 +792,13 @@ opam:octez-smart-rollup-wasm-debugger: # Ignoring unreleased package octez-testnet-scenarios. +opam:octez-version: + extends: + - .opam_template + - .rules_template__trigger_exec_opam_batch_6 + variables: + package: octez-version + # Ignoring unreleased package octogram. # Ignoring unreleased package scoru-sequencer-test. @@ -1074,7 +1081,7 @@ opam:tezos-protocol-genesis: opam:tezos-proxy-server-config: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-proxy-server-config @@ -1088,13 +1095,6 @@ opam:tezos-proxy-server-config: # Ignoring unreleased package tezos-tree-encoding-test. -opam:tezos-version: - extends: - - .opam_template - - .rules_template__trigger_exec_opam_batch_7 - variables: - package: tezos-version - # Ignoring unreleased package tezt-ethereum. opam:tezt-tezos: diff --git a/contrib/bin_codec_kaitai/dune b/contrib/bin_codec_kaitai/dune index dd0a6cafe156..21a5a6996067 100644 --- a/contrib/bin_codec_kaitai/dune +++ b/contrib/bin_codec_kaitai/dune @@ -18,7 +18,7 @@ octez-libs.stdlib-unix octez-libs.event-logging octez-shell-libs.signer-services - tezos-version.value + octez-version.value (select void_for_linking-octez-protocol-005-PsBabyM1-libs-client from (octez-protocol-005-PsBabyM1-libs.client -> void_for_linking-octez-protocol-005-PsBabyM1-libs-client.empty) (-> void_for_linking-octez-protocol-005-PsBabyM1-libs-client.empty)) diff --git a/dune-project b/dune-project index c8e01f79d131..04ef7a3b6e68 100644 --- a/dune-project +++ b/dune-project @@ -72,6 +72,7 @@ (package (name octez-snoop)) (package (name octez-store-tests)(allow_empty)) (package (name octez-testnet-scenarios)) +(package (name octez-version)) (package (name octogram)) (package (name scoru-sequencer-test)(allow_empty)) (package (name tezos-benchmark)) @@ -135,7 +136,6 @@ (package (name tezos-tooling)) (package (name tezos-tps-evaluation)) (package (name tezos-tree-encoding-test)(allow_empty)) -(package (name tezos-version)) (package (name tezt-ethereum)(allow_empty)) (package (name tezt-tezos)) ; This file was automatically generated, do not edit. diff --git a/manifest/main.ml b/manifest/main.ml index 27e57d8b00cd..3bca02aa5e84 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2267,7 +2267,8 @@ let octez_version = let octez_version_value = public_lib - "tezos-version.value" + "octez-version.value" + ~internal_name:"tezos_version_value" ~path:"src/lib_version/value/" ~synopsis:"Tezos: version value generated from Git" ~deps: @@ -2295,17 +2296,17 @@ let _octez_version_get_git_info = private_exe "get_git_info" ~path:"src/lib_version/exe" - ~opam:"tezos-version" + ~opam:"octez-version" ~deps:[dune_configurator; octez_version_parser] ~modules:["get_git_info"] ~bisect_ppx:No let _octez_print_version_exe = public_exe - "tezos-version" + "octez-version" ~internal_name:"tezos_print_version" ~path:"src/lib_version/exe" - ~opam:"tezos-version" + ~opam:"octez-version" ~deps: [octez_version_value |> open_; octez_version |> open_; octez_base_unix] ~modules:["tezos_print_version"] diff --git a/opam/octez-codec-kaitai.opam b/opam/octez-codec-kaitai.opam index fa31a8f2577f..e2a1cb92d8a5 100644 --- a/opam/octez-codec-kaitai.opam +++ b/opam/octez-codec-kaitai.opam @@ -15,7 +15,7 @@ depends: [ "kaitai" "octez-libs" "octez-shell-libs" - "tezos-version" + "octez-version" ] depopts: [ "octez-protocol-005-PsBabyM1-libs" diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam index d24cde83aab9..53408e0a7dc0 100644 --- a/opam/octez-codec.opam +++ b/opam/octez-codec.opam @@ -13,7 +13,7 @@ depends: [ "data-encoding" { >= "0.7.1" & < "1.0.0" } "octez-libs" "octez-shell-libs" - "tezos-version" + "octez-version" ] depopts: [ "octez-protocol-005-PsBabyM1-libs" diff --git a/opam/octez-evm-proxy-lib-dev.opam b/opam/octez-evm-proxy-lib-dev.opam index 2b5a899bf7c1..834a52f407cf 100644 --- a/opam/octez-evm-proxy-lib-dev.opam +++ b/opam/octez-evm-proxy-lib-dev.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-version" + "octez-version" "lwt-exit" ] build: [ diff --git a/opam/octez-evm-proxy-lib-prod.opam b/opam/octez-evm-proxy-lib-prod.opam index 95d11c6d633a..078ea08cb784 100644 --- a/opam/octez-evm-proxy-lib-prod.opam +++ b/opam/octez-evm-proxy-lib-prod.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-version" + "octez-version" "lwt-exit" ] build: [ diff --git a/opam/octez-evm-proxy.opam b/opam/octez-evm-proxy.opam index 8fe4f4ca598c..28b9bb66c1ad 100644 --- a/opam/octez-evm-proxy.opam +++ b/opam/octez-evm-proxy.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-version" + "octez-version" "octez-evm-proxy-lib-prod" "octez-evm-proxy-lib-dev" ] diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 234191d9855a..75fd9f4e3736 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-version" + "octez-version" "octez-node-config" "octez-shell-libs" "cmdliner" { >= "1.1.0" } diff --git a/opam/octez-protocol-017-PtNairob-libs.opam b/opam/octez-protocol-017-PtNairob-libs.opam index 1a0aee961509..85304b92827d 100644 --- a/opam/octez-protocol-017-PtNairob-libs.opam +++ b/opam/octez-protocol-017-PtNairob-libs.opam @@ -17,7 +17,7 @@ depends: [ "uri" { >= "3.1.0" } "qcheck-alcotest" { >= "0.20" } "octez-proto-libs" - "tezos-version" + "octez-version" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" diff --git a/opam/octez-protocol-018-Proxford-libs.opam b/opam/octez-protocol-018-Proxford-libs.opam index c2bd0cae7742..141aaf6a8b18 100644 --- a/opam/octez-protocol-018-Proxford-libs.opam +++ b/opam/octez-protocol-018-Proxford-libs.opam @@ -17,7 +17,7 @@ depends: [ "uri" { >= "3.1.0" } "qcheck-alcotest" { >= "0.20" } "octez-proto-libs" - "tezos-version" + "octez-version" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" diff --git a/opam/octez-protocol-alpha-libs.opam b/opam/octez-protocol-alpha-libs.opam index 2a4ace9afc76..db00585068bf 100644 --- a/opam/octez-protocol-alpha-libs.opam +++ b/opam/octez-protocol-alpha-libs.opam @@ -17,7 +17,7 @@ depends: [ "uri" { >= "3.1.0" } "qcheck-alcotest" { >= "0.20" } "octez-proto-libs" - "tezos-version" + "octez-version" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam index 47639fa2b1a9..ba57b61b7f65 100644 --- a/opam/octez-protocol-compiler.opam +++ b/opam/octez-protocol-compiler.opam @@ -15,7 +15,7 @@ depends: [ "lwt" { >= "5.7.0" } "ocp-ocamlres" { >= "0.4" } "base-unix" - "tezos-version" + "octez-version" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam index 588e9c14aa5c..5aedb54b7311 100644 --- a/opam/octez-proxy-server.opam +++ b/opam/octez-proxy-server.opam @@ -16,7 +16,7 @@ depends: [ "lwt" { >= "5.7.0" } "octez-shell-libs" "tezos-proxy-server-config" - "tezos-version" + "octez-version" "uri" { >= "3.1.0" } ] depopts: [ diff --git a/opam/octez-shell-libs.opam b/opam/octez-shell-libs.opam index 29ce1430c194..7cd7380b39ce 100644 --- a/opam/octez-shell-libs.opam +++ b/opam/octez-shell-libs.opam @@ -23,7 +23,7 @@ depends: [ "octez-proto-libs" "octez-protocol-compiler" "lwt-exit" - "tezos-version" + "octez-version" "aches-lwt" { >= "1.0.0" } "index" { >= "1.6.0" & < "1.7.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } diff --git a/opam/octez-shell-tests.opam b/opam/octez-shell-tests.opam index cc7a06bf7f9d..96481e8ac823 100644 --- a/opam/octez-shell-tests.opam +++ b/opam/octez-shell-tests.opam @@ -15,7 +15,7 @@ depends: [ "octez-shell-libs" {with-test} "tezos-protocol-demo-noops" {with-test} "octez-alcotezt" {with-test} - "tezos-version" {with-test} + "octez-version" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-client-Proxford.opam b/opam/octez-smart-rollup-client-Proxford.opam index 097722ba7bc8..ec9edb382d0f 100644 --- a/opam/octez-smart-rollup-client-Proxford.opam +++ b/opam/octez-smart-rollup-client-Proxford.opam @@ -15,7 +15,7 @@ depends: [ "octez-shell-libs" "octez-protocol-018-Proxford-libs" "octez-l2-libs" - "tezos-version" + "octez-version" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam index c113de173d7a..3f459b0570e2 100644 --- a/opam/octez-smart-rollup-client-PtNairob.opam +++ b/opam/octez-smart-rollup-client-PtNairob.opam @@ -15,7 +15,7 @@ depends: [ "octez-shell-libs" "octez-protocol-017-PtNairob-libs" "octez-l2-libs" - "tezos-version" + "octez-version" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam index 9ec520f246ea..9ba5b4c0b769 100644 --- a/opam/octez-smart-rollup-client-alpha.opam +++ b/opam/octez-smart-rollup-client-alpha.opam @@ -15,7 +15,7 @@ depends: [ "octez-shell-libs" "octez-protocol-alpha-libs" "octez-l2-libs" - "tezos-version" + "octez-version" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-smart-rollup-node-Proxford.opam b/opam/octez-smart-rollup-node-Proxford.opam index 1f59b4b64d37..017c312681b0 100644 --- a/opam/octez-smart-rollup-node-Proxford.opam +++ b/opam/octez-smart-rollup-node-Proxford.opam @@ -27,7 +27,7 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-version" + "octez-version" ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam index 0f4c469f8deb..587fbd0ea2c7 100644 --- a/opam/octez-smart-rollup-node-PtNairob.opam +++ b/opam/octez-smart-rollup-node-PtNairob.opam @@ -26,7 +26,7 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-version" + "octez-version" ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index 00026c8fc0ab..829f18cbadb1 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -27,7 +27,7 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-version" + "octez-version" ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/octez-smart-rollup-node-lib.opam b/opam/octez-smart-rollup-node-lib.opam index 9a263935f284..9b59b4dd3764 100644 --- a/opam/octez-smart-rollup-node-lib.opam +++ b/opam/octez-smart-rollup-node-lib.opam @@ -19,7 +19,7 @@ depends: [ "tezos-dac-lib" "tezos-dac-client-lib" "octez-injector" - "tezos-version" + "octez-version" "octez-l2-libs" "octez-crawler" ] diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam index d6f50a8b9a46..4481e2ef1efd 100644 --- a/opam/octez-smart-rollup-wasm-debugger.opam +++ b/opam/octez-smart-rollup-wasm-debugger.opam @@ -14,7 +14,7 @@ depends: [ "yaml" { >= "3.1.0" } "octez-protocol-alpha-libs" "octez-l2-libs" - "tezos-version" + "octez-version" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam index d6f5e2fba0e6..97e0b31f50bd 100644 --- a/opam/octez-snoop.opam +++ b/opam/octez-snoop.opam @@ -17,7 +17,7 @@ depends: [ "tezos-benchmarks-proto-alpha" "pyml" "prbnmcn-stats" { = "0.0.6" } - "tezos-version" + "octez-version" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-version.opam b/opam/octez-version.opam similarity index 100% rename from opam/tezos-version.opam rename to opam/octez-version.opam diff --git a/scripts/test_release_version.sh b/scripts/test_release_version.sh index 9f659c18d1a6..29e31b1d05d5 100755 --- a/scripts/test_release_version.sh +++ b/scripts/test_release_version.sh @@ -13,7 +13,7 @@ CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) test_version() { rm -f _build/default/src/lib_version/generated_git_info.ml - res=$(dune exec tezos-version ||:) + res=$(dune exec octez-version ||:) if [ "$res" != "$1" ] then echo "Expected version '$1', got '$res' => FAIL" diff --git a/src/bin_codec/dune b/src/bin_codec/dune index 4d408ee1faba..f9b6ceec1613 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -16,7 +16,7 @@ octez-libs.stdlib-unix octez-libs.event-logging octez-shell-libs.signer-services - tezos-version.value + octez-version.value (select void_for_linking-octez-protocol-005-PsBabyM1-libs-client from (octez-protocol-005-PsBabyM1-libs.client -> void_for_linking-octez-protocol-005-PsBabyM1-libs-client.empty) (-> void_for_linking-octez-protocol-005-PsBabyM1-libs-client.empty)) diff --git a/src/bin_evm_proxy/dune b/src/bin_evm_proxy/dune index 3d667657cad8..4eb96b1d5422 100644 --- a/src/bin_evm_proxy/dune +++ b/src/bin_evm_proxy/dune @@ -12,7 +12,7 @@ octez-libs.clic octez-libs.rpc-http octez-libs.rpc-http-server - tezos-version.value + octez-version.value evm_proxy_lib_prod evm_proxy_lib_dev) (link_flags diff --git a/src/bin_evm_proxy/lib_dev/dune b/src/bin_evm_proxy/lib_dev/dune index 7c246d7eb0a2..ac265c4caafd 100644 --- a/src/bin_evm_proxy/lib_dev/dune +++ b/src/bin_evm_proxy/lib_dev/dune @@ -9,7 +9,7 @@ octez-libs.base octez-libs.rpc-http octez-libs.rpc-http-client-unix - tezos-version.value + octez-version.value lwt-exit) (flags (:standard) diff --git a/src/bin_evm_proxy/lib_prod/dune b/src/bin_evm_proxy/lib_prod/dune index 5794fa585c27..fcb6a2ea3ca5 100644 --- a/src/bin_evm_proxy/lib_prod/dune +++ b/src/bin_evm_proxy/lib_prod/dune @@ -9,7 +9,7 @@ octez-libs.base octez-libs.rpc-http octez-libs.rpc-http-client-unix - tezos-version.value + octez-version.value lwt-exit) (flags (:standard) diff --git a/src/bin_node/dune b/src/bin_node/dune index 284355fa36d1..35956a2d1978 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -10,7 +10,7 @@ octez-libs.base octez-libs.base.unix octez-libs.version - tezos-version.value + octez-version.value octez-node-config octez-libs.stdlib-unix octez-shell-libs.shell-services diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index edd328bbc398..089b1d3eebe6 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -20,7 +20,7 @@ octez-libs.rpc-http-server octez-shell-libs.shell-services octez-shell-libs.shell-context - tezos-version.value + octez-version.value uri (select void_for_linking-tezos-client-genesis from (tezos-client-genesis -> void_for_linking-tezos-client-genesis.empty) diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 347524ebba4f..7eb640525d28 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -18,7 +18,7 @@ str pyml prbnmcn-stats - tezos-version.value) + octez-version.value) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune index 845f686064d0..d693688100c9 100644 --- a/src/bin_wasm_debugger/dune +++ b/src/bin_wasm_debugger/dune @@ -17,7 +17,7 @@ octez-l2-libs.scoru-wasm-helpers octez-l2-libs.webassembly-interpreter octez-l2-libs.webassembly-interpreter-extra - tezos-version.value) + octez-version.value) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index fff76b9def43..5ec17f341bea 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -22,7 +22,7 @@ octez-shell-libs.proxy octez-shell-libs.proxy.rpc octez-shell-libs.signer-backends.unix - tezos-version.value + octez-version.value lwt-exit uri) (library_flags (:standard -linkall)) diff --git a/src/lib_protocol_compiler/bin/dune b/src/lib_protocol_compiler/bin/dune index f59ccedc80bd..c1bb952dc123 100644 --- a/src/lib_protocol_compiler/bin/dune +++ b/src/lib_protocol_compiler/bin/dune @@ -16,7 +16,7 @@ (modes native) (libraries octez-protocol-compiler.native - tezos-version.value) + octez-version.value) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 3b68962d553c..4523db0626fb 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -25,7 +25,7 @@ octez-libs.event-logging-test-helpers octez-libs.test-helpers octez-alcotezt - tezos-version.value) + octez-version.value) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_smart_rollup_node/dune b/src/lib_smart_rollup_node/dune index 027b9a150231..52bf47a0fd78 100644 --- a/src/lib_smart_rollup_node/dune +++ b/src/lib_smart_rollup_node/dune @@ -19,7 +19,7 @@ tezos-dac-lib tezos-dac-client-lib octez-injector - tezos-version.value + octez-version.value octez-l2-libs.layer2_store octez-crawler octez-libs.tezos-workers diff --git a/src/lib_validation/dune b/src/lib_validation/dune index 3b2d728fc083..cc7fcce2fd12 100644 --- a/src/lib_validation/dune +++ b/src/lib_validation/dune @@ -16,7 +16,7 @@ octez-shell-libs.shell-services octez-shell-libs.protocol-updater octez-libs.stdlib-unix - tezos-version.value) + octez-version.value) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune index b17e21eb98d5..73fed2d85216 100644 --- a/src/lib_version/exe/dune +++ b/src/lib_version/exe/dune @@ -10,10 +10,10 @@ (executable (name tezos_print_version) - (public_name tezos-version) - (package tezos-version) + (public_name octez-version) + (package octez-version) (libraries - tezos-version.value + octez-version.value octez-libs.version octez-libs.base.unix) (link_flags diff --git a/src/lib_version/value/dune b/src/lib_version/value/dune index 19dd8b903bed..81f6aa83b940 100644 --- a/src/lib_version/value/dune +++ b/src/lib_version/value/dune @@ -5,7 +5,7 @@ (library (name tezos_version_value) - (public_name tezos-version.value) + (public_name octez-version.value) (instrumentation (backend bisect_ppx)) (libraries octez-libs.base diff --git a/src/proto_017_PtNairob/bin_sc_rollup_client/dune b/src/proto_017_PtNairob/bin_sc_rollup_client/dune index 2bbf8b2bead6..17dbe92e5008 100644 --- a/src/proto_017_PtNairob/bin_sc_rollup_client/dune +++ b/src/proto_017_PtNairob/bin_sc_rollup_client/dune @@ -11,7 +11,7 @@ octez-libs.clic tezos-protocol-017-PtNairob.protocol octez_smart_rollup_client_PtNairob - tezos-version.value) + octez-version.value) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_017_PtNairob/lib_delegate/dune b/src/proto_017_PtNairob/lib_delegate/dune index fc7f63e25ec3..f83128711ad1 100644 --- a/src/proto_017_PtNairob/lib_delegate/dune +++ b/src/proto_017_PtNairob/lib_delegate/dune @@ -8,7 +8,7 @@ (libraries octez-libs.base octez-libs.clic - tezos-version.value + octez-version.value tezos-protocol-017-PtNairob.protocol octez-protocol-017-PtNairob-libs.plugin octez-proto-libs.protocol-environment diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/dune index b1d411fa05c8..ffae1a4144cc 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dune @@ -42,7 +42,7 @@ octez-l2-libs.scoru-wasm octez-l2-libs.scoru-wasm-fast octez-libs.crypto-dal - tezos-version.value) + octez-version.value) (flags (:standard) -open Tezos_base diff --git a/src/proto_018_Proxford/bin_sc_rollup_client/dune b/src/proto_018_Proxford/bin_sc_rollup_client/dune index b49bfeee94d5..f40c6466bb47 100644 --- a/src/proto_018_Proxford/bin_sc_rollup_client/dune +++ b/src/proto_018_Proxford/bin_sc_rollup_client/dune @@ -11,7 +11,7 @@ octez-libs.clic tezos-protocol-018-Proxford.protocol octez_smart_rollup_client_Proxford - tezos-version.value) + octez-version.value) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_018_Proxford/lib_delegate/dune b/src/proto_018_Proxford/lib_delegate/dune index 16f46cede2ee..3dd87d3ed9b0 100644 --- a/src/proto_018_Proxford/lib_delegate/dune +++ b/src/proto_018_Proxford/lib_delegate/dune @@ -8,7 +8,7 @@ (libraries octez-libs.base octez-libs.clic - tezos-version.value + octez-version.value tezos-protocol-018-Proxford.protocol tezos-protocol-018-Proxford.protocol.lifted octez-protocol-018-Proxford-libs.plugin diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dune b/src/proto_018_Proxford/lib_sc_rollup_node/dune index c9da186bec63..7f898100113c 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/dune @@ -44,7 +44,7 @@ octez-l2-libs.scoru-wasm octez-l2-libs.scoru-wasm-fast octez-libs.crypto-dal - tezos-version.value) + octez-version.value) (flags (:standard) -open Tezos_base diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index a6e606514563..032c031ef337 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -11,7 +11,7 @@ octez-libs.clic tezos-protocol-alpha.protocol octez_smart_rollup_client_alpha - tezos-version.value) + octez-version.value) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp) diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index b0b3aa6113d0..173d3a537cc9 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -8,7 +8,7 @@ (libraries octez-libs.base octez-libs.clic - tezos-version.value + octez-version.value tezos-protocol-alpha.protocol tezos-protocol-alpha.protocol.lifted octez-protocol-alpha-libs.plugin diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune index eeb21d1a88f4..513c11edf0c1 100644 --- a/src/proto_alpha/lib_sc_rollup_node/dune +++ b/src/proto_alpha/lib_sc_rollup_node/dune @@ -44,7 +44,7 @@ octez-l2-libs.scoru-wasm octez-l2-libs.scoru-wasm-fast octez-libs.crypto-dal - tezos-version.value) + octez-version.value) (flags (:standard) -open Tezos_base -- GitLab From 7e91a4dda2aa8d2195d3b59c96e969dd2cbaf004 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 30 Aug 2023 17:42:15 +0200 Subject: [PATCH 3/6] Docs: Fix doc with the new octez-libs sublibs names --- docs/developer/event_logging_framework.rst | 2 +- docs/developer/testing.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developer/event_logging_framework.rst b/docs/developer/event_logging_framework.rst index a660afacbb90..7b83b02dc9c4 100644 --- a/docs/developer/event_logging_framework.rst +++ b/docs/developer/event_logging_framework.rst @@ -34,7 +34,7 @@ See for instance ``val Simple.emit: 'a Simple.t -> 'a -> (unit, trace) result Lwt.t``. Please read the guidelines that are documented in -`the Internal_event.Simple module. <../api/odoc/_html/tezos-event-logging/Tezos_event_logging/Internal_event/Simple/index.html>`__ +`the Internal_event.Simple module. <../api/odoc/_html/octez-libs/Event_logging/Internal_event/Simple/index.html>`__ “Heavy” Events diff --git a/docs/developer/testing.rst b/docs/developer/testing.rst index 5af4879c0811..69fa2ccb345e 100644 --- a/docs/developer/testing.rst +++ b/docs/developer/testing.rst @@ -199,7 +199,7 @@ Typical use cases: Example tests: - Unit tests for :package-api:`tezos-clic `. To execute them locally, run ``dune build @src/lib_clic/runtest``. - - Unit tests for :package:`tezos-version`. To execute them locally, run ``dune build @src/lib_version/runtest``. + - Unit tests for :package:`octez-version`. To execute them locally, run ``dune build @src/lib_version/runtest``. See :doc:`alcotezt` for more information on how to convert tests to Alcotezt, and how to execute them. -- GitLab From 5f566e8bf3a06bef8ac68cf76155f513358325fb Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Tue, 12 Sep 2023 14:31:06 +0200 Subject: [PATCH 4/6] Docs: Fix doc generation --- docs/doc_gen/dune | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index 8fbe74667214..e2f74a159f95 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -1,12 +1,12 @@ (executables (names rpc_doc p2p_doc) - (libraries octez-libs.tezos-base - octez-libs.tezos-rpc - octez-libs.tezos-stdlib-unix + (libraries octez-libs.base + octez-libs.rpc + octez-libs.stdlib-unix octez-shell-libs.shell - octez-libs.tezos-rpc-http-server - octez_node_config + octez-libs.rpc-http-server + octez_node_config octez-shell-libs.protocol-updater ; TODO tezos/tezos#2170: adapt next line(s) tezos-protocol-genesis.embedded-protocol -- GitLab From 859dc449cd112ea9a27fc2855ffe9ad4da2cb037 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Tue, 12 Sep 2023 14:25:30 +0200 Subject: [PATCH 5/6] Tezt: Fix dune file with the renaming --- src/lib_time_measurement/runtime/dune | 2 +- tezt/vesting_contract_test/dune | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib_time_measurement/runtime/dune b/src/lib_time_measurement/runtime/dune index 02105e4a3f21..e28cfdbbf28a 100644 --- a/src/lib_time_measurement/runtime/dune +++ b/src/lib_time_measurement/runtime/dune @@ -3,7 +3,7 @@ (public_name tezos-time-measurement) (libraries unix data-encoding - octez-libs.tezos-event-logging + octez-libs.event-logging lwt) (instrumentation.backend (ppx tezos-time-measurement.ppx)) (flags (:standard diff --git a/tezt/vesting_contract_test/dune b/tezt/vesting_contract_test/dune index 7a8fc67dc6ac..c950dba38cdd 100644 --- a/tezt/vesting_contract_test/dune +++ b/tezt/vesting_contract_test/dune @@ -1,8 +1,8 @@ (executable (name main) - (libraries octez-libs.tezos-stdlib + (libraries octez-libs.stdlib octez-protocol-alpha-libs.test-helpers - octez-libs.tezos-micheline + octez-libs.micheline tezos-protocol-alpha.protocol tezt-tezos ptime) -- GitLab From 911d638c420481202bf4706571561525ac346670 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Tue, 12 Sep 2023 17:48:45 +0200 Subject: [PATCH 6/6] Scripts: Fix gen-genesis with new octez-libs sublibs names --- scripts/gen-genesis/dune | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/gen-genesis/dune b/scripts/gen-genesis/dune index 178d76445f75..e1a7241a6530 100644 --- a/scripts/gen-genesis/dune +++ b/scripts/gen-genesis/dune @@ -2,6 +2,6 @@ (name gen_genesis) (libraries lwt.unix - octez-libs.tezos-base - octez-libs.tezos-base.unix - octez-libs.tezos-crypto)) + octez-libs.base + octez-libs.base.unix + octez-libs.crypto)) -- GitLab