diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 3aff7bbc85e6306a4ad3099ddc2cfb7c767ecf70..06e2fdd420aef71f1b5679411b4fccc89864fd69 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -439,8 +439,6 @@ opam:octez-alcotezt: variables: package: octez-alcotezt -# Ignoring unreleased package octez-aplonk. - opam:octez-baker-Proxford: extends: - .opam_template @@ -457,20 +455,6 @@ opam:octez-baker-PtNairob: # Ignoring unreleased package octez-baker-alpha. -opam:octez-bls12-381-hash: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: octez-bls12-381-hash - -opam:octez-bls12-381-signature: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: octez-bls12-381-signature - opam:octez-client: extends: - .opam_template @@ -488,7 +472,7 @@ opam:octez-codec: opam:octez-crawler: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_1 + - .rules_template__trigger_all_opam_batch_2 variables: package: octez-crawler @@ -522,10 +506,6 @@ opam:octez-distributed-lwt-internal: variables: package: octez-distributed-lwt-internal -# Ignoring unreleased package octez-distributed-plonk. - -# Ignoring unreleased package octez-epoxy-tx. - # Ignoring unreleased package octez-evm-chunker. # Ignoring unreleased package octez-evm-proxy. @@ -548,17 +528,10 @@ opam:octez-libs: variables: package: octez-libs -opam:octez-mec: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: octez-mec - opam:octez-node: extends: - .opam_template - - .rules_template__trigger_exec_opam_batch_1 + - .rules_template__trigger_exec_opam_batch_2 variables: package: octez-node @@ -569,20 +542,6 @@ opam:octez-node-config: variables: package: octez-node-config -opam:octez-plompiler: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: octez-plompiler - -opam:octez-plonk: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: octez-plonk - opam:octez-protocol-compiler: extends: - .opam_template @@ -607,7 +566,7 @@ opam:octez-signer: opam:octez-smart-rollup: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: octez-smart-rollup @@ -669,8 +628,6 @@ opam:octez-smart-rollup-wasm-debugger: # Ignoring unreleased package octez-snoop. -# Ignoring unreleased package octez-srs-extraction. - # Ignoring unreleased package octez-testnet-scenarios. # Ignoring unreleased package octez-wasmer-test. @@ -764,13 +721,6 @@ opam:tezos-baking-alpha-commands: # Ignoring unreleased package tezos-benchmarks-proto-alpha. -opam:tezos-clic: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-clic - opam:tezos-client-000-Ps9mPmXa: extends: - .opam_template @@ -914,21 +864,21 @@ opam:tezos-client-alpha: opam:tezos-client-base: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-client-base opam:tezos-client-base-unix: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-client-base-unix opam:tezos-client-commands: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-client-commands @@ -949,7 +899,7 @@ opam:tezos-client-genesis: opam:tezos-context-ops: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-context-ops @@ -984,7 +934,7 @@ opam:tezos-dac-client-lib: opam:tezos-dac-lib: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-dac-lib @@ -1015,28 +965,28 @@ opam:tezos-dal-node-lib: opam:tezos-dal-node-services: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-dal-node-services opam:tezos-embedded-protocol-000-Ps9mPmXa: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-000-Ps9mPmXa opam:tezos-embedded-protocol-001-PtCJ7pwo: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-001-PtCJ7pwo opam:tezos-embedded-protocol-002-PsYLVpVv: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-embedded-protocol-002-PsYLVpVv @@ -1162,53 +1112,42 @@ opam:tezos-embedded-protocol-017-PtNairob: opam:tezos-embedded-protocol-018-Proxford: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-018-Proxford opam:tezos-embedded-protocol-alpha: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-alpha opam:tezos-embedded-protocol-demo-counter: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-demo-counter opam:tezos-embedded-protocol-demo-noops: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-demo-noops opam:tezos-embedded-protocol-genesis: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-embedded-protocol-genesis -# Ignoring unreleased package tezos-expect-helper. - -opam:tezos-gossipsub: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-gossipsub - -# Ignoring unreleased package tezos-gossipsub-test. - opam:tezos-layer2-store: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-layer2-store @@ -1244,7 +1183,7 @@ opam:tezos-mockup: opam:tezos-mockup-commands: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-mockup-commands @@ -1267,35 +1206,35 @@ opam:tezos-mockup-registration: opam:tezos-protocol-000-Ps9mPmXa: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-000-Ps9mPmXa opam:tezos-protocol-001-PtCJ7pwo: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-001-PtCJ7pwo opam:tezos-protocol-002-PsYLVpVv: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-002-PsYLVpVv opam:tezos-protocol-003-PsddFKi3: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-003-PsddFKi3 opam:tezos-protocol-004-Pt24m4xi: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-004-Pt24m4xi @@ -1358,49 +1297,49 @@ opam:tezos-protocol-010-PtGRANAD: opam:tezos-protocol-011-PtHangz2: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-011-PtHangz2 opam:tezos-protocol-012-Psithaca: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-012-Psithaca opam:tezos-protocol-013-PtJakart: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-013-PtJakart opam:tezos-protocol-014-PtKathma: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-014-PtKathma opam:tezos-protocol-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-015-PtLimaPt opam:tezos-protocol-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-016-PtMumbai opam:tezos-protocol-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-017-PtNairob @@ -1409,7 +1348,7 @@ opam:tezos-protocol-017-PtNairob: opam:tezos-protocol-018-Proxford: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-018-Proxford @@ -1418,7 +1357,7 @@ opam:tezos-protocol-018-Proxford: opam:tezos-protocol-alpha: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-alpha @@ -1427,28 +1366,21 @@ opam:tezos-protocol-alpha: opam:tezos-protocol-demo-counter: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-demo-counter opam:tezos-protocol-demo-noops: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-demo-noops -opam:tezos-protocol-environment: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-protocol-environment - opam:tezos-protocol-genesis: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-protocol-genesis @@ -1462,7 +1394,7 @@ opam:tezos-protocol-plugin-007-PsDELPH1: opam:tezos-protocol-plugin-007-PsDELPH1-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-007-PsDELPH1-registerer @@ -1476,7 +1408,7 @@ opam:tezos-protocol-plugin-008-PtEdo2Zk: opam:tezos-protocol-plugin-008-PtEdo2Zk-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-protocol-plugin-008-PtEdo2Zk-registerer @@ -1567,7 +1499,7 @@ opam:tezos-protocol-plugin-014-PtKathma-registerer: opam:tezos-protocol-plugin-015-PtLimaPt: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-protocol-plugin-015-PtLimaPt @@ -1581,7 +1513,7 @@ opam:tezos-protocol-plugin-015-PtLimaPt-registerer: opam:tezos-protocol-plugin-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-016-PtMumbai @@ -1595,7 +1527,7 @@ opam:tezos-protocol-plugin-016-PtMumbai-registerer: opam:tezos-protocol-plugin-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-017-PtNairob @@ -1611,14 +1543,14 @@ opam:tezos-protocol-plugin-017-PtNairob-registerer: opam:tezos-protocol-plugin-018-Proxford: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-018-Proxford opam:tezos-protocol-plugin-018-Proxford-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-protocol-plugin-018-Proxford-registerer @@ -1627,14 +1559,14 @@ opam:tezos-protocol-plugin-018-Proxford-registerer: opam:tezos-protocol-plugin-alpha: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_4 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-plugin-alpha opam:tezos-protocol-plugin-alpha-registerer: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-protocol-plugin-alpha-registerer @@ -1661,35 +1593,14 @@ opam:tezos-proxy-server-config: variables: package: tezos-proxy-server-config -opam:tezos-requester: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-requester - -opam:tezos-sapling: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-sapling - # Ignoring unreleased package tezos-sc-rollup-node-test. -opam:tezos-scoru-wasm: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-scoru-wasm - # Ignoring unreleased package tezos-scoru-wasm-durable-snapshot. opam:tezos-scoru-wasm-fast: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_7 variables: package: tezos-scoru-wasm-fast @@ -1711,25 +1622,18 @@ opam:tezos-scoru-wasm-helpers: opam:tezos-shell: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_2 + - .rules_template__trigger_all_opam_batch_3 variables: package: tezos-shell # Ignoring unreleased package tezos-shell-benchmarks. -opam:tezos-shell-context: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_6 - variables: - package: tezos-shell-context - # Ignoring unreleased package tezos-shell-context-test. opam:tezos-signer-backends: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-signer-backends @@ -1743,28 +1647,28 @@ opam:tezos-signer-services: opam:tezos-smart-rollup-016-PtMumbai: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-smart-rollup-016-PtMumbai opam:tezos-smart-rollup-017-PtNairob: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-smart-rollup-017-PtNairob opam:tezos-smart-rollup-018-Proxford: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-smart-rollup-018-Proxford opam:tezos-smart-rollup-alpha: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_5 + - .rules_template__trigger_all_opam_batch_6 variables: package: tezos-smart-rollup-alpha @@ -1789,17 +1693,10 @@ opam:tezos-smart-rollup-layer2-018-Proxford: opam:tezos-store: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_3 + - .rules_template__trigger_all_opam_batch_4 variables: package: tezos-store -opam:tezos-test-helpers: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-test-helpers - # Ignoring unreleased package tezos-tooling. # Ignoring unreleased package tezos-tps-evaluation. @@ -1827,13 +1724,6 @@ opam:tezos-wasmer: variables: package: tezos-wasmer -opam:tezos-webassembly-interpreter: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-webassembly-interpreter - opam:tezos-webassembly-interpreter-extra: extends: - .opam_template @@ -1842,10 +1732,3 @@ opam:tezos-webassembly-interpreter-extra: package: tezos-webassembly-interpreter-extra # Ignoring unreleased package tezt-ethereum. - -opam:tezt-performance-regression: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezt-performance-regression diff --git a/Makefile b/Makefile index 3ebeff1fdfb530290caf3a825ba6e2126ce66d25..f3f70ab2b4fc84ca2b992bcc231e1377fdb1d9f4 100644 --- a/Makefile +++ b/Makefile @@ -327,11 +327,11 @@ lint-opam-dune: @dune build --profile=$(PROFILE) @runtest_dune_template # Ensure that all unit tests are restricted to their opam package -# (change 'tezos-test-helpers' to one the most elementary packages of -# the repo if you add "internal" dependencies to tezos-test-helpers) +# (change 'octez-distributed-internal' to one the most elementary packages of +# the repo if you add "internal" dependencies to octez-distributed-internal) .PHONY: lint-tests-pkg lint-tests-pkg: - @(dune build -p tezos-test-helpers @runtest @runtest_js) || \ + @(dune build -p octez-distributed-internal @runtest @runtest_js) || \ { echo "You have probably defined some tests in dune files without specifying to which 'package' they belong."; exit 1; } diff --git a/devtools/yes_wallet/dune b/devtools/yes_wallet/dune index 217c33805aed1d21417da3ec0ae85f8b3898b62e..89454bdf42287929072d29683f50291d22026aff 100644 --- a/devtools/yes_wallet/dune +++ b/devtools/yes_wallet/dune @@ -9,7 +9,7 @@ lwt.unix ezjsonm tezos-store - tezos-shell-context + octez-libs.tezos-shell-context octez-libs.tezos-context tezos-protocol-017-PtNairob tezos-protocol-018-Proxford diff --git a/docs/alpha/validation.rst b/docs/alpha/validation.rst index 8558f61b0dfd34163d2d970698b1bdad17a34816..9eaad6f2ef837b155cf3408cca467a9893ff931b 100644 --- a/docs/alpha/validation.rst +++ b/docs/alpha/validation.rst @@ -67,7 +67,7 @@ operations included in newly received blocks, whose validation is triggered by the :ref:`block validator`, in order to localize validation rules as needed. The resulting concrete API is specified by the :package-api:`Protocol -` +` module in the :doc:`protocol environment<../shell/protocol_environment>` ``V10``, and it is implemented by this protocol in the diff --git a/docs/developer/clic.rst b/docs/developer/clic.rst index 1c73377289233d4adf30e275af2ad73b3a485537..74b87d075eaea68f1fda7e026d19345878005dbe 100644 --- a/docs/developer/clic.rst +++ b/docs/developer/clic.rst @@ -1,7 +1,7 @@ The ``clic`` library ==================== -:package:`tezos-clic` is an OCaml combinator library for writing +:package-api:`tezos-clic ` is an OCaml combinator library for writing self-documenting command-line argument parsers. Clic is similar to `cmdliner `__, but (unlike cmdliner) ``tezos-clic`` allows to define a domain-specific @@ -49,7 +49,7 @@ defining commands that execute over a context of type ``unit``. In the running example, we define a context whose job is to contain -the actual implementation of the commands. +the actual implementation of the commands. We first declare ``CONTEXT`` as the signature of modules that contain a @@ -244,7 +244,7 @@ with one simple command. This is far from a complete demonstration of interactive, searchable documentation, with both command-line and HTML outputs. ``clic`` also gives facilities for implementing shell auto-completion. For more information, refer to ``clic``\'s -:package:`API documentation`. +:package-api:`API documentation `. .. LocalWords: OCaml combinator parsers cmdliner clic Octez tezos .. LocalWords: literalinclude ocaml desc ctx params json param Lwt diff --git a/docs/developer/testing.rst b/docs/developer/testing.rst index 09c018134877f851d016f22335a8563dcd4d3323..0f4fbe35ef3d8221715948a0eef2139dda0575bb 100644 --- a/docs/developer/testing.rst +++ b/docs/developer/testing.rst @@ -198,7 +198,7 @@ Typical use cases: - Conversion of pre-existing Alcotests to Tezt Example tests: - - Unit tests for :package:`tezos-clic`. To execute them locally, run ``dune build @src/lib_clic/runtest``. + - 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``. See :doc:`alcotezt` for more information on how to convert tests to diff --git a/docs/nairobi/validation.rst b/docs/nairobi/validation.rst index 2e11c171283893a99f9997235cb9f83138648865..75a8a3e8263e31e059cd76650980d1e5f7666bb7 100644 --- a/docs/nairobi/validation.rst +++ b/docs/nairobi/validation.rst @@ -67,7 +67,7 @@ operations included in newly received blocks, whose validation is triggered by the :ref:`block validator`, in order to localize validation rules as needed. The resulting concrete API is specified by the :package-api:`Protocol -` +` module in the :doc:`protocol environment<../shell/protocol_environment>` ``V8``, and it is implemented by this protocol in the diff --git a/docs/oxford/validation.rst b/docs/oxford/validation.rst index 3012028b8a48fa32825a068500cc970d27ab9dc0..a0b0ddad6ec28c8a0f33e0596153d131b0e43e3c 100644 --- a/docs/oxford/validation.rst +++ b/docs/oxford/validation.rst @@ -67,7 +67,7 @@ operations included in newly received blocks, whose validation is triggered by the :ref:`block validator`, in order to localize validation rules as needed. The resulting concrete API is specified by the :package-api:`Protocol -` +` module in the :doc:`protocol environment<../shell/protocol_environment>` ``V10``, and it is implemented by this protocol in the diff --git a/docs/shell/protocol_environment.rst b/docs/shell/protocol_environment.rst index bf6e361be9b02e4a10430f58f0eae2c215a22ed5..1fea472016098a0daa62871d008ecf69e4b1abea 100644 --- a/docs/shell/protocol_environment.rst +++ b/docs/shell/protocol_environment.rst @@ -54,7 +54,7 @@ Here is a quick description of each file in this environment, all located under implementations are assembled into a single implementation file ``VX.ml`` by a helper program located in ``s_packer/``. -The API can be found in :package:`tezos-protocol-environment` +The API can be found in :package-api:`tezos-protocol-environment ` Environment versions diff --git a/docs/shell/the_big_picture.rst b/docs/shell/the_big_picture.rst index 20a6f92f78d18eb78ba3d1486f0f28174e17469e..e907531e5cc39532b7d1a6a8ec23885e3526c37b 100644 --- a/docs/shell/the_big_picture.rst +++ b/docs/shell/the_big_picture.rst @@ -181,7 +181,7 @@ economic protocol, as a form of static sandboxing. It also generates a functorized version of the protocol, to make the execution of the protocol in an alternative environment possible. - - :package:`tezos-protocol-environment` contains the protocol + - :package-api:`tezos-protocol-environment ` contains the protocol generic environment, that is the API of the modules that are available to the economic protocol and the exported protocol API. A review of this sandbox is available :doc:`here <../shell/protocol_environment>`. @@ -202,7 +202,7 @@ protocol in an alternative environment possible. standard library as a parameter. This parameter can be filled with any of the implementations described in the two points below. - - :package:`tezos-shell-context` implements a context representation + - :package-api:`tezos-shell-context ` implements a context representation that is accepted by the protocol environment. The node uses this instance to read and write data on disk. @@ -284,7 +284,7 @@ run them. (in directory :src:`src/lib_p2p/test/`): tests of the peer-to-peer layer, independently of the Tezos gossip protocol (establishing connections, propagating peers, etc.) - - :package:`tezos-protocol-environment` + - :package-api:`tezos-protocol-environment ` (in directory :src:`src/lib_protocol_environment/test/`): tests for the in-memory context implementation. - :package:`tezos-shell` diff --git a/dune-project b/dune-project index f16e255a7997754781b8076fb499026bc8f51c86..87278a6ed7a579a18f7c567fa57c768a145e220e 100644 --- a/dune-project +++ b/dune-project @@ -8,12 +8,9 @@ (package (name octez-accuser-PtNairob)) (package (name octez-accuser-alpha)) (package (name octez-alcotezt)) -(package (name octez-aplonk)) (package (name octez-baker-Proxford)) (package (name octez-baker-PtNairob)) (package (name octez-baker-alpha)) -(package (name octez-bls12-381-hash)) -(package (name octez-bls12-381-signature)) (package (name octez-client)) (package (name octez-codec)) (package (name octez-crawler)) @@ -22,19 +19,14 @@ (package (name octez-dal-node)) (package (name octez-distributed-internal)) (package (name octez-distributed-lwt-internal)) -(package (name octez-distributed-plonk)) -(package (name octez-epoxy-tx)) (package (name octez-evm-chunker)(allow_empty)) (package (name octez-evm-proxy)) (package (name octez-evm-proxy-lib)(allow_empty)) (package (name octez-evm-upgrade-signer)(allow_empty)) (package (name octez-injector)) (package (name octez-libs)) -(package (name octez-mec)) (package (name octez-node)) (package (name octez-node-config)) -(package (name octez-plompiler)) -(package (name octez-plonk)) (package (name octez-protocol-compiler)) (package (name octez-proxy-server)) (package (name octez-signer)) @@ -53,7 +45,6 @@ (package (name octez-smart-rollup-wasm-benchmark-lib)(allow_empty)) (package (name octez-smart-rollup-wasm-debugger)) (package (name octez-snoop)) -(package (name octez-srs-extraction)) (package (name octez-testnet-scenarios)) (package (name octez-wasmer-test)(allow_empty)) (package (name scoru-sequencer-test)(allow_empty)) @@ -78,7 +69,6 @@ (package (name tezos-benchmarks-proto-017-PtNairob)) (package (name tezos-benchmarks-proto-018-Proxford)) (package (name tezos-benchmarks-proto-alpha)) -(package (name tezos-clic)) (package (name tezos-client-000-Ps9mPmXa)) (package (name tezos-client-001-PtCJ7pwo)) (package (name tezos-client-002-PsYLVpVv)) @@ -143,9 +133,6 @@ (package (name tezos-embedded-protocol-demo-counter)) (package (name tezos-embedded-protocol-demo-noops)) (package (name tezos-embedded-protocol-genesis)) -(package (name tezos-expect-helper)) -(package (name tezos-gossipsub)) -(package (name tezos-gossipsub-test)(allow_empty)) (package (name tezos-layer2-store)(allow_empty)) (package (name tezos-layer2-utils-016-PtMumbai)) (package (name tezos-layer2-utils-017-PtNairob)) @@ -185,7 +172,6 @@ (package (name tezos-protocol-alpha-tests)(allow_empty)) (package (name tezos-protocol-demo-counter)) (package (name tezos-protocol-demo-noops)) -(package (name tezos-protocol-environment)) (package (name tezos-protocol-genesis)) (package (name tezos-protocol-plugin-007-PsDELPH1)) (package (name tezos-protocol-plugin-007-PsDELPH1-registerer)) @@ -219,10 +205,7 @@ (package (name tezos-protocol-updater)) (package (name tezos-proxy)) (package (name tezos-proxy-server-config)) -(package (name tezos-requester)) -(package (name tezos-sapling)) (package (name tezos-sc-rollup-node-test)(allow_empty)) -(package (name tezos-scoru-wasm)) (package (name tezos-scoru-wasm-durable-snapshot)(allow_empty)) (package (name tezos-scoru-wasm-fast)) (package (name tezos-scoru-wasm-fast-test)(allow_empty)) @@ -232,7 +215,6 @@ (package (name tezos-scoru-wasm-test-helpers)(allow_empty)) (package (name tezos-shell)) (package (name tezos-shell-benchmarks)) -(package (name tezos-shell-context)) (package (name tezos-shell-context-test)(allow_empty)) (package (name tezos-signer-backends)) (package (name tezos-signer-services)) @@ -245,16 +227,13 @@ (package (name tezos-smart-rollup-layer2-018-Proxford)) (package (name tezos-smart-rollup-layer2-alpha)) (package (name tezos-store)) -(package (name tezos-test-helpers)) (package (name tezos-tooling)) (package (name tezos-tps-evaluation)) (package (name tezos-tree-encoding-test)(allow_empty)) (package (name tezos-validation)) (package (name tezos-version)) (package (name tezos-wasmer)) -(package (name tezos-webassembly-interpreter)) (package (name tezos-webassembly-interpreter-extra)) (package (name tezt-ethereum)(allow_empty)) -(package (name tezt-performance-regression)) ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. diff --git a/manifest/main.ml b/manifest/main.ml index fc06761a6ccb9d3d05a169399e360ef3812cff1a..1809085375b178f2729695b377655d9220238826 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -467,8 +467,8 @@ let registered_octez_libs : sub_lib_documentation_link list ref = ref [] let octez_lib ?internal_name ?js_of_ocaml ?inline_tests ?foreign_stubs ?documentation ?conflicts ?flags ?time_measurement_ppx ?deps ?dune ?modules ?linkall ?js_compatible ?bisect_ppx ?preprocess ?opam_only_deps ?cram - ?release_status ?ctypes ?c_library_flags ?opam_with_test ?synopsis:_ - public_name ~path = + ?release_status ?ctypes ?opam_with_test ?c_library_flags ?synopsis:_ ~path + public_name = let name = let s = Option.value ~default:public_name internal_name in String.map @@ -515,6 +515,13 @@ let octez_lib ?internal_name ?js_of_ocaml ?inline_tests ?foreign_stubs ?ctypes ?c_library_flags ~path + ~ocaml: + V.( + (* TODO: https://gitlab.com/tezos/tezos/-/issues/6112 + Should be in sync with scripts/version.sh *) + at_least "4.14.1" && less_than "4.15") + ~license:"Apache-2.0" + ~extra_authors:["WebAssembly Authors"] (* Prints all the registered octez libraries as a documentation index *) let pp_octez_libs_index fmt registered_octez_libs = @@ -553,11 +560,10 @@ let pp_octez_libs_index fmt registered_octez_libs = registered_octez_libs let octez_test_helpers = - public_lib + octez_lib "tezos-test-helpers" ~path:"src/lib_test" ~internal_name:"tezos_test_helpers" - ~synopsis:"Tezos-agnostic test helpers" ~deps:[uri; fmt; qcheck_alcotest; lwt; pure_splitmix; data_encoding] ~js_compatible:true ~linkall:true @@ -571,15 +577,12 @@ let octez_test_helpers = ] let octez_expect_helper = - public_lib - "tezos-expect-helper" - ~path:"src/lib_expect_helper" - ~synopsis:"Tezos: helper for writing expect tests for Tezos" + octez_lib "tezos-expect-helper" ~path:"src/lib_expect_helper" let _octez_expect_helper_test = private_lib "tezos_expect_helper_test" - ~opam:"tezos-expect-helper" + ~opam:"octez-libs" ~path:"src/lib_expect_helper/test" ~deps:[octez_expect_helper] ~inline_tests:ppx_expect @@ -1158,13 +1161,10 @@ let _octez_bls12_381_utils = ~deps:[hex; bls12_381] let octez_bls12_381_signature = - public_lib + octez_lib "octez-bls12-381-signature" ~path:"src/lib_bls12_381_signature" ~internal_name:"bls12_381_signature" - ~synopsis: - "Implementation of BLS signatures for the pairing-friendly curve \ - BLS12-381" ~deps:[bls12_381] ~modules:["bls12_381_signature"] ~js_compatible:true @@ -1197,7 +1197,7 @@ let _octez_bls12_381_signature_tests = tezt ["test_aggregated_signature"; "test_signature"; "utils"] ~path:"src/lib_bls12_381_signature/test" - ~opam:"octez-bls12-381-signature" + ~opam:"octez-libs" (* TODO: https://gitlab.com/tezos/tezos/-/issues/5377 This test is affected by the [FinalizationRegistry] hangs in JS, so although JS compatible, we only test in [Native] mode *) @@ -1210,7 +1210,7 @@ let _octez_bls12_381_signature_gen_wasm_needed_names = private_exe "gen_wasm_needed_names" ~path:"src/lib_bls12_381_signature" - ~opam:"octez-bls12-381-signature" + ~opam:"octez-libs" ~bisect_ppx:No ~modules:["gen_wasm_needed_names"] ~deps:[re] @@ -1297,13 +1297,10 @@ let _octez_crypto_tests_unix = ] let octez_bls12_381_hash = - public_lib + octez_lib "octez-bls12-381-hash" ~path:"src/lib_bls12_381_hash" ~internal_name:"bls12_381_hash" - ~synopsis: - "Implementation of some cryptographic hash primitives using the scalar \ - field of BLS12-381" ~c_library_flags:["-Wall"; "-Wextra"; ":standard"; "-lpthread"] ~deps:[bls12_381] ~js_compatible:false @@ -1329,16 +1326,15 @@ let _octez_bls12_381_hash_tests = tezt ["test_poseidon"; "test_rescue"; "test_anemoi"; "test_griffin"; "test_jive"] ~path:"src/lib_bls12_381_hash/test" - ~opam:"octez-bls12-381-hash" + ~opam:"octez-libs" ~deps:[alcotezt; bls12_381; octez_bls12_381_hash] ~flags:(Flags.standard ~disable_warnings:[3] ()) let octez_mec = - public_lib + octez_lib "octez-mec" ~path:"src/lib_mec" ~internal_name:"mec" - ~synopsis:"Modular Experimental Cryptography library" ~deps:[alcotest; bls12_381; bigarray_compat; eqaf] let _octez_mec_tests = @@ -1403,7 +1399,7 @@ let _octez_mec_tests = "test_iterator"; ] ~path:"src/lib_mec/test" - ~opam:"octez-mec" + ~opam:"octez-libs" ~deps:[alcotezt; octez_mec |> open_] let octez_polynomial = @@ -1472,12 +1468,9 @@ let _octez_bls12_381_polynomial_tests = ~dep_files:["srs_zcash_g1_5"] let octez_srs_extraction = - public_lib + octez_lib "octez-srs-extraction" ~path:"src/lib_srs_extraction" - ~synopsis: - "Extracts SRS for G1 and G2 from powers-of-tau generated by the ZCash and\n\ - Filecoin MPC ceremonies" ~modules:["libsrs"] ~bisect_ppx:No ~deps:[bls12_381; octez_bls12_381_polynomial |> open_] @@ -1486,7 +1479,7 @@ let _octez_srs_extraction_main = private_exe "srs_extraction_main" ~path:"src/lib_srs_extraction" - ~opam:"octez-srs-extraction" + ~opam:"octez-libs" ~modules:["srs_extraction_main"] ~bisect_ppx:No ~deps: @@ -1502,7 +1495,7 @@ let _octez_srs_extraction_tests = tezt ["test_main"] ~path:"src/lib_srs_extraction/test" - ~opam:"octez-srs-extraction" + ~opam:"octez-libs" ~deps:[octez_srs_extraction |> open_; alcotezt] ~dep_files:["phase1radix2m5"] ~dune: @@ -1512,7 +1505,7 @@ let _octez_srs_extraction_tests = [ S "rule"; [S "alias"; S "runtest"]; - [S "package"; S "octez-srs-extraction"]; + [S "package"; S "octez-libs"]; [S "deps"; S srs_file; S "phase1radix2m5"]; [ S "action"; @@ -1538,7 +1531,7 @@ let _octez_srs_extraction_tests = extract "g2" "srs_zcash_g2_5"; alias_rule "runtest" - ~package:"octez-srs-extraction" + ~package:"octez-libs" ~deps:["srs_zcash_g1_5"; "srs_zcash_g2_5"] ~action: (run @@ -1546,7 +1539,7 @@ let _octez_srs_extraction_tests = ["check"; "srs_zcash_g1_5"; "srs_zcash_g2_5"]); alias_rule "runtest" - ~package:"octez-srs-extraction" + ~package:"octez-libs" ~deps:["srs_filecoin_g1_6"; "srs_filecoin_g2_6"] ~action: (run @@ -1555,11 +1548,10 @@ let _octez_srs_extraction_tests = ]) let octez_plompiler = - public_lib + octez_lib "octez-plompiler" ~internal_name:"plompiler" ~path:"src/lib_plompiler" - ~synopsis:"Library to write arithmetic circuits for Plonk" ~deps: [ repr; @@ -1619,11 +1611,10 @@ let make_plonk_runtest_invocation ~package = ] let octez_plonk = - public_lib + octez_lib "octez-plonk" ~internal_name:"plonk" ~path:"src/lib_plonk" - ~synopsis:"Plonk zero-knowledge proving system" ~deps: [ repr; @@ -1636,7 +1627,7 @@ let octez_plonk = ~preprocess:[pps ppx_repr] let octez_plonk_aggregation = - public_lib + octez_lib "octez-plonk.aggregation" ~path:"src/lib_aplonk/plonk-aggregation" ~internal_name:"aggregation" @@ -1644,18 +1635,15 @@ let octez_plonk_aggregation = ~deps:[octez_plonk; octez_bls12_381_polynomial |> open_] let octez_aplonk = - public_lib + octez_lib "octez-aplonk" ~internal_name:"aplonk" ~path:"src/lib_aplonk" - ~synopsis: - "Zero-knowledge proving system based on PlonK optimized for proofs \ - aggregation" ~preprocess:[pps ppx_repr] ~deps:[octez_plonk_aggregation] let octez_plonk_distribution = - public_lib + octez_lib "octez-plonk.distribution" ~internal_name:"distribution" ~path:"src/lib_distributed_plonk/distribution" @@ -1663,7 +1651,7 @@ let octez_plonk_distribution = ~preprocess:[pps ppx_repr] let octez_plonk_communication = - public_lib + octez_lib "octez-plonk.communication" ~internal_name:"communication" ~path:"src/lib_distributed_plonk/communication" @@ -1671,20 +1659,20 @@ let octez_plonk_communication = ~preprocess:[pps ppx_repr] let octez_plonk_test_helpers = - public_lib + octez_lib "octez-plonk.plonk-test" ~path:"src/lib_plonk/test" ~internal_name:"plonk_test" ~deps:[octez_plonk; octez_plonk_aggregation; octez_plonk_distribution] ~modules:["helpers"; "cases"] ~preprocess:[pps ppx_repr] - ~dune:(make_plonk_runtest_invocation ~package:"octez-plonk") + ~dune:(make_plonk_runtest_invocation ~package:"octez-libs") let _octez_plonk_test_helpers_main = private_exe "main" ~path:"src/lib_plonk/test" - ~opam:"octez-plonk" + ~opam:"octez-libs" ~modules: [ "main"; @@ -1712,16 +1700,16 @@ let _octez_plonk_distribution_test = private_exe "main" ~path:"src/lib_distributed_plonk/distribution/test" - ~opam:"octez-plonk" + ~opam:"octez-libs" ~deps:[octez_plonk_aggregation; octez_plonk_test_helpers] ~modules:["main"; "test_polynomial_commitment"] - ~dune:(make_plonk_runtest_invocation ~package:"octez-plonk") + ~dune:(make_plonk_runtest_invocation ~package:"octez-libs") let _octez_plonk_test_helpers_bench = private_exe "bench" ~path:"src/lib_plonk/test" - ~opam:"octez-plonk" + ~opam:"octez-libs" ~modules:["bench"] ~bisect_ppx:No ~deps:[octez_plonk_test_helpers] @@ -1730,7 +1718,7 @@ let _octez_plonk_test_plompiler_afl = private_exe "afl" ~path:"src/lib_plonk/test_plompiler" - ~opam:"octez-plonk" + ~opam:"octez-libs" ~modules:["afl"] ~bisect_ppx:No ~deps:[octez_plompiler; octez_plonk; bls12_381] @@ -1739,7 +1727,7 @@ let _octez_plonk_test_plompiler_main = private_exe "main" ~path:"src/lib_plonk/test_plompiler" - ~opam:"octez-plonk" + ~opam:"octez-libs" ~modules: [ "bench_poseidon"; @@ -1770,14 +1758,13 @@ let _octez_plonk_test_plompiler_main = ] ~bisect_ppx:No ~deps:[octez_plonk_test_helpers] - ~dune:(make_plonk_runtest_invocation ~package:"octez-plonk") + ~dune:(make_plonk_runtest_invocation ~package:"octez-libs") let octez_distributed_plonk = - public_lib + octez_lib "octez-distributed-plonk" ~internal_name:"distributed_plonk" ~path:"src/lib_distributed_plonk" - ~synopsis:"Distributed version of the proving system" ~deps: [ octez_aplonk; @@ -1799,7 +1786,7 @@ let octez_distributed_plonk = let _octez_distributed_plonk_test_main = private_exe "main" - ~opam:"octez-distributed-plonk" + ~opam:"octez-libs" ~path:"src/lib_distributed_plonk/test" ~deps: [ @@ -1811,13 +1798,13 @@ let _octez_distributed_plonk_test_main = octez_plonk_test_helpers; ] ~bisect_ppx:No - ~dune:(make_plonk_runtest_invocation ~package:"octez-distributed-plonk") + ~dune:(make_plonk_runtest_invocation ~package:"octez-libs") let _octez_distributed_plonk_worker_runner = private_exe "worker_runner" ~path:"src/lib_distributed_plonk" - ~opam:"octez-distributed-plonk" + ~opam:"octez-libs" ~bisect_ppx:No ~deps:[octez_distributed_plonk; octez_plonk_distribution] ~modules:["worker_runner"] @@ -1826,16 +1813,16 @@ let _octez_aplonk_test_main = private_exe "main" ~path:"src/lib_aplonk/test" - ~opam:"octez-aplonk" + ~opam:"octez-libs" ~deps:[octez_plonk_test_helpers; octez_aplonk] ~modules:["main"; "test_aplonk"; "test_main_protocol"] - ~dune:(make_plonk_runtest_invocation ~package:"octez-aplonk") + ~dune:(make_plonk_runtest_invocation ~package:"octez-libs") let _octez_distributed_plonk_executable = private_exe "distribution" ~path:"src/lib_distributed_plonk" - ~opam:"octez-distributed-plonk" + ~opam:"octez-libs" ~bisect_ppx:No ~deps:[octez_distributed_plonk |> open_] ~modules:["distribution"] @@ -1844,7 +1831,7 @@ let _octez_distributed_plonk_executable_meta = private_exe "distribution_meta" ~path:"src/lib_distributed_plonk" - ~opam:"octez-distributed-plonk" + ~opam:"octez-libs" ~bisect_ppx:No ~deps:[octez_distributed_plonk |> open_] ~modules:["distribution_meta"] @@ -1853,16 +1840,15 @@ let _octez_aplonk_test_helpers_bench = private_exe "bench" ~path:"src/lib_aplonk/test" - ~opam:"octez-aplonk" + ~opam:"octez-libs" ~modules:["bench"] ~bisect_ppx:No ~deps:[octez_plonk_test_helpers; octez_aplonk] let octez_epoxy_tx = - public_lib + octez_lib "octez-epoxy-tx" ~path:"src/lib_epoxy_tx" - ~synopsis:"Circuits for transaction Epoxy rollup" ~internal_name:"epoxy_tx" ~deps:[octez_plompiler; hex; stdint; octez_plonk; octez_mec] @@ -1870,9 +1856,9 @@ let _octez_epoxy_tx_tests = private_exe "main" ~path:"src/lib_epoxy_tx/test" - ~opam:"octez-epoxy-tx" + ~opam:"octez-libs" ~deps:[octez_epoxy_tx; octez_plonk_test_helpers; octez_aplonk] - ~dune:(make_plonk_runtest_invocation ~package:"octez-epoxy-tx") + ~dune:(make_plonk_runtest_invocation ~package:"octez-libs") let octez_dal_config = octez_lib @@ -1994,11 +1980,9 @@ let _octez_stdlib_unix_test = ] let octez_clic = - public_lib + octez_lib "tezos-clic" ~path:"src/lib_clic" - ~synopsis: - "Tezos: library of auto-documented command-line-parsing combinators" ~deps: [ octez_stdlib |> open_; @@ -2010,7 +1994,7 @@ let octez_clic = ~js_compatible:true let octez_clic_unix = - public_lib + octez_lib "tezos-clic.unix" ~path:"src/lib_clic/unix" ~deps: @@ -2026,7 +2010,7 @@ let _octez_clic_tests = tezt ["test_clic"] ~path:"src/lib_clic/test" - ~opam:"tezos-clic" + ~opam:"octez-libs" ~deps:[octez_stdlib |> open_; octez_clic |> open_; lwt_unix; alcotezt] let _octez_clic_example = @@ -2239,12 +2223,9 @@ let _lazy_containers_tests = ] let octez_webassembly_interpreter = - public_lib + octez_lib "tezos-webassembly-interpreter" ~path:"src/lib_webassembly" - ~license:"Apache-2.0" - ~extra_authors:["WebAssembly Authors"] - ~synopsis:"WebAssembly reference interpreter with tweaks for Tezos" ~dune:Dune.[[S "include_subdirs"; S "unqualified"]] ~deps: [ @@ -2291,7 +2272,7 @@ let _octez_webassembly_test = tezt ["smallint"] ~path:"src/lib_webassembly/tests" - ~opam:"tezos-webassembly-interpreter" + ~opam:"octez-libs" ~dune:Dune.[[S "include_subdirs"; S "no"]] ~deps:[octez_webassembly_interpreter |> open_; alcotezt] @@ -2502,10 +2483,9 @@ let octez_p2p = ] let tezt_performance_regression = - public_lib + octez_lib "tezt-performance-regression" ~path:"tezt/lib_performance_regression" - ~synopsis:"Performance regression test framework based on Tezt" ~bisect_ppx:No ~deps:[tezt_lib |> open_ |> open_ ~m:"Base"; uri; cohttp_lwt_unix] @@ -2621,10 +2601,9 @@ let _tezt_self_tests = ~deps:[tezt_lib |> open_ |> open_ ~m:"Base"; tezt_tezos |> open_] let octez_gossipsub = - public_lib + octez_lib "tezos-gossipsub" ~path:"src/lib_gossipsub" - ~synopsis:"Tezos: An implementation of gossipsub" ~deps: [ ringo; @@ -2642,8 +2621,7 @@ let _octez_gossipsub_test = test "test_gossipsub" ~path:"src/lib_gossipsub/test" - ~opam:"tezos-gossipsub-test" - ~synopsis:"Tests for the gossipsub algorithm" + ~opam:"octez-libs" ~deps: [ fmt; @@ -2732,11 +2710,9 @@ let octez_context_memory = ~conflicts:[Conflicts.checkseum] let octez_scoru_wasm = - public_lib + octez_lib "tezos-scoru-wasm" ~path:"src/lib_scoru_wasm" - ~synopsis: - "Protocol environment dependency providing WASM functionality for SCORU" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -2859,10 +2835,9 @@ let _octez_context_memory_tests = Tests are disabled in the .opam because the tests require zcash parameter files. *) let octez_sapling = - public_lib + octez_lib "tezos-sapling" ~path:"src/lib_sapling" - ~synopsis:"OCaml library for the Sapling protocol, using librustzcash" ~deps: [ conf_rust; @@ -2892,7 +2867,6 @@ let octez_sapling = "-lrustzcash"; "-lpthread"; ] - ~opam_with_test:Never ~dune: Dune. [ @@ -2931,7 +2905,7 @@ let _octez_sapling_tests = ] ~path:"src/lib_sapling/test" ~with_macos_security_framework:true - ~opam:"tezos-sapling" + ~opam:"octez-libs" ~dep_files:["vectors.csv"; "vectors-zip32.csv"] ~deps: [ @@ -2946,38 +2920,37 @@ let _octez_sapling_tests = octez_base_test_helpers |> open_; alcotezt; ] - ~opam_with_test:Never + ~dune_with_test:Never let _octez_sapling_js_tests = test "test_js" ~path:"src/lib_sapling/test" - ~opam:"tezos-sapling" + ~opam:"octez-libs" ~deps:[octez_sapling; octez_hacl] ~modules:["test_js"] ~linkall:true ~modes:[JS] ~js_compatible:true - ~opam_with_test:Never + ~dune_with_test:Never let _octez_sapling_ctypes_gen = private_exes ["rustzcash_ctypes_gen"; "gen_runtime_js"] ~path:"src/lib_sapling/bindings" - ~opam:"tezos-sapling" + ~opam:"octez-libs" ~bisect_ppx:No ~deps:[ctypes_stubs; ctypes] ~modules: ["rustzcash_ctypes_gen"; "rustzcash_ctypes_bindings"; "gen_runtime_js"] - ~opam_with_test:Never let tezos_protocol_environment_sigs_internals = - public_lib + octez_lib "tezos-protocol-environment.sigs-internals" ~path:"src/lib_protocol_environment/sigs-internals" let tezos_protocol_environment_sigs = - public_lib + octez_lib "tezos-protocol-environment.sigs" ~path:"src/lib_protocol_environment/sigs" ~deps:[tezos_protocol_environment_sigs_internals] @@ -3008,7 +2981,7 @@ let tezos_protocol_environment_sigs = List.init (latest_environment_number + 1) gen |> Dune.of_list) let octez_protocol_environment_structs = - public_lib + octez_lib "tezos-protocol-environment.structs" ~path:"src/lib_protocol_environment/structs" ~deps: @@ -3023,26 +2996,9 @@ let octez_protocol_environment_structs = ] let octez_protocol_environment = - public_lib + octez_lib "tezos-protocol-environment" ~path:"src/lib_protocol_environment" - ~synopsis:"Interface layer between the protocols and the shell" - ~description: - {|The protocol-environment is a two-sided component sitting between the shell and -the protocols. - -On one side, it provides a restricted typing environment to compile the -protocols against. This is a series of modules which replace the standard -library of OCaml. These modules purposefully omit many functionalities, thus -preventing the protocols from, say, directly writing to disk. - -On the other side, it provides the shell with specific call-sites in the -protocols. These are the only entry-points into the otherwise black-box -protocols.|} - ~ocaml: - V.( - (* Should be in sync with scripts/version.sh *) - at_least "4.14.0" && less_than "4.15") ~deps: [ zarith; @@ -3064,11 +3020,9 @@ protocols.|} ] let octez_shell_context = - public_lib + octez_lib "tezos-shell-context" ~path:"src/lib_protocol_environment/shell_context" - ~synopsis: - "Tezos: economic-protocols environment implementation for `octez-node`" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3086,7 +3040,7 @@ let _octez_protocol_environment_tests = "test_data_encoding"; ] ~path:"src/lib_protocol_environment/test" - ~opam:"tezos-protocol-environment" + ~opam:"octez-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3193,7 +3147,7 @@ let octez_protocol_compiler_lib = ~enabled_if:[S ">="; S "%{ocaml_version}"; S "5"]; targets_rule ["embedded-interfaces-env"] - ~deps:[Dune.(H [[S "package"; S "tezos-protocol-environment"]])] + ~deps:[Dune.(H [[S "package"; S "octez-libs"]])] ~action: [ S "with-stdout-to"; @@ -3204,13 +3158,13 @@ let octez_protocol_compiler_lib = V [ S - "%{lib:tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa}"; + "%{lib:octez-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa}"; ]; ]; ]; targets_rule ["embedded_cmis_env.ml"] - ~deps:[Dune.(H [[S "package"; S "tezos-protocol-environment"]])] + ~deps:[Dune.(H [[S "package"; S "octez-libs"]])] ~action: [ S "run"; @@ -3466,10 +3420,9 @@ let _octez_store_mocked = ~implements:octez_store let octez_requester = - public_lib + octez_lib "tezos-requester" ~path:"src/lib_requester" - ~synopsis:"Tezos: generic resource fetching service" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3481,7 +3434,7 @@ let _octez_requester_tests = tezt ["test_requester"; "test_fuzzing_requester"; "shared"] ~path:"src/lib_requester/test" - ~opam:"tezos-requester" + ~opam:"octez-libs" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -7254,7 +7207,7 @@ let _ppinclude = private_exe "ppinclude" ~path:"src/lib_protocol_environment/ppinclude" - ~opam:"tezos-protocol-environment" + ~opam:"octez-libs" ~bisect_ppx:No ~deps:[compiler_libs_common] diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 1647597553b889260ce6294e9af6956d39405c07..6d218e5093ae00baf1e6d09082eb3518a922eb9a 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -51,6 +51,30 @@ let pp_do_not_edit ~comment_start fmt () = let sanitize_path x = Filename.(dirname x // Filename.basename x) +(* Remove duplicates from a list. + Items that are not removed are kept in their original order. + In case of duplicates, the first occurrence is kept. + [get_key] returns the comparison key (a string). + [merge] is used in case a key is present several times. *) +let deduplicate_list ?merge get_key list = + let add ((list, set) as acc) item = + let key = get_key item in + if String_set.mem key set then + match merge with + | None -> acc + | Some merge -> + (* Go back and merge the previous occurrence. *) + let merge_if_equal previous_item = + if String.compare (get_key previous_item) key = 0 then + merge previous_item item + else previous_item + in + let list = List.map merge_if_equal list in + (list, set) + else (item :: list, String_set.add key set) + in + List.fold_left add ([], String_set.empty) list |> fst |> List.rev + (*****************************************************************************) (* DUNE *) (*****************************************************************************) @@ -486,6 +510,15 @@ module Version = struct let and_list = List.fold_left ( && ) True + let rec to_and_list c = + match c with + | True | False | Exactly _ | Different_from _ | At_least _ | More_than _ + | At_most _ | Less_than _ | Not _ -> + [c] + | And (c1, c2) -> to_and_list c1 @ to_and_list c2 + | Or (_, _) -> + invalid_arg "Version.to_and_list: passed cosntraint is not an and list" + let ( || ) a b = match (a, b) with | True, _ | _, True -> True @@ -493,6 +526,28 @@ module Version = struct | _ -> Or (a, b) let or_list = List.fold_left ( || ) False + + let rec version_to_string = function + | True -> "true" + | False -> "false" + | Exactly (V x) -> Format.sprintf "= %s" x + | Exactly Version -> "= version" + | Different_from (V x) -> Format.sprintf "!= %s" x + | Different_from Version -> "!= version" + | At_least (V x) -> Format.sprintf ">= %s" x + | At_least Version -> ">= version" + | More_than (V x) -> Format.sprintf "> %s" x + | More_than Version -> "> version" + | At_most (V x) -> Format.sprintf "<= %s" x + | At_most Version -> "<= version" + | Less_than (V x) -> Format.sprintf "< %s" x + | Less_than Version -> "< version" + | Not constraints -> + Format.sprintf "not %s" @@ version_to_string constraints + | And (c1, c2) -> + Format.sprintf "%s && %s" (version_to_string c1) (version_to_string c2) + | Or (c1, c2) -> + Format.sprintf "%s || %s" (version_to_string c1) (version_to_string c2) end module Npm = struct @@ -578,6 +633,27 @@ module Opam = struct invalid_arg ("Manifest.Opam.pp: synopsis cannot end with a period: " ^ synopsis) ; let depopts, depends = List.partition (fun dep -> dep.optional) depends in + (* Tries to dedpublicate dependencies constraints *) + let deduplicate_constraints_list constraints = + try + deduplicate_list + ~merge:(fun c1 _c2 -> c1) + Version.version_to_string + (Version.to_and_list constraints) + |> Version.and_list + with _ -> constraints + in + let depends = + List.map + (fun dep -> + { + package = dep.package; + with_test = dep.with_test; + optional = dep.optional; + version = deduplicate_constraints_list dep.version; + }) + depends + in let depopts, conflicts = (* Opam documentation says this about [depopts]: "If you require specific versions, add a [conflicts] field with the ones @@ -2356,30 +2432,6 @@ let generate_dune (internal : Target.internal) = ?js_of_ocaml:internal.js_of_ocaml :: documentation :: create_empty_files :: internal.dune) -(* Remove duplicates from a list. - Items that are not removed are kept in their original order. - In case of duplicates, the first occurrence is kept. - [get_key] returns the comparison key (a string). - [merge] is used in case a key is present several times. *) -let deduplicate_list ?merge get_key list = - let add ((list, set) as acc) item = - let key = get_key item in - if String_set.mem key set then - match merge with - | None -> acc - | Some merge -> - (* Go back and merge the previous occurrence. *) - let merge_if_equal previous_item = - if String.compare (get_key previous_item) key = 0 then - merge previous_item item - else previous_item - in - let list = List.map merge_if_equal list in - (list, set) - else (item :: list, String_set.add key set) - in - List.fold_left add ([], String_set.empty) list |> fst |> List.rev - (* [Explicitly_unreleased i]: this opam package was explicitly specified not to be released in the definition of its internal target [i]. [Explicitly_released i]: this opam package was explicitly specified to be released @@ -2863,8 +2915,16 @@ let generate_opam ?release for_package (internals : Target.internal list) : | [] -> ["MIT"] | licenses -> licenses in + (* Used to remove any duplicates in extra_authors. *) + let rec deduplicate known acc = function + | [] -> List.rev acc + | author :: tail -> + if String_set.mem author known then deduplicate known acc tail + else deduplicate (String_set.add author known) (author :: acc) tail + in let extra_authors = List.concat_map (fun internal -> internal.Target.extra_authors) internals + |> deduplicate String_set.empty [] in { maintainer = "contact@tezos.com"; diff --git a/opam/octez-accuser-Proxford.opam b/opam/octez-accuser-Proxford.opam index 8aadfa8cea80c7543ecc3180dc4827a02cc7500f..15d5c0888643796696928a24a4c768f001c2f3f1 100644 --- a/opam/octez-accuser-Proxford.opam +++ b/opam/octez-accuser-Proxford.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" "tezos-client-commands" diff --git a/opam/octez-accuser-PtNairob.opam b/opam/octez-accuser-PtNairob.opam index 01723b8b52f6709d8ea0b4444de47dc7e5a4fce4..35b3388c81728d92f61b1a377c63f8bc0673268a 100644 --- a/opam/octez-accuser-PtNairob.opam +++ b/opam/octez-accuser-PtNairob.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" "tezos-client-commands" diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam index 5de99b33dd15e204bf255debe7185ab4ada68ab4..2ab6daa9abe9d7aa25ea4f04d7fb5a1d1622734a 100644 --- a/opam/octez-accuser-alpha.opam +++ b/opam/octez-accuser-alpha.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-commands" diff --git a/opam/octez-aplonk.opam b/opam/octez-aplonk.opam deleted file mode 100644 index 5837ccbbb040999648dc4f88167a1bf4243e481d..0000000000000000000000000000000000000000 --- a/opam/octez-aplonk.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_repr" { >= "0.6.0" } - "octez-plonk" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Zero-knowledge proving system based on PlonK optimized for proofs aggregation" diff --git a/opam/octez-baker-Proxford.opam b/opam/octez-baker-Proxford.opam index 299ede47035581e9c067ee6b04ce45e708ef03fa..40d68ed7c3c3b38ccc9edf6b4f010b233e6537e9 100644 --- a/opam/octez-baker-Proxford.opam +++ b/opam/octez-baker-Proxford.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" "tezos-client-commands" diff --git a/opam/octez-baker-PtNairob.opam b/opam/octez-baker-PtNairob.opam index d8f8fca7d721bd2e8779b63fc9e4989b3d59cb09..1926b5efce242f0b353e0228df5351aa55832bf3 100644 --- a/opam/octez-baker-PtNairob.opam +++ b/opam/octez-baker-PtNairob.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" "tezos-client-commands" diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam index 14381842e7431048a53c59cc42312692bf9615d2..a72c8cf6bf0a0c6383d8329637a9508ae2f341a3 100644 --- a/opam/octez-baker-alpha.opam +++ b/opam/octez-baker-alpha.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-commands" diff --git a/opam/octez-bls12-381-hash.opam b/opam/octez-bls12-381-hash.opam deleted file mode 100644 index 10151dfdb37390336cb3d9242f5665a4e1dd3103..0000000000000000000000000000000000000000 --- a/opam/octez-bls12-381-hash.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "bls12-381" - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Implementation of some cryptographic hash primitives using the scalar field of BLS12-381" diff --git a/opam/octez-bls12-381-signature.opam b/opam/octez-bls12-381-signature.opam deleted file mode 100644 index c1f8a122530b68f557a89c3acfc12a2ca0716513..0000000000000000000000000000000000000000 --- a/opam/octez-bls12-381-signature.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "bls12-381" - "re" { >= "1.9.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} - "integers_stubs_js" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Implementation of BLS signatures for the pairing-friendly curve BLS12-381" diff --git a/opam/octez-client.opam b/opam/octez-client.opam index a23fc87c4e5bba6d0bbec243ef91cdb1e85aa58a..9416cd18c5e0e17373206a00b0fe8f3cd8536b88 100644 --- a/opam/octez-client.opam +++ b/opam/octez-client.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-client-commands" "tezos-mockup-commands" diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam index 0c7332c46b478a812697e88153ccf4296bec530e..8fa0f003d280f23fd521c158799a8a489144f2bc 100644 --- a/opam/octez-codec.opam +++ b/opam/octez-codec.opam @@ -14,7 +14,6 @@ depends: [ "octez-libs" "tezos-client-base-unix" "tezos-client-base" - "tezos-clic" "tezos-signer-services" "tezos-version" ] diff --git a/opam/octez-dac-client.opam b/opam/octez-dac-client.opam index 70f8b4beb9f837f3753782d37a578441becf66dd..6d74583887a0fed4b48f75ef01d795d9b2ca881a 100644 --- a/opam/octez-dac-client.opam +++ b/opam/octez-dac-client.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam index 43285da97e84734b612fcc42f56c0cd9fa5d9ba7..a9aa92d0c749d249e4912a06b2d324e83d394c44 100644 --- a/opam/octez-dac-node.opam +++ b/opam/octez-dac-node.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index 4c9d544da88ad944cd2681404d07b5c51eeb3c3c..85cd75a8010359c7d2a736d3eedf538f6c24a034 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -20,7 +20,6 @@ depends: [ "tezos-dal-node-services" "tezos-layer2-store" "tezos-store" - "tezos-gossipsub" "irmin-pack" { >= "3.7.2" & < "3.8.0" } "irmin" { >= "3.7.2" & < "3.8.0" } "prometheus-app" { >= "1.2" } diff --git a/opam/octez-distributed-plonk.opam b/opam/octez-distributed-plonk.opam deleted file mode 100644 index 2d2e2276589e47b0c33221a65a882870cea1b3d9..0000000000000000000000000000000000000000 --- a/opam/octez-distributed-plonk.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_repr" { >= "0.6.0" } - "octez-aplonk" - "octez-plonk" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Distributed version of the proving system" diff --git a/opam/octez-epoxy-tx.opam b/opam/octez-epoxy-tx.opam deleted file mode 100644 index 37984656a8c2ebefc77444416249230976bb6b0a..0000000000000000000000000000000000000000 --- a/opam/octez-epoxy-tx.opam +++ /dev/null @@ -1,25 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-plompiler" - "hex" { >= "1.3.0" } - "stdint" - "octez-plonk" - "octez-mec" - "octez-aplonk" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Circuits for transaction Epoxy rollup" diff --git a/opam/octez-evm-proxy.opam b/opam/octez-evm-proxy.opam index 71f9148655bb178cda96e757378f61dea5e716ae..54bec7a26b4ec1950a22a4b156779cc3f4e436e0 100644 --- a/opam/octez-evm-proxy.opam +++ b/opam/octez-evm-proxy.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-version" "octez-evm-proxy-lib" ] diff --git a/opam/octez-evm-upgrade-signer.opam b/opam/octez-evm-upgrade-signer.opam index f2e496cbdf3a50c9be009938dc3f26737fb225df..c7a425372298869c13a68eee776e2f6deb200646 100644 --- a/opam/octez-evm-upgrade-signer.opam +++ b/opam/octez-evm-upgrade-signer.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "octez-evm-proxy-lib" ] build: [ diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index ee1e5de84ddb973922e4c06f968ae25db70fb2e8..2295a2b635fc2efe44a95e6129f0237d49db26bb 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -2,22 +2,26 @@ # Edit file manifest/main.ml instead. opam-version: "2.0" maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] +authors: ["Tezos devteam" "WebAssembly Authors"] homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" +license: "Apache-2.0" depends: [ "dune" { >= "3.0" } - "ocaml" { >= "4.14" } + "ocaml" { >= "4.14.1" & < "4.15" } + "uri" { >= "3.1.0" } + "fmt" { >= "0.8.7" } + "qcheck-alcotest" { >= "0.20" } + "lwt" { >= "5.6.0" } + "pure-splitmix" { = "0.3" } + "data-encoding" { >= "0.7.1" & < "1.0.0" } "ppx_expect" "hex" { >= "1.3.0" } "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" - "lwt" { >= "5.6.0" } "aches" { >= "1.0.0" } "seqes" { >= "0.2" } - "data-encoding" { >= "0.7.1" & < "1.0.0" } "lwt-canceler" { >= "0.3" & < "0.4" } "hacl-star" { >= "0.7.1" & < "0.8" } "hacl-star-raw" @@ -26,42 +30,53 @@ depends: [ "ezjsonm" { >= "1.1.0" } "resto" { >= "1.2" } "resto-directory" { >= "1.2" } - "uri" { >= "3.1.0" } - "secp256k1-internal" { >= "0.4.0" } "bls12-381" - "octez-bls12-381-signature" + "re" { >= "1.9.0" } + "secp256k1-internal" { >= "0.4.0" } + "alcotest" { >= "1.5.0" } + "bigarray-compat" + "eqaf" "ppx_repr" { >= "0.6.0" } "bigstringaf" { >= "0.5.0" } - "tezos-test-helpers" - "octez-alcotezt" + "cmdliner" { >= "1.1.0" } "base-unix" + "ppx_deriving" + "repr" + "stdint" + "logs" + "octez-distributed-lwt-internal" + "octez-alcotezt" "aches-lwt" { >= "1.0.0" } "ipaddr" { >= "5.0.0" & < "6.0.0" } - "re" { >= "1.9.0" } "ptime" { >= "1.1.0" } "mtime" { >= "1.4.0" & < "2.0.0" } "conf-libev" "uutf" - "qcheck-alcotest" { >= "0.20" } - "ppx_deriving" "lwt-watcher" { = "0.2" } "ringo" { >= "1.0.0" } "prometheus" { >= "1.2" } "tezt" { >= "3.1.1" } - "tezt-performance-regression" "cohttp-lwt-unix" { >= "5.2.0" } "astring" {with-test} + "qcheck-core" {with-test} "irmin" { >= "3.7.2" & < "3.8.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } - "fmt" { >= "0.8.7" } - "logs" + "conf-rust" + "integers" + "integers_stubs_js" + "tezos-rust-libs" { = "1.6" } + "tezos-sapling-parameters" { >= "1.1.0" } + "class_group_vdf" { >= "0.0.4" } "resto-cohttp" { >= "1.2" } "resto-cohttp-client" { >= "1.2" } "resto-cohttp-server" { >= "1.2" } "resto-acl" { >= "1.2" } - "octez-mec" {with-test} "bigstring" {with-test} ] +x-opam-monorepo-opam-provided: [ + "tezos-rust-libs" + "tezos-sapling-parameters" +] conflicts: [ "checkseum" { = "0.5.0" } "hacl_x25519" diff --git a/opam/octez-mec.opam b/opam/octez-mec.opam deleted file mode 100644 index 496daf290edf99014db429ed8bf30b15677aa91d..0000000000000000000000000000000000000000 --- a/opam/octez-mec.opam +++ /dev/null @@ -1,25 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "alcotest" { >= "1.5.0" } - "bls12-381" - "bigarray-compat" - "eqaf" - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Modular Experimental Cryptography library" diff --git a/opam/octez-node.opam b/opam/octez-node.opam index fed2606ab14dcef20b6d5000d7226ccbc30d1dcb..8f1bd14da295df453120e46a820746c60c772b4c 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -16,7 +16,6 @@ depends: [ "tezos-shell" "tezos-store" "tezos-validation" - "tezos-shell-context" "tezos-protocol-updater" "cmdliner" { >= "1.1.0" } "fmt" { >= "0.8.7" } diff --git a/opam/octez-plompiler.opam b/opam/octez-plompiler.opam deleted file mode 100644 index bc28f7683839f3fd90a3e68f59da61d20d8b60d6..0000000000000000000000000000000000000000 --- a/opam/octez-plompiler.opam +++ /dev/null @@ -1,27 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_repr" { >= "0.6.0" } - "ppx_deriving" - "repr" - "stdint" - "hacl-star" { >= "0.7.1" & < "0.8" } - "octez-bls12-381-hash" - "octez-libs" - "octez-mec" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Library to write arithmetic circuits for Plonk" diff --git a/opam/octez-plonk.opam b/opam/octez-plonk.opam deleted file mode 100644 index 07a7b98fac456e63ad0829e62c3d7a9c69908d28..0000000000000000000000000000000000000000 --- a/opam/octez-plonk.opam +++ /dev/null @@ -1,29 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_repr" { >= "0.6.0" } - "repr" - "hacl-star" { >= "0.7.1" & < "0.8" } - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "octez-libs" - "octez-plompiler" - "logs" - "octez-distributed-lwt-internal" - "qcheck-alcotest" { >= "0.20" } - "bls12-381" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Plonk zero-knowledge proving system" diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam index c916737ef10b64f769eab453486236b19b1f5a7f..2b732dfdba1bae4850115cd7b763bca10df09049 100644 --- a/opam/octez-protocol-compiler.opam +++ b/opam/octez-protocol-compiler.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-protocol-environment" "lwt" { >= "5.6.0" } "ocp-ocamlres" { >= "0.4" } "base-unix" diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam index 2775d97c5b0e2a6d8595af224e8e12830e0a1989..28c9a9ac0fb0fc34699896c74f112aff2fd1a7be 100644 --- a/opam/octez-proxy-server.opam +++ b/opam/octez-proxy-server.opam @@ -16,7 +16,6 @@ depends: [ "lwt" { >= "5.6.0" } "tezos-proxy" "tezos-proxy-server-config" - "tezos-shell-context" "tezos-version" "uri" { >= "3.1.0" } ] diff --git a/opam/octez-signer.opam b/opam/octez-signer.opam index 8c57e94fa9eb49746a43bb1d9266ac2aff496429..7276f2211dd47bd54e4367ef91258e37f11402da 100644 --- a/opam/octez-signer.opam +++ b/opam/octez-signer.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-client-Proxford.opam b/opam/octez-smart-rollup-client-Proxford.opam index 135ba07b270033036df817147cb2dcf9cd237cf3..f8e80071df13a8513047ffaad8a73c2128175688 100644 --- a/opam/octez-smart-rollup-client-Proxford.opam +++ b/opam/octez-smart-rollup-client-Proxford.opam @@ -19,7 +19,6 @@ depends: [ "octez-smart-rollup" "tezos-smart-rollup-018-Proxford" "tezos-smart-rollup-layer2-018-Proxford" - "tezos-clic" "tezos-version" ] build: [ diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam index 5e6b233aec34112c8c5737cde1087a2d826e017c..1de22e4f4889cf93aeb833bbcac0bd56c6741aa2 100644 --- a/opam/octez-smart-rollup-client-PtNairob.opam +++ b/opam/octez-smart-rollup-client-PtNairob.opam @@ -19,7 +19,6 @@ depends: [ "octez-smart-rollup" "tezos-smart-rollup-017-PtNairob" "tezos-smart-rollup-layer2-017-PtNairob" - "tezos-clic" "tezos-version" ] build: [ diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam index f08808bba3700be98c10a42bcc1f95d66395b2e8..8f57380aff34fde86a5ab167b7aee1dcdfb80fd4 100644 --- a/opam/octez-smart-rollup-client-alpha.opam +++ b/opam/octez-smart-rollup-client-alpha.opam @@ -19,7 +19,6 @@ depends: [ "octez-smart-rollup" "tezos-smart-rollup-alpha" "tezos-smart-rollup-layer2-alpha" - "tezos-clic" "tezos-version" ] build: [ diff --git a/opam/octez-smart-rollup-node-Proxford.opam b/opam/octez-smart-rollup-node-Proxford.opam index a0a2ba017c76513b598033a8993426b2d56723e1..5badc529bcdb5e9c351d56f4227d8e602a9f61f7 100644 --- a/opam/octez-smart-rollup-node-Proxford.opam +++ b/opam/octez-smart-rollup-node-Proxford.opam @@ -34,10 +34,8 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-scoru-wasm" "tezos-scoru-wasm-fast" "tezos-version" - "tezos-clic" "tezos-client-commands" ] conflicts: [ diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam index 4cf66490dff42d8f126383d67e0c316da49cf74c..d53b4c4c1bf8abb60342a324c6c0e96085bc5bb1 100644 --- a/opam/octez-smart-rollup-node-PtNairob.opam +++ b/opam/octez-smart-rollup-node-PtNairob.opam @@ -32,10 +32,8 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-scoru-wasm" "tezos-scoru-wasm-fast" "tezos-version" - "tezos-clic" "tezos-client-commands" ] conflicts: [ diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index 1aef3018f27a8e79fd408e93a76281ff5cc07211..ceccf5bc7a91ddf93ed0d59b3c6185e8b648bc6d 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -34,10 +34,8 @@ depends: [ "aches-lwt" { >= "1.0.0" } "octez-injector" "octez-smart-rollup-node-lib" - "tezos-scoru-wasm" "tezos-scoru-wasm-fast" "tezos-version" - "tezos-clic" "tezos-client-commands" ] conflicts: [ diff --git a/opam/octez-smart-rollup-node.opam b/opam/octez-smart-rollup-node.opam index 42c1eb23c955ed57c5d6f5852f6876a25183f739..3f1c2a66c690e6f35217408a4cdc7f81b2a4ac9c 100644 --- a/opam/octez-smart-rollup-node.opam +++ b/opam/octez-smart-rollup-node.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-sequencer-node.opam b/opam/octez-smart-rollup-sequencer-node.opam index e0fb435b24d1520b26748fb3fa51b36b330d0cec..087fe6c3a87b277a7940a07c03c35d644a7c9a09 100644 --- a/opam/octez-smart-rollup-sequencer-node.opam +++ b/opam/octez-smart-rollup-sequencer-node.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/octez-smart-rollup-wasm-benchmark-lib.opam b/opam/octez-smart-rollup-wasm-benchmark-lib.opam index f6bc4dd9fc79a227fa83f1786ae4baddf0938f9a..95e1b1b7610950ea21279bb91e4edc78928364c5 100644 --- a/opam/octez-smart-rollup-wasm-benchmark-lib.opam +++ b/opam/octez-smart-rollup-wasm-benchmark-lib.opam @@ -13,8 +13,6 @@ depends: [ "ppx_deriving" "octez-libs" "tezt" { >= "3.1.1" } - "tezos-webassembly-interpreter" - "tezos-scoru-wasm" "tezos-scoru-wasm-helpers" "lwt" { >= "5.6.0" } ] diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam index c6bd99bb66b1936c0f13bc5072fdaad178e2ea91..8a1aab19137882976c41284a75802db41ca35ecb 100644 --- a/opam/octez-smart-rollup-wasm-debugger.opam +++ b/opam/octez-smart-rollup-wasm-debugger.opam @@ -11,12 +11,9 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "yaml" { >= "3.1.0" } "tezos-client-alpha" - "tezos-scoru-wasm" "tezos-scoru-wasm-helpers" - "tezos-webassembly-interpreter" "tezos-webassembly-interpreter-extra" "tezos-version" ] diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam index 6a69654555bc0a6c98773adebfa4b447d87afcc0..e0d4517c5b3fa546ee702bbdb8ce5af3aba86dc9 100644 --- a/opam/octez-snoop.opam +++ b/opam/octez-snoop.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-benchmark" "tezos-benchmark-examples" "tezos-shell-benchmarks" diff --git a/opam/octez-srs-extraction.opam b/opam/octez-srs-extraction.opam deleted file mode 100644 index 8cb8af2096b378443fde0bec4e5ee8da19aaae82..0000000000000000000000000000000000000000 --- a/opam/octez-srs-extraction.opam +++ /dev/null @@ -1,26 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "bls12-381" - "octez-libs" - "cmdliner" { >= "1.1.0" } - "base-unix" - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Extracts SRS for G1 and G2 from powers-of-tau generated by the ZCash and -Filecoin MPC ceremonies" diff --git a/opam/scoru-sequencer-test.opam b/opam/scoru-sequencer-test.opam index 36037ee5accbf193b054a7f538d44fe080389528..56e1d78ac346e4f13e0a24f95d616057efdded77 100644 --- a/opam/scoru-sequencer-test.opam +++ b/opam/scoru-sequencer-test.opam @@ -14,7 +14,6 @@ depends: [ "octez-libs" {with-test} "tezos-protocol-alpha" {with-test} "octez-smart-rollup-sequencer" {with-test} - "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-017-PtNairob-test-helpers.opam b/opam/tezos-017-PtNairob-test-helpers.opam index 493b25f5d2ff50fead92ae525946f32b0884621e..1c0dc011b687c5c704b7c62a9a71ecb8d56f1291 100644 --- a/opam/tezos-017-PtNairob-test-helpers.opam +++ b/opam/tezos-017-PtNairob-test-helpers.opam @@ -11,13 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "qcheck-alcotest" { >= "0.20" } - "tezos-test-helpers" "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" - "tezos-protocol-environment" "tezos-protocol-plugin-017-PtNairob" - "octez-plompiler" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-018-Proxford-test-helpers.opam b/opam/tezos-018-Proxford-test-helpers.opam index c42d6a640783dd0486ce31fb2732a38960ffd8de..4466d5d2adbac773049f4d346831ff5af03f8f32 100644 --- a/opam/tezos-018-Proxford-test-helpers.opam +++ b/opam/tezos-018-Proxford-test-helpers.opam @@ -11,13 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "qcheck-alcotest" { >= "0.20" } - "tezos-test-helpers" "octez-libs" "tezos-protocol-018-Proxford" "tezos-client-018-Proxford" - "tezos-protocol-environment" "tezos-protocol-plugin-018-Proxford" - "octez-plompiler" "tezos-smart-rollup-018-Proxford" ] build: [ diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam index 8e7f01e55b4b54aee66026c2ab56b75e32a923d2..50d55b2c8674e11f703ae87f5b9ccf770fc0bd59 100644 --- a/opam/tezos-alpha-test-helpers.opam +++ b/opam/tezos-alpha-test-helpers.opam @@ -11,13 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "qcheck-alcotest" { >= "0.20" } - "tezos-test-helpers" "octez-libs" "tezos-protocol-alpha" "tezos-client-alpha" - "tezos-protocol-environment" "tezos-protocol-plugin-alpha" - "octez-plompiler" "tezos-smart-rollup-alpha" ] build: [ diff --git a/opam/tezos-baking-017-PtNairob-commands.opam b/opam/tezos-baking-017-PtNairob-commands.opam index ffb73c3163304018fc2b8d48404affdcedbdc024..393bb6ebbc3d1078e2199e197cc8b4d1eec54480 100644 --- a/opam/tezos-baking-017-PtNairob-commands.opam +++ b/opam/tezos-baking-017-PtNairob-commands.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-017-PtNairob" - "tezos-protocol-environment" "tezos-client-base" "tezos-client-017-PtNairob" "tezos-client-commands" diff --git a/opam/tezos-baking-017-PtNairob.opam b/opam/tezos-baking-017-PtNairob.opam index 944abd7acd45be19439ab38f9ea5ec269425c366..54cce7f24fd7bbc3dd9c4c72c074d34bd4833ebd 100644 --- a/opam/tezos-baking-017-PtNairob.opam +++ b/opam/tezos-baking-017-PtNairob.opam @@ -11,15 +11,12 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-version" "tezos-protocol-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" - "tezos-protocol-environment" "tezos-client-base" "tezos-client-017-PtNairob" "tezos-client-commands" - "tezos-shell-context" "tezos-context-ops" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } diff --git a/opam/tezos-baking-018-Proxford-commands.opam b/opam/tezos-baking-018-Proxford-commands.opam index 60956cdc148836cf434650f6579815d4c56c1a7c..05aa41bcb1a0b266880fdc590fb78ddc9c638924 100644 --- a/opam/tezos-baking-018-Proxford-commands.opam +++ b/opam/tezos-baking-018-Proxford-commands.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-018-Proxford" - "tezos-protocol-environment" "tezos-client-base" "tezos-client-018-Proxford" "tezos-client-commands" diff --git a/opam/tezos-baking-018-Proxford.opam b/opam/tezos-baking-018-Proxford.opam index 5643cf0e1a1725b42e8e1817b81389fb6da51401..d5d71f06cc1005f92175ba1d012d8508da534147 100644 --- a/opam/tezos-baking-018-Proxford.opam +++ b/opam/tezos-baking-018-Proxford.opam @@ -11,15 +11,12 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-version" "tezos-protocol-018-Proxford" "tezos-protocol-plugin-018-Proxford" - "tezos-protocol-environment" "tezos-client-base" "tezos-client-018-Proxford" "tezos-client-commands" - "tezos-shell-context" "tezos-context-ops" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam index 723860825a1cfdadb21707f7a41e85e7daaac099..85dd1b3358060344befb0ba0644905f83bef25c9 100644 --- a/opam/tezos-baking-alpha-commands.opam +++ b/opam/tezos-baking-alpha-commands.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-protocol-alpha" - "tezos-protocol-environment" "tezos-client-base" "tezos-client-alpha" "tezos-client-commands" diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index 0d3cf3a1e3a5980c6e3ff890895d96ce7d2ad2bc..1f9cda0f66a7cef9d1b461fc9fa9d5a65d61bd49 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -11,15 +11,12 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-version" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" - "tezos-protocol-environment" "tezos-client-base" "tezos-client-alpha" "tezos-client-commands" - "tezos-shell-context" "tezos-context-ops" "tezos-dal-node-services" "lwt-canceler" { >= "0.3" & < "0.4" } diff --git a/opam/tezos-benchmark.opam b/opam/tezos-benchmark.opam index 5d24d8fd39d9cf8877ede6fe03331a21b6129ba2..747f63bc6e4d27968828eb4b990a5aa96ba78f36 100644 --- a/opam/tezos-benchmark.opam +++ b/opam/tezos-benchmark.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "data-encoding" { >= "0.7.1" & < "1.0.0" } "prbnmcn-linalg" { = "0.0.1" } "prbnmcn-stats" { = "0.0.6" } diff --git a/opam/tezos-benchmarks-proto-017-PtNairob.opam b/opam/tezos-benchmarks-proto-017-PtNairob.opam index 51a70b39aac21e0c2092af79aff6a85dede695de..cfd6fa020449a1d9e5b265c46c676861409f008d 100644 --- a/opam/tezos-benchmarks-proto-017-PtNairob.opam +++ b/opam/tezos-benchmarks-proto-017-PtNairob.opam @@ -17,10 +17,8 @@ depends: [ "tezos-benchmark-type-inference-017-PtNairob" "tezos-shell-benchmarks" "tezos-017-PtNairob-test-helpers" - "tezos-sapling" "tezos-client-017-PtNairob" "tezos-protocol-plugin-017-PtNairob" - "tezos-protocol-environment" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-benchmarks-proto-018-Proxford.opam b/opam/tezos-benchmarks-proto-018-Proxford.opam index 761dcc2648c89511377a0c2d17144c985955ae56..77051822a6a439b5554d4701e5ece8719fb1a015 100644 --- a/opam/tezos-benchmarks-proto-018-Proxford.opam +++ b/opam/tezos-benchmarks-proto-018-Proxford.opam @@ -17,10 +17,8 @@ depends: [ "tezos-benchmark-type-inference-018-Proxford" "tezos-shell-benchmarks" "tezos-018-Proxford-test-helpers" - "tezos-sapling" "tezos-client-018-Proxford" "tezos-protocol-plugin-018-Proxford" - "tezos-protocol-environment" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam index 475729d4ddb0c186fb211aab0d7b3b3f96ec2577..8426e139996bb4a054364c257e27f0a0c74b9653 100644 --- a/opam/tezos-benchmarks-proto-alpha.opam +++ b/opam/tezos-benchmarks-proto-alpha.opam @@ -17,10 +17,8 @@ depends: [ "tezos-benchmark-type-inference-alpha" "tezos-shell-benchmarks" "tezos-alpha-test-helpers" - "tezos-sapling" "tezos-client-alpha" "tezos-protocol-plugin-alpha" - "tezos-protocol-environment" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam deleted file mode 100644 index 0dda5d27b955a0f611456b195f35e44fe09728c1..0000000000000000000000000000000000000000 --- a/opam/tezos-clic.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "lwt" { >= "5.6.0" } - "re" { >= "1.9.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: library of auto-documented command-line-parsing combinators" diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam index 8ee3de7abffa74b29283560a32cfdb887ce9c837..971803d0843ffa5d881e68a8c611739dc3127d78 100644 --- a/opam/tezos-client-000-Ps9mPmXa.opam +++ b/opam/tezos-client-000-Ps9mPmXa.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-000-Ps9mPmXa" "tezos-client-commands" diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index aaa91cadfcd17542e2ad27636345183bff2a571a..aba7880bd13ce59ebf2245159e1ce635bfab5402 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -11,12 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-001-PtCJ7pwo" "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" ] build: [ diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index e26ec4903004eb995cdf841221826db56c4bbe38..a74eb816f4786be75838df786f892e0c8723456f 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -11,12 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-002-PsYLVpVv" "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" ] build: [ diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index 3fac546eb2312b6893b8a6afcf809a307d7b7604..791066ab4b3db4502a28c252823a692e1491b02c 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -11,12 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-003-PsddFKi3" "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" ] build: [ diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index 922f7dbe81de1e2518caaab4c9eb4f5f09c77e21..0e7e81c486e3299a157c5057cdfbf2fb23b7a197 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -11,12 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-004-Pt24m4xi" "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" ] build: [ diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index fba4ce62824c7b3c38226ed800c96954e8b87dad..6045bdba4b884c3041e7070b65de7841845de086 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -11,12 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-005-PsBabyM1" "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" ] build: [ diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index f5002f4655aba98f2bbd71d20020b05ef2aae024..f322c3d8d98ddd51fe32a17a8e934d0d2a0b5268 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -11,12 +11,10 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-006-PsCARTHA" "tezos-signer-backends" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" ] build: [ diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index 14d48487e5bb46b6768994986668c01cc8f4d521..756f628268fe0c40dbe465f9ed60e9f8897faf61 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -11,13 +11,11 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-007-PsDELPH1" "tezos-signer-backends" "tezos-protocol-plugin-007-PsDELPH1" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" ] build: [ diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index 0b475eb22efb75be2adf4e388a17c99bb563ba76..37a649232cda9729e1692f743ac5192db0d88164 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -11,13 +11,11 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-008-PtEdo2Zk" "tezos-signer-backends" "tezos-protocol-plugin-008-PtEdo2Zk" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" ] build: [ diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index d9dd51ffb676dd84102608fc48bc6634b89aa857..06781b88a5aeac6f0ac9187b572f4e7844d9bbbd 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -12,13 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-009-PsFLoren" "tezos-signer-backends" "tezos-protocol-plugin-009-PsFLoren" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" "tezos-client-base-unix" ] diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index 13bf0f978c73f0a214ca307a17a6ea50e674a2db..61bcb9a8abb0eabf9c33008e9d7b71c222528a64 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -12,13 +12,11 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-010-PtGRANAD" "tezos-signer-backends" "tezos-protocol-plugin-010-PtGRANAD" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-client-commands" "tezos-client-base-unix" ] diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index af40322c323500fc009741c6765e4b792f335b1c..292bd68e564c687329fa9412c513c05212169c5c 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-011-PtHangz2" "tezos-mockup-registration" @@ -20,7 +19,6 @@ depends: [ "tezos-signer-backends" "tezos-protocol-plugin-011-PtHangz2" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index 6d1fae62afa9fe76eeed0e127e5f00de04ab8011..d45d2fc33ddc1f89a90cb57a2b30dd3e216ae09f 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-012-Psithaca" "tezos-mockup-registration" @@ -20,7 +19,6 @@ depends: [ "tezos-signer-backends" "tezos-protocol-plugin-012-Psithaca" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index d462dd23343d713fe23a7042f32aaf28bafcf39f..59c6912fc9811c1dfcca0019b432b63cddf949c1 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-013-PtJakart" "tezos-mockup-registration" @@ -20,7 +19,6 @@ depends: [ "tezos-signer-backends" "tezos-protocol-plugin-013-PtJakart" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam index b59cc71c80099a06599ba11d6e6b7ed221f807ed..922210220b2d7b94875fbb49d1539c643d0383f2 100644 --- a/opam/tezos-client-014-PtKathma.opam +++ b/opam/tezos-client-014-PtKathma.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-014-PtKathma" "tezos-mockup-registration" @@ -20,7 +19,6 @@ depends: [ "tezos-signer-backends" "tezos-protocol-plugin-014-PtKathma" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" diff --git a/opam/tezos-client-015-PtLimaPt.opam b/opam/tezos-client-015-PtLimaPt.opam index 037013d2e551422af0b96d261b071fcc67f7056c..e34a3b3a673442502f6728edad0cc7892a588d0e 100644 --- a/opam/tezos-client-015-PtLimaPt.opam +++ b/opam/tezos-client-015-PtLimaPt.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-015-PtLimaPt" "tezos-mockup-registration" @@ -20,7 +19,6 @@ depends: [ "tezos-signer-backends" "tezos-protocol-plugin-015-PtLimaPt" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" diff --git a/opam/tezos-client-016-PtMumbai.opam b/opam/tezos-client-016-PtMumbai.opam index 8874ff1cb46a10be31d07e3ece600df64c3e977f..010a18f5d99eb884a3ff448ad9f4aee73f3b1406 100644 --- a/opam/tezos-client-016-PtMumbai.opam +++ b/opam/tezos-client-016-PtMumbai.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-016-PtMumbai" "tezos-mockup-registration" @@ -21,7 +20,6 @@ depends: [ "tezos-protocol-plugin-016-PtMumbai" "tezos-smart-rollup-016-PtMumbai" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" diff --git a/opam/tezos-client-017-PtNairob.opam b/opam/tezos-client-017-PtNairob.opam index b400051b56753b6fbc1b9c24d880f8eb62afd766..2327afcd7386e710345278ead4de81d76ee3434f 100644 --- a/opam/tezos-client-017-PtNairob.opam +++ b/opam/tezos-client-017-PtNairob.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-017-PtNairob" "tezos-mockup-registration" @@ -21,13 +20,11 @@ depends: [ "tezos-protocol-plugin-017-PtNairob" "tezos-smart-rollup-017-PtNairob" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" "tezt" { with-test & >= "3.1.1" } - "tezos-test-helpers" {with-test} "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } ] diff --git a/opam/tezos-client-018-Proxford.opam b/opam/tezos-client-018-Proxford.opam index 6315f8bf82093290a15694ef40f225cf41f5a5bc..c17f227954939014af301fc4f1f5dc4dd0a9b1e8 100644 --- a/opam/tezos-client-018-Proxford.opam +++ b/opam/tezos-client-018-Proxford.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-018-Proxford" "tezos-mockup-registration" @@ -21,13 +20,11 @@ depends: [ "tezos-protocol-plugin-018-Proxford" "tezos-smart-rollup-018-Proxford" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" "tezt" { with-test & >= "3.1.1" } - "tezos-test-helpers" {with-test} "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } ] diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index 773a3a18907258caef40af094858911a32f4ddcb..76ea94db48893074b0d1c8a565213f988133a3d8 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "ppx_expect" "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-protocol-alpha" "tezos-mockup-registration" @@ -21,13 +20,11 @@ depends: [ "tezos-protocol-plugin-alpha" "tezos-smart-rollup-alpha" "uri" { >= "3.1.0" } - "tezos-protocol-environment" "tezos-mockup" "tezos-mockup-commands" "tezos-client-commands" "tezos-client-base-unix" "tezt" { with-test & >= "3.1.1" } - "tezos-test-helpers" {with-test} "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } ] diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam index 44e1309e5396e011ba0f681714d9474bc30fd8e0..99557f41d36ed5ca3be85ebfe1094b26865bca66 100644 --- a/opam/tezos-client-base-unix.opam +++ b/opam/tezos-client-base-unix.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-client-commands" "tezos-mockup" diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam index 75e055188168834e0d6358cfdb0219f72138c6fe..18188b9110bde48face892ffcdbd4c2f5245bb58 100644 --- a/opam/tezos-client-base.opam +++ b/opam/tezos-client-base.opam @@ -11,8 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" - "tezos-sapling" "uri" { >= "3.1.0" } "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} diff --git a/opam/tezos-client-commands.opam b/opam/tezos-client-commands.opam index 616e1a72642f6b9abbcee21dbee6bb7e014addd1..86d3d868cc838af52aa01fc4f5a13d26958dfaa5 100644 --- a/opam/tezos-client-commands.opam +++ b/opam/tezos-client-commands.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-base" "tezos-signer-backends" "data-encoding" { >= "0.7.1" & < "1.0.0" } diff --git a/opam/tezos-client-genesis.opam b/opam/tezos-client-genesis.opam index 25bbf567c840e1e1dd1996930a12000f8fc9bcad..5f34bc3935b9e4909e8f304e096f9cdfaec76330 100644 --- a/opam/tezos-client-genesis.opam +++ b/opam/tezos-client-genesis.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-client-base" - "tezos-protocol-environment" "tezos-protocol-genesis" "tezos-client-commands" "tezos-proxy" diff --git a/opam/tezos-context-ops.opam b/opam/tezos-context-ops.opam index 247970898b2d0764acc5ceefd54b4edb7d35b09b..8ba3e0a60b8d0963679fee1b2cb5f4b57ded6bcb 100644 --- a/opam/tezos-context-ops.opam +++ b/opam/tezos-context-ops.opam @@ -11,8 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-protocol-environment" - "tezos-shell-context" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-dac-lib-test.opam b/opam/tezos-dac-lib-test.opam index 05ba0f64709973fc7b71d24fff7d6c1e042734c2..60d7d4a0e4f2587726a29a21ea6b1c1331b5075b 100644 --- a/opam/tezos-dac-lib-test.opam +++ b/opam/tezos-dac-lib-test.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} - "tezos-test-helpers" {with-test} "tezos-dac-lib" {with-test} "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-dac-node-lib-test.opam b/opam/tezos-dac-node-lib-test.opam index 3fef810d36a66579d7bac8f9ce6950f08101a9b7..08f3e03a097a59c6c82a09132ef8d63fe177d8c8 100644 --- a/opam/tezos-dac-node-lib-test.opam +++ b/opam/tezos-dac-node-lib-test.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} - "tezos-test-helpers" {with-test} "tezos-dac-node-lib" {with-test} "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-dal-node-lib.opam b/opam/tezos-dal-node-lib.opam index 5e7b3c999842299e763855ab59ddf65b68b4fdff..02ccc086761a300200757e7561ebef08d539785a 100644 --- a/opam/tezos-dal-node-lib.opam +++ b/opam/tezos-dal-node-lib.opam @@ -15,7 +15,6 @@ depends: [ "tezos-client-base" "tezos-protocol-updater" "tezos-client-base-unix" - "tezos-gossipsub" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam index 1649a91d3c646586d857e54a771191ef29a03e3e..d56ec153d2d79b4b1f23f14f1249929f9050ddac 100644 --- a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-000-Ps9mPmXa" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam index 8ed178a429d6f77d5591620a7875edb524f2acfe..c06db423741ed09cd74b7f660e85888a4688190b 100644 --- a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-001-PtCJ7pwo" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam index 78b83b105e3edc28e495cb1be5d55fc39fa80a3c..2a6bf0ded8bfbf49cfa28431cd968704657b4a44 100644 --- a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-002-PsYLVpVv" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-003-PsddFKi3.opam b/opam/tezos-embedded-protocol-003-PsddFKi3.opam index 7ec5fe9a13f5b351adb50a37882ef4d13ed6769d..4dbfda0ba4d761259516ea8f3377a0087eed45e8 100644 --- a/opam/tezos-embedded-protocol-003-PsddFKi3.opam +++ b/opam/tezos-embedded-protocol-003-PsddFKi3.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-003-PsddFKi3" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam index 0fc77abdefd2c79b6ceb7dec6aaa77b82b3473fa..02cb3d58953c2ebf8bfe12f8f5b5646ebac528dc 100644 --- a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-004-Pt24m4xi" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-005-PsBABY5H.opam b/opam/tezos-embedded-protocol-005-PsBABY5H.opam index 87633ee732d6da89cb6a22fcfed96986a0477a38..bbc267f77182a3f9ab760dd21540af0c02bc0d77 100644 --- a/opam/tezos-embedded-protocol-005-PsBABY5H.opam +++ b/opam/tezos-embedded-protocol-005-PsBABY5H.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-005-PsBABY5H" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-005-PsBabyM1.opam b/opam/tezos-embedded-protocol-005-PsBabyM1.opam index 38814b98cb2fd7906a3cd46f5c7569c4db63b3e3..6e69a417f5583c18d03171e79040cc7074f3da85 100644 --- a/opam/tezos-embedded-protocol-005-PsBabyM1.opam +++ b/opam/tezos-embedded-protocol-005-PsBabyM1.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-005-PsBabyM1" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-006-PsCARTHA.opam b/opam/tezos-embedded-protocol-006-PsCARTHA.opam index c0b21749be747d90e935a0ba949f5733fc79dec0..b0b70e35e607fbae5f00cbd1b566c8512c1fbc46 100644 --- a/opam/tezos-embedded-protocol-006-PsCARTHA.opam +++ b/opam/tezos-embedded-protocol-006-PsCARTHA.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-006-PsCARTHA" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-007-PsDELPH1.opam b/opam/tezos-embedded-protocol-007-PsDELPH1.opam index 365e6ae15496a9fd623b15b051820322a679d5c4..7343d0f8d749e8cb8b1d30bbb7f59135fb2b735d 100644 --- a/opam/tezos-embedded-protocol-007-PsDELPH1.opam +++ b/opam/tezos-embedded-protocol-007-PsDELPH1.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-007-PsDELPH1" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam index 025862819b6e164c6fdfd51d99fd24fbdb995798..220da24c3c3bbf769258b3e29d809a83aab9b553 100644 --- a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdo2Zk" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-008-PtEdoTez.opam b/opam/tezos-embedded-protocol-008-PtEdoTez.opam index 0113da93ff8c78c8c78a956b36e5da75c1215071..a7c9871e60977f2c7cdb263a213952e5eb8c13ce 100644 --- a/opam/tezos-embedded-protocol-008-PtEdoTez.opam +++ b/opam/tezos-embedded-protocol-008-PtEdoTez.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-008-PtEdoTez" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-009-PsFLoren.opam b/opam/tezos-embedded-protocol-009-PsFLoren.opam index 0921ea850d6bc678210910b5d0eed775cb0d2b88..e215b0a269686c4d2aff3d7db2b454a3a125fc68 100644 --- a/opam/tezos-embedded-protocol-009-PsFLoren.opam +++ b/opam/tezos-embedded-protocol-009-PsFLoren.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-009-PsFLoren" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-010-PtGRANAD.opam b/opam/tezos-embedded-protocol-010-PtGRANAD.opam index f4f2cb8655cad8fa42ad81dde2b51b6a6853a8d1..c46a44e254f91a324cc224f0a35f5ae668e165f7 100644 --- a/opam/tezos-embedded-protocol-010-PtGRANAD.opam +++ b/opam/tezos-embedded-protocol-010-PtGRANAD.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-010-PtGRANAD" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-011-PtHangz2.opam b/opam/tezos-embedded-protocol-011-PtHangz2.opam index c42db712afb24be8fcae4ea78c5b05f202921cdf..e52733a6beac041653496eca7646c3157c641a5e 100644 --- a/opam/tezos-embedded-protocol-011-PtHangz2.opam +++ b/opam/tezos-embedded-protocol-011-PtHangz2.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-011-PtHangz2" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-012-Psithaca.opam b/opam/tezos-embedded-protocol-012-Psithaca.opam index 86b6e8a1492ffef034bad1f7bbedce6efe562ba8..ebdea67427abe2448af9b4dc20c433d4b987ad66 100644 --- a/opam/tezos-embedded-protocol-012-Psithaca.opam +++ b/opam/tezos-embedded-protocol-012-Psithaca.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-012-Psithaca" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-013-PtJakart.opam b/opam/tezos-embedded-protocol-013-PtJakart.opam index 1073048fb63328d9dc007d1cbe8dd24a48dff1ab..5df1a4ebf7a7baa0514e11cffd175d96e85331c4 100644 --- a/opam/tezos-embedded-protocol-013-PtJakart.opam +++ b/opam/tezos-embedded-protocol-013-PtJakart.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-013-PtJakart" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-014-PtKathma.opam b/opam/tezos-embedded-protocol-014-PtKathma.opam index 212b279f442aacb9db606dbabb6a12493dff6bf2..95141cf85d3c44d820ba106eb6b1c6cd3489454d 100644 --- a/opam/tezos-embedded-protocol-014-PtKathma.opam +++ b/opam/tezos-embedded-protocol-014-PtKathma.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-014-PtKathma" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-015-PtLimaPt.opam b/opam/tezos-embedded-protocol-015-PtLimaPt.opam index b3138f154fe31b7a60d9537f17ae5e633fb3e4ff..3813e81e193efc7c098a7e1ab2f34b7231bbbce2 100644 --- a/opam/tezos-embedded-protocol-015-PtLimaPt.opam +++ b/opam/tezos-embedded-protocol-015-PtLimaPt.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-015-PtLimaPt" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-016-PtMumbai.opam b/opam/tezos-embedded-protocol-016-PtMumbai.opam index 18f4669f077e8dfa52e8bf1a8253a13c6d846f22..7cc9e2548853207bcc75412205d82d8b83b2a918 100644 --- a/opam/tezos-embedded-protocol-016-PtMumbai.opam +++ b/opam/tezos-embedded-protocol-016-PtMumbai.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-016-PtMumbai" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-017-PtNairob.opam b/opam/tezos-embedded-protocol-017-PtNairob.opam index eae5b0864d4a032c22b59a6f8843f7caa1b4aa34..2521c908bd8ad8f5a2fa223fd2e1a9e7168c5ff3 100644 --- a/opam/tezos-embedded-protocol-017-PtNairob.opam +++ b/opam/tezos-embedded-protocol-017-PtNairob.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-017-PtNairob" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-018-Proxford.opam b/opam/tezos-embedded-protocol-018-Proxford.opam index 7e97403038db6b0fde1858ddf2e91cff84dd27c2..542db25e7f7a1b944353a0202693fb549d2e2fc8 100644 --- a/opam/tezos-embedded-protocol-018-Proxford.opam +++ b/opam/tezos-embedded-protocol-018-Proxford.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-018-Proxford" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-alpha.opam b/opam/tezos-embedded-protocol-alpha.opam index 7ec701a4c104a1da8c6ef71f03106937ebd2f57b..b6192c933feef9b90f791b2db4d51d0710304d63 100644 --- a/opam/tezos-embedded-protocol-alpha.opam +++ b/opam/tezos-embedded-protocol-alpha.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-alpha" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-demo-counter.opam b/opam/tezos-embedded-protocol-demo-counter.opam index 55758942e39e5ea77904b5d773c8730a048d5160..71b5f72c9a072386b41354e08b83d3cb10140c57 100644 --- a/opam/tezos-embedded-protocol-demo-counter.opam +++ b/opam/tezos-embedded-protocol-demo-counter.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-demo-counter" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-demo-noops.opam b/opam/tezos-embedded-protocol-demo-noops.opam index 8d5e0e2ce7d024a8c7fbd3e0fff65c035103af8d..26b6f04e122484b8693e1850dda940742bca1054 100644 --- a/opam/tezos-embedded-protocol-demo-noops.opam +++ b/opam/tezos-embedded-protocol-demo-noops.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-demo-noops" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-embedded-protocol-genesis.opam b/opam/tezos-embedded-protocol-genesis.opam index 6d389d190e196bbe39feab3e069807875e1be0eb..94ef78323d2357b950d6458d8cf0805f8c902215 100644 --- a/opam/tezos-embedded-protocol-genesis.opam +++ b/opam/tezos-embedded-protocol-genesis.opam @@ -12,7 +12,7 @@ depends: [ "ocaml" { >= "4.14" } "tezos-protocol-genesis" "tezos-protocol-updater" - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-expect-helper.opam b/opam/tezos-expect-helper.opam deleted file mode 100644 index fb30ea0ddbe4050f65bcd02b3d794275390dc0e0..0000000000000000000000000000000000000000 --- a/opam/tezos-expect-helper.opam +++ /dev/null @@ -1,20 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_expect" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: helper for writing expect tests for Tezos" diff --git a/opam/tezos-gossipsub-test.opam b/opam/tezos-gossipsub-test.opam deleted file mode 100644 index 91f976a50f5aebc6f566b1849736a5ccc1cc0949..0000000000000000000000000000000000000000 --- a/opam/tezos-gossipsub-test.opam +++ /dev/null @@ -1,25 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "fmt" { with-test & >= "0.8.7" } - "octez-libs" {with-test} - "tezos-gossipsub" {with-test} - "tezt" { with-test & >= "3.1.1" } - "qcheck-core" {with-test} - "tezos-test-helpers" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tests for the gossipsub algorithm" diff --git a/opam/tezos-gossipsub.opam b/opam/tezos-gossipsub.opam deleted file mode 100644 index de3a677355291120dc05013552e27a643378565d..0000000000000000000000000000000000000000 --- a/opam/tezos-gossipsub.opam +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ringo" { >= "1.0.0" } - "aches" { >= "1.0.0" } - "fmt" { >= "0.8.7" } - "octez-libs" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: An implementation of gossipsub" diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam index d43e1c8c38df5910b210ca5f70b87a0a0b2f54e3..bd1379292c6d39a81c40aaaf0f1f0f96cb8d551a 100644 --- a/opam/tezos-mockup-commands.opam +++ b/opam/tezos-mockup-commands.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-clic" "tezos-client-commands" "tezos-client-base" "tezos-mockup" diff --git a/opam/tezos-mockup-proxy.opam b/opam/tezos-mockup-proxy.opam index c64c35025f4f17c7ffc72b7a3529a22070c9048d..b2a1f730cd50fa531de8fbffc7d1023c74835e46 100644 --- a/opam/tezos-mockup-proxy.opam +++ b/opam/tezos-mockup-proxy.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-client-base" - "tezos-protocol-environment" "resto-cohttp-self-serving-client" { >= "1.2" } "uri" { >= "3.1.0" } ] diff --git a/opam/tezos-mockup-registration.opam b/opam/tezos-mockup-registration.opam index 1c900903096a1b35889ab8184e40f35139eacbd4..b4af0cfd77af6320ae0d7b65849f52969ff16bd0 100644 --- a/opam/tezos-mockup-registration.opam +++ b/opam/tezos-mockup-registration.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-client-base" - "tezos-protocol-environment" "uri" { >= "3.1.0" } ] build: [ diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam index 23da00941e6498c10accd9e4570ba3fe51a7e575..7b927a4a6dbc60a7a8dcd5f48cda8b23cdeb5543 100644 --- a/opam/tezos-mockup.opam +++ b/opam/tezos-mockup.opam @@ -14,10 +14,8 @@ depends: [ "tezos-client-base" "tezos-mockup-proxy" "resto-cohttp-self-serving-client" { >= "1.2" } - "tezos-protocol-environment" "tezos-mockup-registration" "tezt" { with-test & >= "3.1.1" } - "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-protocol-000-Ps9mPmXa.opam b/opam/tezos-protocol-000-Ps9mPmXa.opam index 699f3b6edcf913ffca9d8dc099dba53d817f3915..6508d19384d0d86d4f75fe205b25af41341371f4 100644 --- a/opam/tezos-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-protocol-000-Ps9mPmXa.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-001-PtCJ7pwo.opam b/opam/tezos-protocol-001-PtCJ7pwo.opam index 8114ad316ef1b2963a58729239234094380f8b7a..e9b75c8768ecf92921367bcf7f8694491082b3d6 100644 --- a/opam/tezos-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-protocol-001-PtCJ7pwo.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-002-PsYLVpVv.opam b/opam/tezos-protocol-002-PsYLVpVv.opam index fd42129068dd9a5654d04e09cac97b8f17d297b1..9f358ea2cae2be0de8200aebb227b4930305a630 100644 --- a/opam/tezos-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-protocol-002-PsYLVpVv.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-003-PsddFKi3.opam b/opam/tezos-protocol-003-PsddFKi3.opam index 9192c8ed3e337dc02c4fa0a6974667de39579184..114213d699b709a1cbc1c85d532eca92bc96092b 100644 --- a/opam/tezos-protocol-003-PsddFKi3.opam +++ b/opam/tezos-protocol-003-PsddFKi3.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-004-Pt24m4xi.opam b/opam/tezos-protocol-004-Pt24m4xi.opam index 2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-protocol-004-Pt24m4xi.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-005-PsBABY5H.opam b/opam/tezos-protocol-005-PsBABY5H.opam index 2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-005-PsBABY5H.opam +++ b/opam/tezos-protocol-005-PsBABY5H.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-005-PsBabyM1.opam b/opam/tezos-protocol-005-PsBabyM1.opam index 2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-005-PsBabyM1.opam +++ b/opam/tezos-protocol-005-PsBabyM1.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-006-PsCARTHA.opam b/opam/tezos-protocol-006-PsCARTHA.opam index 2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-006-PsCARTHA.opam +++ b/opam/tezos-protocol-006-PsCARTHA.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-007-PsDELPH1.opam b/opam/tezos-protocol-007-PsDELPH1.opam index 2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-007-PsDELPH1.opam +++ b/opam/tezos-protocol-007-PsDELPH1.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-008-PtEdo2Zk.opam b/opam/tezos-protocol-008-PtEdo2Zk.opam index 2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-008-PtEdo2Zk.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-008-PtEdoTez.opam b/opam/tezos-protocol-008-PtEdoTez.opam index 2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-008-PtEdoTez.opam +++ b/opam/tezos-protocol-008-PtEdoTez.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-009-PsFLoren.opam b/opam/tezos-protocol-009-PsFLoren.opam index 2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-009-PsFLoren.opam +++ b/opam/tezos-protocol-009-PsFLoren.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-010-PtGRANAD.opam b/opam/tezos-protocol-010-PtGRANAD.opam index 2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-010-PtGRANAD.opam +++ b/opam/tezos-protocol-010-PtGRANAD.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam index b43d6ceb97e553d1b2c6c6ae1a1330b459bd7dfb..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-011-PtHangz2.opam +++ b/opam/tezos-protocol-011-PtHangz2.opam @@ -10,7 +10,6 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index b43d6ceb97e553d1b2c6c6ae1a1330b459bd7dfb..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-012-Psithaca.opam +++ b/opam/tezos-protocol-012-Psithaca.opam @@ -10,7 +10,6 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index b43d6ceb97e553d1b2c6c6ae1a1330b459bd7dfb..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-013-PtJakart.opam +++ b/opam/tezos-protocol-013-PtJakart.opam @@ -10,7 +10,6 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-014-PtKathma.opam b/opam/tezos-protocol-014-PtKathma.opam index b43d6ceb97e553d1b2c6c6ae1a1330b459bd7dfb..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-014-PtKathma.opam +++ b/opam/tezos-protocol-014-PtKathma.opam @@ -10,7 +10,6 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-015-PtLimaPt.opam b/opam/tezos-protocol-015-PtLimaPt.opam index b43d6ceb97e553d1b2c6c6ae1a1330b459bd7dfb..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-015-PtLimaPt.opam +++ b/opam/tezos-protocol-015-PtLimaPt.opam @@ -10,7 +10,6 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-016-PtMumbai.opam b/opam/tezos-protocol-016-PtMumbai.opam index b43d6ceb97e553d1b2c6c6ae1a1330b459bd7dfb..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-016-PtMumbai.opam +++ b/opam/tezos-protocol-016-PtMumbai.opam @@ -10,7 +10,6 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index 4691814f30ebe970c067fea7886dac5be9b0b5e3..154bfa6a60290bf73c9b741a766edfe1d62ad11d 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -21,12 +21,9 @@ depends: [ "tezos-benchmark-017-PtNairob" {with-test} "tezos-benchmark-type-inference-017-PtNairob" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-test-helpers" {with-test} "tezos-smart-rollup-017-PtNairob" {with-test} "tezos-client-base" {with-test} - "tezos-protocol-environment" {with-test} "tezos-scoru-wasm-helpers" {with-test} - "tezos-scoru-wasm" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] build: [ diff --git a/opam/tezos-protocol-017-PtNairob.opam b/opam/tezos-protocol-017-PtNairob.opam index b43d6ceb97e553d1b2c6c6ae1a1330b459bd7dfb..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-017-PtNairob.opam +++ b/opam/tezos-protocol-017-PtNairob.opam @@ -10,7 +10,6 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-018-Proxford-tests.opam b/opam/tezos-protocol-018-Proxford-tests.opam index 16d79726f6b84f72c8e02b7c5c1112c638e0f0c1..4cd03c42e437cb6753f8193d5479c0953cab3b07 100644 --- a/opam/tezos-protocol-018-Proxford-tests.opam +++ b/opam/tezos-protocol-018-Proxford-tests.opam @@ -21,12 +21,9 @@ depends: [ "tezos-benchmark-018-Proxford" {with-test} "tezos-benchmark-type-inference-018-Proxford" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-test-helpers" {with-test} "tezos-smart-rollup-018-Proxford" {with-test} "tezos-client-base" {with-test} - "tezos-protocol-environment" {with-test} "tezos-scoru-wasm-helpers" {with-test} - "tezos-scoru-wasm" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] build: [ diff --git a/opam/tezos-protocol-018-Proxford.opam b/opam/tezos-protocol-018-Proxford.opam index b43d6ceb97e553d1b2c6c6ae1a1330b459bd7dfb..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-018-Proxford.opam +++ b/opam/tezos-protocol-018-Proxford.opam @@ -10,7 +10,6 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 0e2db41dfeb4140f2f7d08821611beac27bd30f6..4934e611e6ee4be1f8366154f3236fb24ac03a41 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -21,12 +21,9 @@ depends: [ "tezos-benchmark-alpha" {with-test} "tezos-benchmark-type-inference-alpha" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-test-helpers" {with-test} "tezos-smart-rollup-alpha" {with-test} "tezos-client-base" {with-test} - "tezos-protocol-environment" {with-test} "tezos-scoru-wasm-helpers" {with-test} - "tezos-scoru-wasm" {with-test} "tezos-webassembly-interpreter-extra" {with-test} ] build: [ diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam index b43d6ceb97e553d1b2c6c6ae1a1330b459bd7dfb..2d17344395399e1df76690eb24306bb1be9127ea 100644 --- a/opam/tezos-protocol-alpha.opam +++ b/opam/tezos-protocol-alpha.opam @@ -10,7 +10,6 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" "octez-libs" ] build: [ diff --git a/opam/tezos-protocol-demo-counter.opam b/opam/tezos-protocol-demo-counter.opam index cc0f3243e4bde10020120dbafd4aecef3dd48eac..573c97ff0ce6a4e154045372c0c4a6c7f1c96f13 100644 --- a/opam/tezos-protocol-demo-counter.opam +++ b/opam/tezos-protocol-demo-counter.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-demo-noops.opam b/opam/tezos-protocol-demo-noops.opam index 24bedd0b68ec4da81a32fb82471adf8578ed375d..58e072e152b98e92a86baee8e3c7ff5bb29bb53c 100644 --- a/opam/tezos-protocol-demo-noops.opam +++ b/opam/tezos-protocol-demo-noops.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam deleted file mode 100644 index f82432179e3ce1b085b9e41fbdde45edc278e7b4..0000000000000000000000000000000000000000 --- a/opam/tezos-protocol-environment.opam +++ /dev/null @@ -1,46 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14.0" & < "4.15" } - "octez-libs" - "tezos-scoru-wasm" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "bls12-381" - "octez-plonk" - "zarith" { >= "1.12" & < "1.13" } - "zarith_stubs_js" - "class_group_vdf" { >= "0.0.4" } - "aches" { >= "1.0.0" } - "aches-lwt" { >= "1.0.0" } - "tezos-sapling" - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} - "tezos-test-helpers" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } - "lwt" { with-test & >= "5.6.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Interface layer between the protocols and the shell" -description: "The protocol-environment is a two-sided component sitting between the shell and -the protocols. - -On one side, it provides a restricted typing environment to compile the -protocols against. This is a series of modules which replace the standard -library of OCaml. These modules purposefully omit many functionalities, thus -preventing the protocols from, say, directly writing to disk. - -On the other side, it provides the shell with specific call-sites in the -protocols. These are the only entry-points into the otherwise black-box -protocols." diff --git a/opam/tezos-protocol-genesis.opam b/opam/tezos-protocol-genesis.opam index 006ac7f3d69a7470b19bdc32b828cbfb62286aff..862fbf9c350cb51375939b97b866a413d38477a7 100644 --- a/opam/tezos-protocol-genesis.opam +++ b/opam/tezos-protocol-genesis.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-protocol-environment" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam index d45766ddfa83e6d9461f8286994e1c728a11acf5..cb04281b4de9130a179fff9875a260ad3561af7d 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam @@ -13,7 +13,6 @@ depends: [ "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} "octez-alcotezt" {with-test} - "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-protocol-plugin-017-PtNairob" {with-test} "tezos-protocol-017-PtNairob" {with-test} diff --git a/opam/tezos-protocol-plugin-018-Proxford-tests.opam b/opam/tezos-protocol-plugin-018-Proxford-tests.opam index 24a66dae05eb4972eae2aa21a402e74727b94297..ceb78b7a545fb5eaa7e62db9d9402ebc3b47ec98 100644 --- a/opam/tezos-protocol-plugin-018-Proxford-tests.opam +++ b/opam/tezos-protocol-plugin-018-Proxford-tests.opam @@ -13,7 +13,6 @@ depends: [ "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} "octez-alcotezt" {with-test} - "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-protocol-plugin-018-Proxford" {with-test} "tezos-protocol-018-Proxford" {with-test} diff --git a/opam/tezos-protocol-plugin-alpha-tests.opam b/opam/tezos-protocol-plugin-alpha-tests.opam index 4024a5edcc45b9bfdb311b7f24dbd15e024d95d1..cf001dfe3a7f7bac6b60e396ca29e5df8fbbef80 100644 --- a/opam/tezos-protocol-plugin-alpha-tests.opam +++ b/opam/tezos-protocol-plugin-alpha-tests.opam @@ -13,7 +13,6 @@ depends: [ "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} "octez-alcotezt" {with-test} - "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "tezos-protocol-plugin-alpha" {with-test} "tezos-protocol-alpha" {with-test} diff --git a/opam/tezos-protocol-updater.opam b/opam/tezos-protocol-updater.opam index 48cb2c501e1c0a74d5dfa5dbebf010901ed34dc6..b92c06154cf9d765adc35c7d07559af7e231dd82 100644 --- a/opam/tezos-protocol-updater.opam +++ b/opam/tezos-protocol-updater.opam @@ -11,8 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-protocol-environment" - "tezos-shell-context" "octez-protocol-compiler" "lwt-exit" ] diff --git a/opam/tezos-proxy-server-config.opam b/opam/tezos-proxy-server-config.opam index 594b7c127802e112bddcbc8d70ea965f48368377..591dcb08261bd098a46f576d5c805eeaafd66628 100644 --- a/opam/tezos-proxy-server-config.opam +++ b/opam/tezos-proxy-server-config.opam @@ -13,7 +13,6 @@ depends: [ "octez-libs" "uri" { >= "3.1.0" } "tezt" { with-test & >= "3.1.1" } - "tezos-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam index 7efc2a2b9c2cf6c20ed401faeb8842e40652bb77..16561583726c43e971a60c83255d353b65dbcbaa 100644 --- a/opam/tezos-proxy.opam +++ b/opam/tezos-proxy.opam @@ -13,13 +13,10 @@ depends: [ "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } "octez-libs" - "tezos-clic" "tezos-client-base" - "tezos-protocol-environment" "uri" { >= "3.1.0" } "tezos-mockup-proxy" "tezt" { with-test & >= "3.1.1" } - "tezos-test-helpers" {with-test} "qcheck-core" {with-test} "lwt" { with-test & >= "5.6.0" } "octez-alcotezt" {with-test} diff --git a/opam/tezos-requester.opam b/opam/tezos-requester.opam deleted file mode 100644 index 295f33bd9148ff6a7138d8edf9d1c945b18b8898..0000000000000000000000000000000000000000 --- a/opam/tezos-requester.opam +++ /dev/null @@ -1,25 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "lwt-watcher" { = "0.2" } - "tezt" { with-test & >= "3.1.1" } - "tezos-test-helpers" {with-test} - "octez-alcotezt" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: generic resource fetching service" diff --git a/opam/tezos-sapling.opam b/opam/tezos-sapling.opam deleted file mode 100644 index 9f4a253f6905c08dab378c494583de4b28e76609..0000000000000000000000000000000000000000 --- a/opam/tezos-sapling.opam +++ /dev/null @@ -1,30 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "conf-rust" - "integers" - "integers_stubs_js" - "ctypes" { >= "0.18.0" } - "ctypes_stubs_js" - "data-encoding" { >= "0.7.1" & < "1.0.0" } - "octez-libs" - "tezos-rust-libs" { = "1.6" } - "tezos-sapling-parameters" { >= "1.1.0" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -x-opam-monorepo-opam-provided: [ - "tezos-rust-libs" - "tezos-sapling-parameters" -] -build: [["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs]] -synopsis: "OCaml library for the Sapling protocol, using librustzcash" diff --git a/opam/tezos-sc-rollup-node-test.opam b/opam/tezos-sc-rollup-node-test.opam index 9c451d111b4ce271a12720de5cfe9353b98a37e3..50008caa82ce0493d6e8158845c3a08573ea6acb 100644 --- a/opam/tezos-sc-rollup-node-test.opam +++ b/opam/tezos-sc-rollup-node-test.opam @@ -13,7 +13,6 @@ depends: [ "octez-libs" "tezos-protocol-017-PtNairob" "tezos-client-017-PtNairob" - "tezos-test-helpers" "qcheck-alcotest" { >= "0.20" } "qcheck-core" "logs" diff --git a/opam/tezos-scoru-wasm-fast-test.opam b/opam/tezos-scoru-wasm-fast-test.opam index 6cd91105ebbb9117e60fb2932d2bfa2e25850bb2..f714b1abb974778bc5cb2b96d5d7fda9c29140b1 100644 --- a/opam/tezos-scoru-wasm-fast-test.opam +++ b/opam/tezos-scoru-wasm-fast-test.opam @@ -16,8 +16,6 @@ depends: [ "octez-libs" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-scoru-wasm-test-helpers" {with-test} - "tezos-test-helpers" {with-test} - "tezos-scoru-wasm" {with-test} "tezos-scoru-wasm-fast" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} diff --git a/opam/tezos-scoru-wasm-fast.opam b/opam/tezos-scoru-wasm-fast.opam index 501819d74b96e451df4c4b5e514806a014f3abea..17d63fc0e0dd61e8a85227c66016544dd724a47f 100644 --- a/opam/tezos-scoru-wasm-fast.opam +++ b/opam/tezos-scoru-wasm-fast.opam @@ -11,8 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "octez-libs" - "tezos-webassembly-interpreter" - "tezos-scoru-wasm" "tezos-wasmer" ] build: [ diff --git a/opam/tezos-scoru-wasm-helpers.opam b/opam/tezos-scoru-wasm-helpers.opam index 2ea61f167dc136fd8a6b66a67fcbc2572c16d64f..6059fdc2fd6f6017818450fb504d5e1f95583e81 100644 --- a/opam/tezos-scoru-wasm-helpers.opam +++ b/opam/tezos-scoru-wasm-helpers.opam @@ -13,7 +13,6 @@ depends: [ "ppx_import" "ppx_deriving" "octez-libs" - "tezos-scoru-wasm" "tezos-scoru-wasm-fast" "tezos-webassembly-interpreter-extra" ] diff --git a/opam/tezos-scoru-wasm-regressions.opam b/opam/tezos-scoru-wasm-regressions.opam index 4c2733390768611a62363b33f0217cd78f0b80cb..e1728ce4fab76448a9609dd8f2119f762d157596 100644 --- a/opam/tezos-scoru-wasm-regressions.opam +++ b/opam/tezos-scoru-wasm-regressions.opam @@ -13,9 +13,7 @@ depends: [ "ppx_import" "ppx_deriving" "octez-libs" - "tezos-scoru-wasm" "tezos-scoru-wasm-helpers" - "tezos-test-helpers" "tezos-protocol-alpha" "tezos-smart-rollup-alpha" "tezt" { >= "3.1.1" } diff --git a/opam/tezos-scoru-wasm-test-helpers.opam b/opam/tezos-scoru-wasm-test-helpers.opam index ca2c69adf81ae3dabdbe1b66d11298904cf3e2dc..998ad2c413d79c4005ce8067346fd1a6d5ad6030 100644 --- a/opam/tezos-scoru-wasm-test-helpers.opam +++ b/opam/tezos-scoru-wasm-test-helpers.opam @@ -13,8 +13,6 @@ depends: [ "ppx_import" "ppx_deriving" "octez-libs" - "tezos-test-helpers" - "tezos-scoru-wasm" "tezos-scoru-wasm-durable-snapshot" "tezos-scoru-wasm-fast" "tezos-scoru-wasm-helpers" diff --git a/opam/tezos-scoru-wasm-test.opam b/opam/tezos-scoru-wasm-test.opam index 6bab4b76fd8318ed440255a5abbf761241420667..46782c183c2e312900709319d0546f06a143c262 100644 --- a/opam/tezos-scoru-wasm-test.opam +++ b/opam/tezos-scoru-wasm-test.opam @@ -14,8 +14,6 @@ depends: [ "ppx_deriving" {with-test} "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} - "tezos-test-helpers" {with-test} - "tezos-scoru-wasm" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} "tezos-scoru-wasm-helpers" {with-test} diff --git a/opam/tezos-scoru-wasm.opam b/opam/tezos-scoru-wasm.opam deleted file mode 100644 index 212fdba185a0e04e94af29bd6577efc59b21e8e5..0000000000000000000000000000000000000000 --- a/opam/tezos-scoru-wasm.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-webassembly-interpreter" - "data-encoding" { >= "0.7.1" & < "1.0.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Protocol environment dependency providing WASM functionality for SCORU" diff --git a/opam/tezos-shell-benchmarks.opam b/opam/tezos-shell-benchmarks.opam index a783a1537cc98e16471e7695b4497e85b6d64acb..80d96e5527c7e72d730332547afc51e070ec74e9 100644 --- a/opam/tezos-shell-benchmarks.opam +++ b/opam/tezos-shell-benchmarks.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-benchmark" - "tezos-shell-context" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-shell-context-test.opam b/opam/tezos-shell-context-test.opam index 161ae81990a3ee4998d8b33b109071d2a4d85fad..05cbe6bd88fb463dbd71031f0ed09deb113ae643 100644 --- a/opam/tezos-shell-context-test.opam +++ b/opam/tezos-shell-context-test.opam @@ -11,11 +11,8 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } - "tezos-shell-context" {with-test} - "octez-alcotezt" {with-test} - "tezos-test-helpers" {with-test} "octez-libs" {with-test} - "tezos-protocol-environment" {with-test} + "octez-alcotezt" {with-test} ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-shell-context.opam b/opam/tezos-shell-context.opam deleted file mode 100644 index 8abc2e710ec67867084c11ae7492f962debf6f53..0000000000000000000000000000000000000000 --- a/opam/tezos-shell-context.opam +++ /dev/null @@ -1,21 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "octez-libs" - "tezos-protocol-environment" -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: economic-protocols environment implementation for `octez-node`" diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam index af53a1cfd3404931d6afe75e47230bbca49d8b48..86ef48d7cf0cae50e64b0d766152ccf00ee30b71 100644 --- a/opam/tezos-shell.opam +++ b/opam/tezos-shell.opam @@ -16,16 +16,12 @@ depends: [ "prometheus" { >= "1.2" } "octez-libs" "tezos-store" - "tezos-protocol-environment" "tezos-context-ops" - "tezos-shell-context" "tezos-protocol-updater" - "tezos-requester" "tezos-validation" "lwt-exit" "tezt" { with-test & >= "3.1.1" } "tezos-embedded-protocol-demo-noops" {with-test} - "tezos-test-helpers" {with-test} "octez-alcotezt" {with-test} "tezos-version" {with-test} ] diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index 3b771aa739f0d62d129dc91709c8b285d42dd2c3..1fe041425324a65dbaf133317fb3c3897737240d 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -16,7 +16,6 @@ depends: [ "uri" { >= "3.1.0" } "ocplib-endian" "fmt" { >= "0.8.7" } - "tezos-clic" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index daba4c8940961bbb5d2cdf4e03425d83e9697e0c..59c74b872283bf08c23aee516d580cd41da42235 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -16,9 +16,7 @@ depends: [ "tezos-validation" "index" { >= "1.6.0" & < "1.7.0" } "irmin-pack" { >= "3.7.2" & < "3.8.0" } - "tezos-protocol-environment" "tezos-context-ops" - "tezos-shell-context" "tezos-protocol-updater" "lwt-watcher" { = "0.2" } "camlzip" { >= "1.11" & < "1.12" } @@ -32,7 +30,6 @@ depends: [ "tezos-protocol-alpha" {with-test} "tezos-protocol-plugin-alpha" {with-test} "octez-alcotezt" {with-test} - "tezos-test-helpers" {with-test} ] conflicts: [ "checkseum" { = "0.5.0" } diff --git a/opam/tezos-test-helpers.opam b/opam/tezos-test-helpers.opam deleted file mode 100644 index c1a744e598245a8307864f88e4172b7bcaf06305..0000000000000000000000000000000000000000 --- a/opam/tezos-test-helpers.opam +++ /dev/null @@ -1,25 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "uri" { >= "3.1.0" } - "fmt" { >= "0.8.7" } - "qcheck-alcotest" { >= "0.20" } - "lwt" { >= "5.6.0" } - "pure-splitmix" { = "0.3" } - "data-encoding" { >= "0.7.1" & < "1.0.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos-agnostic test helpers" diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index 721f5b3eb12234e56edb53d26b3f3b07443aeb0d..263e83b13e23c2822b319e5e88dc813bd52bc445 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -21,7 +21,6 @@ depends: [ "tezos-client-base-unix" "tezos-protocol-alpha" "tezt" { >= "3.1.1" } - "tezt-performance-regression" "uri" { >= "3.1.0" } ] build: [ diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam index 85e98ab803140e9a58501272c155d77fc851f127..0c3bd20034a8c0f536ec5867fb2d877940d67a42 100644 --- a/opam/tezos-tree-encoding-test.opam +++ b/opam/tezos-tree-encoding-test.opam @@ -12,8 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "tezt" { with-test & >= "3.1.1" } "octez-libs" {with-test} - "tezos-test-helpers" {with-test} - "tezos-webassembly-interpreter" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-validation.opam b/opam/tezos-validation.opam index fde39c6c4f8ec6781a85a10abf5c3328a919f1a7..4441940d7d09799c636a36a29cd497f2d6e498de 100644 --- a/opam/tezos-validation.opam +++ b/opam/tezos-validation.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-context-ops" - "tezos-shell-context" "tezos-protocol-updater" "tezos-version" ] diff --git a/opam/tezos-webassembly-interpreter-extra.opam b/opam/tezos-webassembly-interpreter-extra.opam index 6be8937ef1f6a21fa2f0bbbe4b9d642e85b24abe..6ff179173a6f7a449c2cc10cb06e11ff5755fc71 100644 --- a/opam/tezos-webassembly-interpreter-extra.opam +++ b/opam/tezos-webassembly-interpreter-extra.opam @@ -10,9 +10,8 @@ license: "Apache-2.0" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "tezos-webassembly-interpreter" - "lwt" { >= "5.6.0" } "octez-libs" + "lwt" { >= "5.6.0" } ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezos-webassembly-interpreter.opam b/opam/tezos-webassembly-interpreter.opam deleted file mode 100644 index 7d387ab83f4b43c715c3ce05ad93fb77ab7fd1e2..0000000000000000000000000000000000000000 --- a/opam/tezos-webassembly-interpreter.opam +++ /dev/null @@ -1,24 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam" "WebAssembly Authors"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "Apache-2.0" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "ppx_deriving" - "octez-libs" - "zarith" { >= "1.12" & < "1.13" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "WebAssembly reference interpreter with tweaks for Tezos" diff --git a/opam/tezt-ethereum.opam b/opam/tezt-ethereum.opam index f79d387907ed106a0f638c322c2ddb93956a4043..17ad96cf748eb6285073ceb9b51cda9d40df6688 100644 --- a/opam/tezt-ethereum.opam +++ b/opam/tezt-ethereum.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "tezt" { >= "3.1.1" } - "tezt-performance-regression" + "octez-libs" ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/opam/tezt-performance-regression.opam b/opam/tezt-performance-regression.opam deleted file mode 100644 index 147307f95b1f0a5b0e50122c3692b95391a710e1..0000000000000000000000000000000000000000 --- a/opam/tezt-performance-regression.opam +++ /dev/null @@ -1,22 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "tezt" { >= "3.1.1" } - "uri" { >= "3.1.0" } - "cohttp-lwt-unix" { >= "5.2.0" } -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Performance regression test framework based on Tezt" diff --git a/src/bin_client/dune b/src/bin_client/dune index 85b9dfef7732a3712eb7a6fb7dc0b87eda397191..3f893b06ce7ef4b53d371026261202779dbf2898 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -9,7 +9,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-rpc-http-client octez-libs.tezos-stdlib-unix octez-libs.tezos-shell-services diff --git a/src/bin_codec/dune b/src/bin_codec/dune index f06eab70823523e76770656c5bf09bd5a4748498..17bb3128e240265440310b62e7f028c196de8d55 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -12,7 +12,7 @@ octez-libs.tezos-base.unix tezos-client-base-unix tezos-client-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-stdlib-unix octez-libs.tezos-event-logging tezos-signer-services diff --git a/src/bin_dac_client/dune b/src/bin_dac_client/dune index 376d3debfb57c3a61cc5d3835130dda4ad3859ad..9275ef12854e76d692e13366acf41eba006157dc 100644 --- a/src/bin_dac_client/dune +++ b/src/bin_dac_client/dune @@ -9,7 +9,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-clic + octez-libs.tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/bin_dac_node/dune b/src/bin_dac_node/dune index 9f7dadeb6120f6f60c2acd04c5b05c7e25b07308..a6c73a1db976cae3746812d13710fa2521d82a25 100644 --- a/src/bin_dac_node/dune +++ b/src/bin_dac_node/dune @@ -9,7 +9,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-clic + octez-libs.tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index d5ac0b09b77aa79e2a7c73c94b5f2224e6289f63..228c3384169c60d62fb6f627ab7a61ee673b7fd9 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -26,7 +26,7 @@ octez-libs.tezos-crypto-dal tezos-store.unix tezos-store.shared - tezos-gossipsub + octez-libs.tezos-gossipsub tezos-dal-node-lib.gossipsub octez-libs.tezos-p2p octez-libs.tezos-p2p-services diff --git a/src/bin_evm_proxy/dune b/src/bin_evm_proxy/dune index 7656dafee9443c27ca19064a3d3c013c69bb5a9d..fe22daaba1a51838c3f78e639c29b153998f113e 100644 --- a/src/bin_evm_proxy/dune +++ b/src/bin_evm_proxy/dune @@ -9,7 +9,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-server tezos-version.value diff --git a/src/bin_evm_proxy/upgrade_signer/dune b/src/bin_evm_proxy/upgrade_signer/dune index f49d8ac7cde662ddcc35358711d9b4457a41174d..1395df352162895b6f717bf45b89dd07df3e6bd6 100644 --- a/src/bin_evm_proxy/upgrade_signer/dune +++ b/src/bin_evm_proxy/upgrade_signer/dune @@ -7,7 +7,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-clic + octez-libs.tezos-clic evm_proxy_lib) (flags (:standard) diff --git a/src/bin_node/dune b/src/bin_node/dune index 25c3108ccdee13cfd24b5ba026b175d9585ce35f..7362b2a2dfe762b277bf3ccdcf3678d7319a6160 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -23,7 +23,7 @@ tezos-store.unix-snapshots octez-libs.tezos-context tezos-validation - tezos-shell-context + octez-libs.tezos-shell-context octez-libs.tezos-workers tezos-protocol-updater cmdliner diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index 8740a19d2712e93fc36e4441d6e663da468e2f3c..f5e5591004cc02508a8361e546a7a65a6070daea 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -19,7 +19,7 @@ octez-libs.tezos-rpc-http-client-unix octez-libs.tezos-rpc-http-server octez-libs.tezos-shell-services - tezos-shell-context + octez-libs.tezos-shell-context tezos-version.value uri (select void_for_linking-tezos-client-genesis from diff --git a/src/bin_sequencer_node/dune b/src/bin_sequencer_node/dune index 4d7ee4259c411d0aa96cedbd90eebb95fa5dc11a..7f97df3f6dec9ed255b776a0e33b5ede84f995c4 100644 --- a/src/bin_sequencer_node/dune +++ b/src/bin_sequencer_node/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 6795e70e508ee36a1e60ea3fd21066158a19b2ab..dc4fcedf4a6b7af0c44981c58c7979d52a3f98a3 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -9,7 +9,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-clic + octez-libs.tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/bin_smart_rollup_node/dune b/src/bin_smart_rollup_node/dune index 5daa596211cb0c8231be7fbceeea5d3ce6ec6c62..d7a64078e6df724779ca728ec93a5823155148d9 100644 --- a/src/bin_smart_rollup_node/dune +++ b/src/bin_smart_rollup_node/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-client-base-unix diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index aa577005b859ad641258f658f0c2d04635e91c63..22ea8f981fdb4afefa8fcf0082f3b237274fcb6e 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -10,7 +10,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix - tezos-clic + octez-libs.tezos-clic tezos-benchmark tezos-benchmark-examples tezos-shell-benchmarks diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune index de230c8c9d69e0f390b4ee11526d321d8d19fa10..68b0ab7c16ade4eca5accd4eae0d9056ba407691 100644 --- a/src/bin_tps_evaluation/dune +++ b/src/bin_tps_evaluation/dune @@ -19,7 +19,7 @@ tezos-protocol-alpha tezt octez-libs.tezt-tezos - tezt-performance-regression + octez-libs.tezt-performance-regression uri) (link_flags (:standard) diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune index 5d737cb4f255d323951ebf918c5d045d3c1990da..5aa938099433d2ebda04ed11a48794a8f61f300c 100644 --- a/src/bin_wasm_debugger/dune +++ b/src/bin_wasm_debugger/dune @@ -8,14 +8,14 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-tree-encoding octez-libs.tezos-base.unix yaml tezos-client-alpha - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-scoru-wasm-helpers - tezos-webassembly-interpreter + octez-libs.tezos-webassembly-interpreter tezos-webassembly-interpreter-extra tezos-version.value) (link_flags diff --git a/src/lib_aplonk/dune b/src/lib_aplonk/dune index 6454f85f1b72ea538cb88b16fe14b5b7b93e5911..1854f232308d3f11060ad9ad2588ca068b9b42a1 100644 --- a/src/lib_aplonk/dune +++ b/src/lib_aplonk/dune @@ -3,8 +3,8 @@ (library (name aplonk) - (public_name octez-aplonk) + (public_name octez-libs.octez-aplonk) (instrumentation (backend bisect_ppx)) (libraries - octez-plonk.aggregation) + octez-libs.octez-plonk.aggregation) (preprocess (pps ppx_repr))) diff --git a/src/lib_aplonk/plonk-aggregation/dune b/src/lib_aplonk/plonk-aggregation/dune index 730d89732f1597b9c9a927e8838167bd9396302a..decff0c74fbb32edb994413a86d0b97ec1d28d15 100644 --- a/src/lib_aplonk/plonk-aggregation/dune +++ b/src/lib_aplonk/plonk-aggregation/dune @@ -3,10 +3,10 @@ (library (name aggregation) - (public_name octez-plonk.aggregation) + (public_name octez-libs.octez-plonk.aggregation) (instrumentation (backend bisect_ppx)) (libraries - octez-plonk + octez-libs.octez-plonk octez-libs.octez-bls12-381-polynomial) (preprocess (pps ppx_repr)) (flags diff --git a/src/lib_aplonk/test/dune b/src/lib_aplonk/test/dune index da588658657f3ec52f33240e602797996b2ca73a..0987a8415099b5f77b577b2da22796203bbf42aa 100644 --- a/src/lib_aplonk/test/dune +++ b/src/lib_aplonk/test/dune @@ -5,25 +5,25 @@ (name main) (instrumentation (backend bisect_ppx)) (libraries - octez-plonk.plonk-test - octez-aplonk) + octez-libs.octez-plonk.plonk-test + octez-libs.octez-aplonk) (modules main test_aplonk test_main_protocol)) (rule (alias runtest) - (package octez-aplonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe} -q) (diff? test-quick.expected test.output))))) (rule (alias runtest_slow) - (package octez-aplonk) + (package octez-libs) (action (run %{exe:main.exe}))) (rule (alias runtest_slow_with_regression) - (package octez-aplonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe}) (diff? test-slow.expected test.output))))) @@ -31,6 +31,6 @@ (executable (name bench) (libraries - octez-plonk.plonk-test - octez-aplonk) + octez-libs.octez-plonk.plonk-test + octez-libs.octez-aplonk) (modules bench)) diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index e397cdbe3a1f16d30d3722f501739682a3a64ded..71f0f38e75aefe794208d1bcdbf66d03cb63bb5b 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -4,15 +4,30 @@ This is a package containing some libraries used by the Octez project. It contains the following libraries: +- {{!module-Aggregation}Aggregation} +- {{!module-Aplonk}Aplonk} - {{!module-Bare_functor_outputs}Bare_functor_outputs} - {{!module-Bare_sigs}Bare_sigs} - {{!module-Bare_structs}Bare_structs} +- {{!module-Bls12_381_hash}Bls12_381_hash} +- {{!module-Bls12_381_signature}Bls12_381_signature} +- {{!module-Communication}Communication} +- {{!module-Distributed_plonk}Distributed_plonk} +- {{!module-Distribution}Distribution} +- {{!module-Epoxy_tx}Epoxy_tx} +- {{!module-Mec}Mec} - {{!module-Octez_bls12_381_polynomial}Octez_bls12_381_polynomial} +- {{!module-Octez_srs_extraction}Octez_srs_extraction} +- {{!module-Plompiler}Plompiler} +- {{!module-Plonk}Plonk} +- {{!module-Plonk_test}Plonk_test} - {{!module-Polynomial}Polynomial} - {{!module-Tezos_base}Tezos_base} - {{!module-Tezos_base_p2p_identity_file}Tezos_base_p2p_identity_file} - {{!module-Tezos_base_test_helpers}Tezos_base_test_helpers} - {{!module-Tezos_base_unix}Tezos_base_unix} +- {{!module-Tezos_clic}Tezos_clic} +- {{!module-Tezos_clic_unix}Tezos_clic_unix} - {{!module-Tezos_context}Tezos_context} - {{!module-Tezos_context_disk}Tezos_context_disk} - {{!module-Tezos_context_dump}Tezos_context_dump} @@ -27,6 +42,8 @@ It contains the following libraries: - {{!module-Tezos_error_monad}Tezos_error_monad} - {{!module-Tezos_event_logging}Tezos_event_logging} - {{!module-Tezos_event_logging_test_helpers}Tezos_event_logging_test_helpers} +- {{!module-Tezos_expect_helper}Tezos_expect_helper} +- {{!module-Tezos_gossipsub}Tezos_gossipsub} - {{!module-Tezos_hacl}Tezos_hacl} - {{!module-Tezos_lazy_containers}Tezos_lazy_containers} - {{!page-tezos_lwt_result_stdlib}Tezos_lwt_result_stdlib} @@ -34,18 +51,29 @@ It contains the following libraries: - {{!module-Tezos_p2p}Tezos_p2p} - {{!module-Tezos_p2p_services}Tezos_p2p_services} - {{!module-Tezos_p2p_test_common}Tezos_p2p_test_common} +- {{!module-Tezos_protocol_environment}Tezos_protocol_environment} +- {{!module-Tezos_protocol_environment_sigs}Tezos_protocol_environment_sigs} +- {{!module-Tezos_protocol_environment_sigs_internals}Tezos_protocol_environment_sigs_internals} +- {{!module-Tezos_protocol_environment_structs}Tezos_protocol_environment_structs} +- {{!module-Tezos_requester}Tezos_requester} - {{!module-Tezos_rpc}Tezos_rpc} - {{!module-Tezos_rpc_http}Tezos_rpc_http} - {{!module-Tezos_rpc_http_client}Tezos_rpc_http_client} - {{!module-Tezos_rpc_http_client_unix}Tezos_rpc_http_client_unix} - {{!module-Tezos_rpc_http_server}Tezos_rpc_http_server} +- {{!module-Tezos_sapling}Tezos_sapling} +- {{!module-Tezos_scoru_wasm}Tezos_scoru_wasm} +- {{!module-Tezos_shell_context}Tezos_shell_context} - {{!module-Tezos_shell_services}Tezos_shell_services} - {{!module-Tezos_stdlib}Tezos_stdlib} - {{!module-Tezos_stdlib_unix}Tezos_stdlib_unix} +- {{!module-Tezos_test_helpers}Tezos_test_helpers} - {{!module-Tezos_tree_encoding}Tezos_tree_encoding} - {{!module-Tezos_version}Tezos_version} - {{!module-Tezos_version_parser}Tezos_version_parser} +- {{!module-Tezos_webassembly_interpreter}Tezos_webassembly_interpreter} - {{!page-tezos_workers}Tezos_workers} +- {{!module-Tezt_performance_regression}Tezt_performance_regression} - {{!module-Tezt_tezos}Tezt_tezos} - {{!module-Traced_functor_outputs}Traced_functor_outputs} - {{!module-Traced_sigs}Traced_sigs} diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune index 18bd484ea3c4671e8ce63d1d5f62fac721677411..115c8f944116e4cc16b69b39311b9b001f1a0385 100644 --- a/src/lib_base/test/dune +++ b/src/lib_base/test/dune @@ -11,7 +11,7 @@ octez-libs.tezos-base octez-libs.tezos-error-monad data-encoding - tezos-test-helpers + octez-libs.tezos-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 406b9c83c9637e6ad1f1fbb2d4c0752927f0fb1e..9e25d00204d2da19828c4ba169c327611b1b1b90 100644 --- a/src/lib_base/test_helpers/dune +++ b/src/lib_base/test_helpers/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib-unix octez-libs.tezos-event-logging-test-helpers - tezos-test-helpers + octez-libs.tezos-test-helpers octez-alcotezt qcheck-alcotest) (library_flags (:standard -linkall)) diff --git a/src/lib_base/unix/test/dune b/src/lib_base/unix/test/dune index a3e3bf3432b6ec6738e4e7dc1e9ec5647229fa14..d41336c91afd35c9cd2d2ec6903729f62461ecbb 100644 --- a/src/lib_base/unix/test/dune +++ b/src/lib_base/unix/test/dune @@ -11,7 +11,7 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-error-monad data-encoding - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest octez-alcotezt tezt) diff --git a/src/lib_benchmark/dune b/src/lib_benchmark/dune index a10cf9a2b49d3d3920bd894dfd9888f636820932..ea3b934e9a3cc3247989a7cfea756196b0c10969 100644 --- a/src/lib_benchmark/dune +++ b/src/lib_benchmark/dune @@ -11,7 +11,7 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-crypto octez-libs.tezos-micheline - tezos-clic + octez-libs.tezos-clic data-encoding prbnmcn-linalg prbnmcn-stats diff --git a/src/lib_bls12_381_hash/dune b/src/lib_bls12_381_hash/dune index f8a7bd2ef308188ab7a0369f3904b99fdb70211c..3171bd8ef00d8e38614d6e2d5c276eba9bde8b92 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-bls12-381-hash) + (public_name octez-libs.octez-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 110d8c8db37c85a2dceac14fd38a1bb6307bf752..c2f20d2bcb70c848247090142df9f34dddba90d5 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-bls12-381-hash) + octez-libs.octez-bls12-381-hash) (library_flags (:standard -linkall)) (flags (:standard) @@ -31,7 +31,7 @@ (rule (alias runtest) - (package octez-bls12-381-hash) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_bls12_381_signature/dune b/src/lib_bls12_381_signature/dune index 09230daba0d220a90d34de1f98ef7a985ce35e90..a5385219c951444d0a2e6141f8a7a12670f0cd21 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-bls12-381-signature) + (public_name octez-libs.octez-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 c51de8388f93b6680e7e248738ac229fd634cf8a..4fe3df8699ca3b529bf849b36ee0479cf80d1e54 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-bls12-381-signature + octez-libs.octez-bls12-381-signature octez-alcotezt integers_stubs_js) (library_flags (:standard -linkall)) @@ -29,7 +29,7 @@ (rule (alias runtest) - (package octez-bls12-381-signature) + (package octez-libs) (deps (glob_files_rec test_vectors/*)) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_clic/dune b/src/lib_clic/dune index a5fb8c9a1d956eee1283e54ec4d1976152d8159b..34ab7d25a477428fa7cfe89856d7cf50e65c78a5 100644 --- a/src/lib_clic/dune +++ b/src/lib_clic/dune @@ -3,7 +3,7 @@ (library (name tezos_clic) - (public_name tezos-clic) + (public_name octez-libs.tezos-clic) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-stdlib diff --git a/src/lib_clic/examples/dune b/src/lib_clic/examples/dune index 8dd06724ec2e09ce932a41a9c12a55888d589fb8..f1691cce4903faf1b88d6c38c99e3640308c432d 100644 --- a/src/lib_clic/examples/dune +++ b/src/lib_clic/examples/dune @@ -4,5 +4,5 @@ (executable (name clic_example) (libraries - tezos-clic + octez-libs.tezos-clic lwt.unix)) diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune index a100dc63c9ddc3e48b14a8c52bbc4cf646826ae4..b5e3a6b77673397313c62b24a9b98ec9c78f88fe 100644 --- a/src/lib_clic/test/dune +++ b/src/lib_clic/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-libs.tezos-stdlib - tezos-clic + octez-libs.tezos-clic lwt.unix octez-alcotezt) (library_flags (:standard -linkall)) @@ -30,7 +30,7 @@ (rule (alias runtest) - (package tezos-clic) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_clic/unix/dune b/src/lib_clic/unix/dune index 031908b96c77bb11c9a089c095524072f4f4fa8e..4217a92c2deb5f64f93924d94e447eeed0339edf 100644 --- a/src/lib_clic/unix/dune +++ b/src/lib_clic/unix/dune @@ -3,11 +3,11 @@ (library (name tezos_clic_unix) - (public_name tezos-clic.unix) + (public_name octez-libs.tezos-clic.unix) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-stdlib - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-stdlib-unix octez-libs.tezos-error-monad octez-libs.tezos-lwt-result-stdlib) diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune index 14aeebc782a3848bf853ab0d178cc135961162fa..d964a15bd2378cc3e97c67d6358b3eaf970c422a 100644 --- a/src/lib_client_base/dune +++ b/src/lib_client_base/dune @@ -9,10 +9,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-rpc octez-libs.tezos-shell-services - tezos-sapling + octez-libs.tezos-sapling uri) (js_of_ocaml) (library_flags (:standard -linkall)) diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index 759f3677b49ded89008f3fe0aa90bc61b98e9615..5ee4d3e82734cbb850ff89b4a4416f03a182bb27 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-rpc octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client-unix diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index b0d30440eb263743397607aec35a8eeb955fd777..27d7540500b5705154d49eb534665b08c2a66b94 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -8,8 +8,8 @@ (libraries octez-libs.tezos-base octez-libs.tezos-rpc - tezos-clic - tezos-clic.unix + octez-libs.tezos-clic + octez-libs.tezos-clic.unix tezos-client-base octez-libs.tezos-shell-services octez-libs.tezos-p2p-services diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune index d21e05eb5909b8baa6357d4fc6d4e49ae35924ab..53c4b73c24709fa2bd9cab2aa0c98fb02ac6666c 100644 --- a/src/lib_context/test/dune +++ b/src/lib_context/test/dune @@ -13,7 +13,7 @@ octez-libs.tezos-context.memory octez-libs.tezos-context.encoding octez-libs.tezos-stdlib-unix - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune index 263602fed010bf79d9ac62c1c1878086f1e90d78..41a47f9dff2ed7e40201b76792c1171d600a4685 100644 --- a/src/lib_crypto/dune +++ b/src/lib_crypto/dune @@ -20,7 +20,7 @@ zarith zarith_stubs_js bls12-381 - octez-bls12-381-signature) + octez-libs.octez-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 db6679b0fe28e4e15d45829c9507516fa8050793..1b297cc44211b044ddc1554cdeafc00adb0aeb33 100644 --- a/src/lib_crypto/test-unix/dune +++ b/src/lib_crypto/test-unix/dune @@ -16,7 +16,7 @@ octez-alcotezt lwt.unix qcheck-alcotest - tezos-test-helpers) + octez-libs.tezos-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune index e59af56134c4bf1f74c45427ca30df0adc2a9f2b..80bdcdbf9ab0ac532d34f2af4c400fb60a7b90d9 100644 --- a/src/lib_crypto/test/dune +++ b/src/lib_crypto/test/dune @@ -17,7 +17,7 @@ data-encoding octez-alcotezt qcheck-alcotest - tezos-test-helpers) + octez-libs.tezos-test-helpers) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_crypto_dal/test/dune b/src/lib_crypto_dal/test/dune index 017786419cb0062fafff74096d4152b31875d949..fe20fe8823707abb116c6c7611e10fc21ea2f1d6 100644 --- a/src/lib_crypto_dal/test/dune +++ b/src/lib_crypto_dal/test/dune @@ -14,7 +14,7 @@ octez-alcotezt qcheck-alcotest octez-libs.octez-bls12-381-polynomial - tezos-test-helpers) + octez-libs.tezos-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_dac/test/dune b/src/lib_dac/test/dune index 8f915f032137b0da2daab4d9ce4c7308ab649efd..f0f7f0ebc2e8f6770853951003223bb256e18452 100644 --- a/src/lib_dac/test/dune +++ b/src/lib_dac/test/dune @@ -9,7 +9,7 @@ octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix octez-libs.tezos-base - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers tezos-dac-lib octez-alcotezt) diff --git a/src/lib_dac_node/test/dune b/src/lib_dac_node/test/dune index 95c10b72b2631b3d8fc45d50f8f2627afcefbaab..bf0946c00e537d70a3273786b86f202edbe0942f 100644 --- a/src/lib_dac_node/test/dune +++ b/src/lib_dac_node/test/dune @@ -9,7 +9,7 @@ octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix octez-libs.tezos-base - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers tezos_dac_node_lib octez-alcotezt) diff --git a/src/lib_dal_node/gossipsub/dune b/src/lib_dal_node/gossipsub/dune index ab1676fb7c1c2beb120a23639af95a9414fc3e2b..c1aca057b7039868f23433e43a2e92ed8b38c2a7 100644 --- a/src/lib_dal_node/gossipsub/dune +++ b/src/lib_dal_node/gossipsub/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-crypto-dal - tezos-gossipsub + octez-libs.tezos-gossipsub octez-libs.tezos-p2p octez-libs.tezos-p2p-services octez-libs.tezos-crypto) diff --git a/src/lib_distributed_plonk/communication/dune b/src/lib_distributed_plonk/communication/dune index 660de9a73fe30c57ebbb8127ec5057ccd1a402c8..4401ae600ea9441abdc78f3c160b7fefe2aa4475 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-plonk.communication) + (public_name octez-libs.octez-plonk.communication) (instrumentation (backend bisect_ppx)) (libraries logs octez-distributed-lwt-internal - octez-plonk.distribution) + octez-libs.octez-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 c95e9ae865a33f5f095bcda3ea0e07a1597d1c82..ccbb006909140fe5c8fcb2b6b8411408de4ce3fa 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-plonk.distribution) + (public_name octez-libs.octez-plonk.distribution) (instrumentation (backend bisect_ppx)) (libraries - octez-plonk - octez-plonk.aggregation) + octez-libs.octez-plonk + octez-libs.octez-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 345fe598f4bd09b8969a0df89e0d63f60ba6e2a6..912953f9172b060fcc29b78a174aa4a03b8ed497 100644 --- a/src/lib_distributed_plonk/distribution/test/dune +++ b/src/lib_distributed_plonk/distribution/test/dune @@ -5,25 +5,25 @@ (name main) (instrumentation (backend bisect_ppx)) (libraries - octez-plonk.aggregation - octez-plonk.plonk-test) + octez-libs.octez-plonk.aggregation + octez-libs.octez-plonk.plonk-test) (modules main test_polynomial_commitment)) (rule (alias runtest) - (package octez-plonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe} -q) (diff? test-quick.expected test.output))))) (rule (alias runtest_slow) - (package octez-plonk) + (package octez-libs) (action (run %{exe:main.exe}))) (rule (alias runtest_slow_with_regression) - (package octez-plonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe}) (diff? test-slow.expected test.output))))) diff --git a/src/lib_distributed_plonk/dune b/src/lib_distributed_plonk/dune index af2c6136b1ffc4cb9d0c03011d90760260132996..7bc83600dcdd8d52c988b3ecd522cb401b46c169 100644 --- a/src/lib_distributed_plonk/dune +++ b/src/lib_distributed_plonk/dune @@ -3,13 +3,13 @@ (library (name distributed_plonk) - (public_name octez-distributed-plonk) + (public_name octez-libs.octez-distributed-plonk) (instrumentation (backend bisect_ppx)) (libraries - octez-aplonk - octez-plonk.communication - octez-plonk - octez-plonk.plonk-test) + octez-libs.octez-aplonk + octez-libs.octez-plonk.communication + octez-libs.octez-plonk + octez-libs.octez-plonk.plonk-test) (preprocess (pps ppx_repr)) (flags (:standard) @@ -24,14 +24,14 @@ (executable (name worker_runner) (libraries - octez-distributed-plonk - octez-plonk.distribution) + octez-libs.octez-distributed-plonk + octez-libs.octez-plonk.distribution) (modules worker_runner)) (executable (name distribution) (libraries - octez-distributed-plonk) + octez-libs.octez-distributed-plonk) (flags (:standard) -open Distributed_plonk) @@ -40,7 +40,7 @@ (executable (name distribution_meta) (libraries - octez-distributed-plonk) + octez-libs.octez-distributed-plonk) (flags (:standard) -open Distributed_plonk) diff --git a/src/lib_distributed_plonk/test/dune b/src/lib_distributed_plonk/test/dune index 105d3eec485deee0c913503189c76e6f0b4260bb..1f1a283bda3af6998744b3753a15d942c015e98e 100644 --- a/src/lib_distributed_plonk/test/dune +++ b/src/lib_distributed_plonk/test/dune @@ -4,28 +4,28 @@ (executable (name main) (libraries - octez-distributed-plonk - octez-plonk - octez-plonk.aggregation - octez-plonk.distribution - octez-aplonk - octez-plonk.plonk-test)) + 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)) (rule (alias runtest) - (package octez-distributed-plonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe} -q) (diff? test-quick.expected test.output))))) (rule (alias runtest_slow) - (package octez-distributed-plonk) + (package octez-libs) (action (run %{exe:main.exe}))) (rule (alias runtest_slow_with_regression) - (package octez-distributed-plonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe}) (diff? test-slow.expected test.output))))) diff --git a/src/lib_epoxy_tx/dune b/src/lib_epoxy_tx/dune index 3a35e4aa0bb042fb99c79f9e1ffb184e09eda5e3..05385d364ef5d6c9b30d6e18e46c748596599be8 100644 --- a/src/lib_epoxy_tx/dune +++ b/src/lib_epoxy_tx/dune @@ -3,11 +3,11 @@ (library (name epoxy_tx) - (public_name octez-epoxy-tx) + (public_name octez-libs.octez-epoxy-tx) (instrumentation (backend bisect_ppx)) (libraries - octez-plompiler + octez-libs.octez-plompiler hex stdint - octez-plonk - octez-mec)) + octez-libs.octez-plonk + octez-libs.octez-mec)) diff --git a/src/lib_epoxy_tx/test/dune b/src/lib_epoxy_tx/test/dune index 667e41edec2122f39c9b8f3ff7901245da5d41fc..0a0729527294ea957662d92aa129eeeb4416b5e6 100644 --- a/src/lib_epoxy_tx/test/dune +++ b/src/lib_epoxy_tx/test/dune @@ -5,25 +5,25 @@ (name main) (instrumentation (backend bisect_ppx)) (libraries - octez-epoxy-tx - octez-plonk.plonk-test - octez-aplonk)) + octez-libs.octez-epoxy-tx + octez-libs.octez-plonk.plonk-test + octez-libs.octez-aplonk)) (rule (alias runtest) - (package octez-epoxy-tx) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe} -q) (diff? test-quick.expected test.output))))) (rule (alias runtest_slow) - (package octez-epoxy-tx) + (package octez-libs) (action (run %{exe:main.exe}))) (rule (alias runtest_slow_with_regression) - (package octez-epoxy-tx) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe}) (diff? test-slow.expected test.output))))) diff --git a/src/lib_event_logging/test_helpers/dune b/src/lib_event_logging/test_helpers/dune index d1edc19bdf770002dd35883cb25af3801e687357..f082fdbe1f6c67f8f5bacf3bedbcf5e8f020819b 100644 --- a/src/lib_event_logging/test_helpers/dune +++ b/src/lib_event_logging/test_helpers/dune @@ -10,7 +10,7 @@ data-encoding octez-libs.tezos-error-monad octez-libs.tezos-event-logging - tezos-test-helpers + octez-libs.tezos-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 37a4d66f972d7a6006dd80de9d1a8455ce84e3dc..e193793da838665f6e2290607f93b052c6f892b9 100644 --- a/src/lib_expect_helper/dune +++ b/src/lib_expect_helper/dune @@ -3,5 +3,5 @@ (library (name tezos_expect_helper) - (public_name tezos-expect-helper) + (public_name octez-libs.tezos-expect-helper) (instrumentation (backend bisect_ppx))) diff --git a/src/lib_expect_helper/test/dune b/src/lib_expect_helper/test/dune index eab8ab0ce2e49522310c89d8442a78c1f0a57f76..ca4a1147e51e90701a0e1ce08be43b2a496dc372 100644 --- a/src/lib_expect_helper/test/dune +++ b/src/lib_expect_helper/test/dune @@ -3,9 +3,9 @@ (library (name tezos_expect_helper_test) - (package tezos-expect-helper) + (package octez-libs) (instrumentation (backend bisect_ppx)) (libraries - tezos-expect-helper) + octez-libs.tezos-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 31b8ad76727e0ca3369873c8d4aa022b4bc3cbfa..f2c28e2886e235741bc01e8079b70b9e8b330c72 100644 --- a/src/lib_gossipsub/dune +++ b/src/lib_gossipsub/dune @@ -3,7 +3,7 @@ (library (name tezos_gossipsub) - (public_name tezos-gossipsub) + (public_name octez-libs.tezos-gossipsub) (instrumentation (backend bisect_ppx)) (libraries ringo diff --git a/src/lib_gossipsub/test/dune b/src/lib_gossipsub/test/dune index fb49e49ea5deaf61094853cc65049e1e15478436..160647b2a2880afe6f29362250be411b0abebd45 100644 --- a/src/lib_gossipsub/test/dune +++ b/src/lib_gossipsub/test/dune @@ -7,10 +7,10 @@ fmt octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-gossipsub + octez-libs.tezos-gossipsub tezt qcheck-core - tezos-test-helpers) + octez-libs.tezos-test-helpers) (flags (:standard) -open Tezos_base.TzPervasives @@ -19,5 +19,5 @@ (rule (alias runtest) - (package tezos-gossipsub-test) + (package octez-libs) (action (run %{dep:./test_gossipsub.exe}))) diff --git a/src/lib_hacl/test/dune b/src/lib_hacl/test/dune index 1d3da7d2134374711bddbdd5aef1782243bd4eb3..a7c56f4a0c3da16d5f9c7e7394cdaf1db7c815d9 100644 --- a/src/lib_hacl/test/dune +++ b/src/lib_hacl/test/dune @@ -17,7 +17,7 @@ octez-libs.tezos-hacl qcheck-alcotest octez-alcotezt - tezos-test-helpers) + octez-libs.tezos-test-helpers) (js_of_ocaml) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune index 59f2b489105c8d4a7264f6dd5b860520ada79270..c1e443424b9a06c97ab8aa1ead1c704cc650bb18 100644 --- a/src/lib_lwt_result_stdlib/test/dune +++ b/src/lib_lwt_result_stdlib/test/dune @@ -11,7 +11,7 @@ lwt.unix octez-alcotezt qcheck-alcotest - tezos-test-helpers) + octez-libs.tezos-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_mec/dune b/src/lib_mec/dune index b0f6523d12e3bdeee9772836aec8512c03e4e384..6662301a0d1ee5201b40c7823dd0d135e9d2159a 100644 --- a/src/lib_mec/dune +++ b/src/lib_mec/dune @@ -3,7 +3,7 @@ (library (name mec) - (public_name octez-mec) + (public_name octez-libs.octez-mec) (instrumentation (backend bisect_ppx)) (libraries alcotest diff --git a/src/lib_mec/test/dune b/src/lib_mec/test/dune index bd1c56895fe7b57112e225233b6013ce9585cc38..ed6bcbddfaa6e97f857e541893a06003a50179c9 100644 --- a/src/lib_mec/test/dune +++ b/src/lib_mec/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core octez-alcotezt - octez-mec) + octez-libs.octez-mec) (library_flags (:standard -linkall)) (flags (:standard) @@ -82,7 +82,7 @@ (rule (alias runtest) - (package octez-mec) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index 63b37fcd11ee00321a0cbe712449dc8db6e87191..574895b062184de2ec21424cf222e0df69d894a1 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base tezos-client-base octez-libs.tezos-shell-services - tezos-protocol-environment + octez-libs.tezos-protocol-environment uri) (flags (:standard) @@ -29,7 +29,7 @@ octez-libs.tezos-rpc octez-libs.tezos-p2p-services octez-libs.tezos-p2p - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix octez-libs.tezos-rpc-http octez-libs.tezos-rpc-http-client @@ -52,7 +52,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-client-commands tezos-client-base tezos-mockup diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune index 246bb50fb29fa501354a938a6c7d63634c782a13..035f619d987ca3c2d01212d247d41800d181a23a 100644 --- a/src/lib_mockup/test/dune +++ b/src/lib_mockup/test/dune @@ -8,7 +8,7 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-base-test-helpers - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-rpc tezos-mockup tezos-mockup-registration diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune index a33de1698708dbdab66b3451176d3ec4c59fb21c..0e7edc83a55dd2475c76a1e2917bf449d90e91f5 100644 --- a/src/lib_mockup_proxy/dune +++ b/src/lib_mockup_proxy/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base tezos-client-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-rpc-http resto-cohttp-self-serving-client octez-libs.tezos-rpc-http-client diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index 31cdd617a4b4046506454a2c2cdaf3c0afd9ccf2..d014e44232af5e36fcc217220eab8778061a3978 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -20,7 +20,7 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib octez-libs.tezos-p2p - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-libs.tezos-event-logging-test-helpers octez-libs.tezos_p2p_test_common diff --git a/src/lib_p2p/tezt/dune b/src/lib_p2p/tezt/dune index 2138615067145c81bd1fa4f46a4306cd9a7efe12..5efc0c8c63e123c59afbd10c6c073f3f9d890fea 100644 --- a/src/lib_p2p/tezt/dune +++ b/src/lib_p2p/tezt/dune @@ -12,7 +12,7 @@ octez-libs.tezos-stdlib octez-libs.tezos-p2p octez-libs.tezos-p2p-services - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-libs.tezos-event-logging-test-helpers octez-libs.tezos_p2p_test_common) diff --git a/src/lib_plompiler/dune b/src/lib_plompiler/dune index c9f35b8069e8330cc4b72e04b1365aa97e409286..6c3712c55f777c46ebd2f82b8f04f65ec7419c33 100644 --- a/src/lib_plompiler/dune +++ b/src/lib_plompiler/dune @@ -3,13 +3,13 @@ (library (name plompiler) - (public_name octez-plompiler) + (public_name octez-libs.octez-plompiler) (instrumentation (backend bisect_ppx)) (libraries repr stdint hacl-star - octez-bls12-381-hash + octez-libs.octez-bls12-381-hash octez-libs.octez-polynomial - octez-mec) + octez-libs.octez-mec) (preprocess (staged_pps ppx_repr ppx_deriving.show))) diff --git a/src/lib_plonk/dune b/src/lib_plonk/dune index 43fe31c09d400d2fbbfc34f113d8947f749444e2..78ce62ed6fdaec159122f9decb6879be18124d4f 100644 --- a/src/lib_plonk/dune +++ b/src/lib_plonk/dune @@ -3,14 +3,14 @@ (library (name plonk) - (public_name octez-plonk) + (public_name octez-libs.octez-plonk) (instrumentation (backend bisect_ppx)) (libraries repr hacl-star data-encoding octez-libs.octez-bls12-381-polynomial - octez-plompiler + octez-libs.octez-plompiler str) (preprocess (pps ppx_repr)) (flags diff --git a/src/lib_plonk/test/dune b/src/lib_plonk/test/dune index 7b251b6aba55f1a6ea2866572bf951eb5f17b1e1..787ed42601a2385b593006b3f81450e3ade5f12a 100644 --- a/src/lib_plonk/test/dune +++ b/src/lib_plonk/test/dune @@ -3,30 +3,30 @@ (library (name plonk_test) - (public_name octez-plonk.plonk-test) + (public_name octez-libs.octez-plonk.plonk-test) (instrumentation (backend bisect_ppx)) (libraries - octez-plonk - octez-plonk.aggregation - octez-plonk.distribution) + octez-libs.octez-plonk + octez-libs.octez-plonk.aggregation + octez-libs.octez-plonk.distribution) (preprocess (pps ppx_repr)) (modules helpers cases)) (rule (alias runtest) - (package octez-plonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe} -q) (diff? test-quick.expected test.output))))) (rule (alias runtest_slow) - (package octez-plonk) + (package octez-libs) (action (run %{exe:main.exe}))) (rule (alias runtest_slow_with_regression) - (package octez-plonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe}) (diff? test-slow.expected test.output))))) @@ -34,7 +34,7 @@ (executable (name main) (libraries - octez-plonk.plonk-test + octez-libs.octez-plonk.plonk-test qcheck-alcotest octez-libs.octez-bls12-381-polynomial) (flags @@ -57,5 +57,5 @@ (executable (name bench) (libraries - octez-plonk.plonk-test) + octez-libs.octez-plonk.plonk-test) (modules bench)) diff --git a/src/lib_plonk/test_plompiler/dune b/src/lib_plonk/test_plompiler/dune index 7b9db49c564ff537cf36c42fec1707b89e846fb5..fe46d7ee0a80337519171827a9d24688391c2e85 100644 --- a/src/lib_plonk/test_plompiler/dune +++ b/src/lib_plonk/test_plompiler/dune @@ -4,15 +4,15 @@ (executable (name afl) (libraries - octez-plompiler - octez-plonk + octez-libs.octez-plompiler + octez-libs.octez-plonk bls12-381) (modules afl)) (executable (name main) (libraries - octez-plonk.plonk-test) + octez-libs.octez-plonk.plonk-test) (modules bench_poseidon benchmark @@ -42,19 +42,19 @@ (rule (alias runtest) - (package octez-plonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe} -q) (diff? test-quick.expected test.output))))) (rule (alias runtest_slow) - (package octez-plonk) + (package octez-libs) (action (run %{exe:main.exe}))) (rule (alias runtest_slow_with_regression) - (package octez-plonk) + (package octez-libs) (action (setenv RANDOM_SEED 42 (progn (run %{exe:main.exe}) (diff? test-slow.expected test.output))))) diff --git a/src/lib_polynomial/test/dune b/src/lib_polynomial/test/dune index 9603cdc8aeddda2f8ce5cd027241334063ab80d1..1c115f4df4b135bdc759feb555030ade6b755c3e 100644 --- a/src/lib_polynomial/test/dune +++ b/src/lib_polynomial/test/dune @@ -7,7 +7,7 @@ (libraries tezt.core bls12-381 - octez-mec + octez-libs.octez-mec octez-alcotezt octez-libs.octez-polynomial) (library_flags (:standard -linkall)) diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index c618c0c6047120d3a8911492e587ddacae0a1e3f..508b9b4a8bc8b1dce0f4cbc581e119c86ef225b4 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment.sigs octez-libs.tezos-stdlib-unix compiler-libs.common lwt.unix @@ -39,17 +39,17 @@ (rule (targets embedded-interfaces-env) - (deps (package tezos-protocol-environment)) + (deps (package octez-libs)) (action (with-stdout-to %{targets} (run bin/cmis_of_cma.exe - %{lib:tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa})))) + %{lib:octez-libs.tezos-protocol-environment.sigs:tezos_protocol_environment_sigs.cmxa})))) (rule (targets embedded_cmis_env.ml) - (deps (package tezos-protocol-environment)) + (deps (package octez-libs)) (action (run %{bin:ocp-ocamlres} -format variants -o %{targets} diff --git a/src/lib_protocol_compiler/registerer/dune b/src/lib_protocol_compiler/registerer/dune index b766764b57758bd3c1b07ec91fbb2b742f9df510..2552049fc3e8ed74946af3cc47b72da7763d77dc 100644 --- a/src/lib_protocol_compiler/registerer/dune +++ b/src/lib_protocol_compiler/registerer/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -opaque diff --git a/src/lib_protocol_environment/context_ops/dune b/src/lib_protocol_environment/context_ops/dune index df85edb248998825aa664070a2d0a67d952aa075..b7f00cab6f67eeaa4272781b3f70c5ec3c3e85ce 100644 --- a/src/lib_protocol_environment/context_ops/dune +++ b/src/lib_protocol_environment/context_ops/dune @@ -8,9 +8,9 @@ (libraries octez-libs.tezos-base octez-libs.tezos-error-monad - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-context - tezos-shell-context) + octez-libs.tezos-shell-context) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index 91b1d551565a1e2f946fc66bca7faae8f34655db..4777ff32eec69aaa78d56a124b12a043c64a9539 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -3,24 +3,24 @@ (library (name tezos_protocol_environment) - (public_name tezos-protocol-environment) + (public_name octez-libs.tezos-protocol-environment) (instrumentation (backend bisect_ppx)) (libraries zarith zarith_stubs_js bls12-381 - octez-plonk + octez-libs.octez-plonk octez-libs.tezos-crypto-dal class_group_vdf aches aches-lwt octez-libs.tezos-base - tezos-sapling - tezos-protocol-environment.sigs - tezos-protocol-environment.structs + octez-libs.tezos-sapling + octez-libs.tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment.structs octez-libs.tezos-micheline octez-libs.tezos-context.memory - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm octez-libs.tezos-event-logging) (flags (:standard) diff --git a/src/lib_protocol_environment/shell_context/dune b/src/lib_protocol_environment/shell_context/dune index 86c91c06d27b45735301a7e08486e129bb1cb292..ba925990c5c06af274ff8d26cba0af4a1c41fb6e 100644 --- a/src/lib_protocol_environment/shell_context/dune +++ b/src/lib_protocol_environment/shell_context/dune @@ -3,11 +3,11 @@ (library (name tezos_shell_context) - (public_name tezos-shell-context) + (public_name octez-libs.tezos-shell-context) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-context) (flags (:standard) diff --git a/src/lib_protocol_environment/sigs-internals/dune b/src/lib_protocol_environment/sigs-internals/dune index e8ae24edc93c134cdb9f1ef01c7a7a7a1bdfb005..01a3d1d18901f6b0e732b36a44b29634afc646bc 100644 --- a/src/lib_protocol_environment/sigs-internals/dune +++ b/src/lib_protocol_environment/sigs-internals/dune @@ -3,5 +3,5 @@ (library (name tezos_protocol_environment_sigs_internals) - (public_name tezos-protocol-environment.sigs-internals) + (public_name octez-libs.tezos-protocol-environment.sigs-internals) (instrumentation (backend bisect_ppx))) diff --git a/src/lib_protocol_environment/sigs/dune b/src/lib_protocol_environment/sigs/dune index b627038b6d0f7eaea36662087ddfe49f97079427..103e69c8e5ab2ca35749ab3c065eeb9c4a758377 100644 --- a/src/lib_protocol_environment/sigs/dune +++ b/src/lib_protocol_environment/sigs/dune @@ -3,10 +3,10 @@ (library (name tezos_protocol_environment_sigs) - (public_name tezos-protocol-environment.sigs) + (public_name octez-libs.tezos-protocol-environment.sigs) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment.sigs-internals) + octez-libs.tezos-protocol-environment.sigs-internals) (flags (:standard) -nostdlib diff --git a/src/lib_protocol_environment/structs/dune b/src/lib_protocol_environment/structs/dune index 86086e65fad2a2d0aadbb0dd8e88086143e00d04..7d13771ab19d6578de4fba6fcc81fef585b8845a 100644 --- a/src/lib_protocol_environment/structs/dune +++ b/src/lib_protocol_environment/structs/dune @@ -3,16 +3,16 @@ (library (name tezos_protocol_environment_structs) - (public_name tezos-protocol-environment.structs) + (public_name octez-libs.tezos-protocol-environment.structs) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-stdlib octez-libs.tezos-crypto octez-libs.tezos-lwt-result-stdlib - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm data-encoding bls12-381 - octez-plonk) + octez-libs.octez-plonk) (flags (:standard) -open Plonk)) diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune index 5180302fc29bb361ef613623ba6f6e368df16100..043adafc6556d5be68e565e7961b9648f87bafaa 100644 --- a/src/lib_protocol_environment/test/dune +++ b/src/lib_protocol_environment/test/dune @@ -8,9 +8,9 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-alcotezt - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest lwt.unix) (library_flags (:standard -linkall)) @@ -39,7 +39,7 @@ (rule (alias runtest) - (package tezos-protocol-environment) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune index caff2f16e7c17097f5629c3a98e0f0a3023f94bd..8919447d3d24b0361986d246540c6bc1029e0aed 100644 --- a/src/lib_protocol_environment/test_shell_context/dune +++ b/src/lib_protocol_environment/test_shell_context/dune @@ -6,11 +6,11 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-shell-context + octez-libs.tezos-shell-context octez-alcotezt - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune index afbc752d0f536c5344d01f31a1ef799ec97c734b..d002816146cb892bd08e852e5a13ba2dd6aa526b 100644 --- a/src/lib_protocol_updater/dune +++ b/src/lib_protocol_updater/dune @@ -10,8 +10,8 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-micheline octez-libs.tezos-shell-services - tezos-protocol-environment - tezos-shell-context + octez-libs.tezos-protocol-environment + octez-libs.tezos-shell-context octez-protocol-compiler.registerer octez-protocol-compiler.native octez-libs.tezos-context diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune index a3269ff906c0ae8dc4d0fb203932c1e01b2088fe..462c3561d1856f69198cc9a7c51c3199a68b2d54 100644 --- a/src/lib_proxy/dune +++ b/src/lib_proxy/dune @@ -9,9 +9,9 @@ aches aches-lwt octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-client-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-rpc octez-libs.tezos-shell-services octez-libs.tezos-context.memory diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index 799b1804240c87f1dab0441ceee7351a01582ca0..d4195dfb75af45b7ce3160645b9face50cb40ead 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -11,7 +11,7 @@ octez-libs.tezos-stdlib-unix tezos-proxy octez-libs.tezos-base-test-helpers - tezos-test-helpers + octez-libs.tezos-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 5927cc655909393e1efd66411c02657c7a8a31a6..3f93620fe9a8e43612d767f00ef10c81e56f6770 100644 --- a/src/lib_proxy/test_helpers/shell_services/dune +++ b/src/lib_proxy/test_helpers/shell_services/dune @@ -6,7 +6,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-shell-services - tezos-test-helpers + octez-libs.tezos-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 66e5c36226c6e2c37fbe14147a3e47897e795859..ebdbaf9bfbf8da4a1b9f72a4a29c66fefdd42810 100644 --- a/src/lib_proxy/test_helpers/shell_services/test/dune +++ b/src/lib_proxy/test_helpers/shell_services/test/dune @@ -8,7 +8,7 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-shell-services tezos_proxy_test_helpers_shell_services qcheck-alcotest diff --git a/src/lib_proxy_server_config/test/dune b/src/lib_proxy_server_config/test/dune index c01f344f194455ecf031e1816cc4aa5f8f78a59a..1c163d0463e655d53f3b9e9bba66531503fa5bca 100644 --- a/src/lib_proxy_server_config/test/dune +++ b/src/lib_proxy_server_config/test/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-base.unix tezos-proxy-server-config - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest octez-alcotezt uri) diff --git a/src/lib_requester/dune b/src/lib_requester/dune index b494dbfe1997f0e118505ae9b81bf899563e1c12..da9b68a9b1b915326b393aeac63fd7d093b72bc7 100644 --- a/src/lib_requester/dune +++ b/src/lib_requester/dune @@ -3,7 +3,7 @@ (library (name tezos_requester) - (public_name tezos-requester) + (public_name octez-libs.tezos-requester) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base diff --git a/src/lib_requester/test/dune b/src/lib_requester/test/dune index 26ce6bf369ee768114ebafedcd634bcc42ef499d..5ce93ef95e5c44a87368bb3cb8b285c3a0081e23 100644 --- a/src/lib_requester/test/dune +++ b/src/lib_requester/test/dune @@ -8,11 +8,11 @@ tezt.core octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - tezos-requester + octez-libs.tezos-requester octez-alcotezt qcheck-alcotest) (library_flags (:standard -linkall)) @@ -38,7 +38,7 @@ (rule (alias runtest) - (package tezos-requester) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_rpc_http/test/dune b/src/lib_rpc_http/test/dune index 70fa8f64c27a7953300ece63a9abcdbf0613abda..d98bc811e5bd16a3713dfe8e755325eb658961b6 100644 --- a/src/lib_rpc_http/test/dune +++ b/src/lib_rpc_http/test/dune @@ -10,7 +10,7 @@ octez-libs.tezos-base.unix octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-libs.tezos-rpc-http-server qcheck-alcotest diff --git a/src/lib_sapling/dune b/src/lib_sapling/dune index 4ae456eb0054ee0984d40dd03cf76a8e67558a43..d3396f3bc68f116f15f7d86f6fbb2f6f6078d8ce 100644 --- a/src/lib_sapling/dune +++ b/src/lib_sapling/dune @@ -5,7 +5,7 @@ (library (name tezos_sapling) - (public_name tezos-sapling) + (public_name octez-libs.tezos-sapling) (instrumentation (backend bisect_ppx)) (libraries integers diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune index 6039198cc269c331f02053af4bafdb8066115a15..eeca0bd46cfb71efba95b91c306ca9156544aeab 100644 --- a/src/lib_sapling/test/dune +++ b/src/lib_sapling/test/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-sapling + octez-libs.tezos-sapling octez-libs.tezos-crypto str octez-libs.tezos-base @@ -41,7 +41,7 @@ (name test_js) (modes js) (libraries - tezos-sapling + octez-libs.tezos-sapling octez-libs.tezos-hacl) (js_of_ocaml) (link_flags @@ -51,7 +51,8 @@ (rule (alias runtest_js) - (package tezos-sapling) + (package octez-libs) + (enabled_if false) (action (run node %{dep:./test_js.bc.js}))) (executable @@ -67,9 +68,9 @@ (rule (alias runtest) - (package tezos-sapling) + (package octez-libs) (deps vectors.csv vectors-zip32.csv) - (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (enabled_if false) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_scoru_sequencer/test/dune b/src/lib_scoru_sequencer/test/dune index 5cf61f807b4401337a675dad319863cfcdbef4e9..d92181da4a5c7e67393144d084b585cb30c43723 100644 --- a/src/lib_scoru_sequencer/test/dune +++ b/src/lib_scoru_sequencer/test/dune @@ -10,7 +10,7 @@ tezos-protocol-alpha octez_smart_rollup_sequencer octez-libs.tezos-base-test-helpers - tezos-test-helpers + octez-libs.tezos-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 bbe945a6bf3c91ea754994c2d560affc5922f50f..78345b9508546d3a7ac09a834bf498bb3a346391 100644 --- a/src/lib_scoru_wasm/bench/dune +++ b/src/lib_scoru_wasm/bench/dune @@ -8,9 +8,9 @@ (libraries octez-libs.tezos-base tezt - tezos-webassembly-interpreter + octez-libs.tezos-webassembly-interpreter octez-libs.tezos-context.memory - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-scoru-wasm-helpers lwt.unix) (preprocess (pps ppx_deriving.show)) diff --git a/src/lib_scoru_wasm/dune b/src/lib_scoru_wasm/dune index e8dd3b586f0c2a3fe2a0fbb3668f7b1112889631..2ec4ab31364198a159212824af513d4cdc225c8c 100644 --- a/src/lib_scoru_wasm/dune +++ b/src/lib_scoru_wasm/dune @@ -3,13 +3,13 @@ (library (name tezos_scoru_wasm) - (public_name tezos-scoru-wasm) + (public_name octez-libs.tezos-scoru-wasm) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding octez-libs.tezos-lazy-containers - tezos-webassembly-interpreter + octez-libs.tezos-webassembly-interpreter octez-libs.tezos-context.sigs octez-libs.tezos-context.memory octez-libs.tezos-lwt-result-stdlib diff --git a/src/lib_scoru_wasm/fast/dune b/src/lib_scoru_wasm/fast/dune index 0990deb02828c774f7e1a3eab51ee6d7f5c3ecbc..7bea795e8d86df586c45838af28041d57ea14da5 100644 --- a/src/lib_scoru_wasm/fast/dune +++ b/src/lib_scoru_wasm/fast/dune @@ -8,9 +8,9 @@ (libraries octez-libs.tezos-base octez-libs.tezos-tree-encoding - tezos-webassembly-interpreter + octez-libs.tezos-webassembly-interpreter octez-libs.tezos-lazy-containers - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-wasmer) (flags (:standard) diff --git a/src/lib_scoru_wasm/fast/test/dune b/src/lib_scoru_wasm/fast/test/dune index 0fe5b51c1b3025891a9e6332e2597d40a6e4c1e2..ecc2fe9d03610e6828d1937055cd0d224b912d42 100644 --- a/src/lib_scoru_wasm/fast/test/dune +++ b/src/lib_scoru_wasm/fast/test/dune @@ -13,8 +13,8 @@ octez-libs.tezos-base-test-helpers tezos-scoru-wasm-helpers tezos_scoru_wasm_test_helpers - tezos-test-helpers - tezos-scoru-wasm + octez-libs.tezos-test-helpers + octez-libs.tezos-scoru-wasm tezos-scoru-wasm-fast qcheck-alcotest octez-alcotezt) diff --git a/src/lib_scoru_wasm/helpers/dune b/src/lib_scoru_wasm/helpers/dune index 671ff59af607d17182db22cc689a9a2bd0c6e2ed..350c9c1420a3900fa396e7d2d7b50b7f7b739206 100644 --- a/src/lib_scoru_wasm/helpers/dune +++ b/src/lib_scoru_wasm/helpers/dune @@ -10,7 +10,7 @@ octez-libs.tezos-tree-encoding octez-libs.tezos-base.unix octez-libs.tezos-context.disk - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-scoru-wasm-fast tezos-webassembly-interpreter-extra) (preprocess (staged_pps ppx_import ppx_deriving.show)) diff --git a/src/lib_scoru_wasm/regressions/dune b/src/lib_scoru_wasm/regressions/dune index b6a0170713c26fa885769d80e62f715c3516ae24..386454c8299c663c41b100eb4487d51fc48dc4d9 100644 --- a/src/lib_scoru_wasm/regressions/dune +++ b/src/lib_scoru_wasm/regressions/dune @@ -7,9 +7,9 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-scoru-wasm-helpers - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-protocol-alpha tezos-smart-rollup-alpha tezos-protocol-alpha.parameters diff --git a/src/lib_scoru_wasm/test/dune b/src/lib_scoru_wasm/test/dune index 22eb736f7c5d2a92d7c9e0f7657ccfb3d5f88203..fdc7fd78f4bea775f59821de0f9cbb416916b48d 100644 --- a/src/lib_scoru_wasm/test/dune +++ b/src/lib_scoru_wasm/test/dune @@ -11,8 +11,8 @@ octez-libs.tezos-base.unix octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers - tezos-test-helpers - tezos-scoru-wasm + octez-libs.tezos-test-helpers + octez-libs.tezos-scoru-wasm qcheck-alcotest octez-alcotezt tezos-scoru-wasm-helpers diff --git a/src/lib_scoru_wasm/test/helpers/dune b/src/lib_scoru_wasm/test/helpers/dune index 1837fae515efe567bb8441c5c277109b58451854..35caf1a0c5d1ccb7ba4d38d56604a1c034d49528 100644 --- a/src/lib_scoru_wasm/test/helpers/dune +++ b/src/lib_scoru_wasm/test/helpers/dune @@ -11,8 +11,8 @@ octez-libs.tezos-base.unix octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers - tezos-test-helpers - tezos-scoru-wasm + octez-libs.tezos-test-helpers + octez-libs.tezos-scoru-wasm tezos_scoru_wasm_durable_snapshot tezos-scoru-wasm-fast tezos-scoru-wasm-helpers diff --git a/src/lib_shell/dune b/src/lib_shell/dune index 5685f69d3ca089481fd6e3637d05009f881b3d03..4267e9359a4edb36d776b4efadcdfa55b5798f83 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -15,15 +15,15 @@ octez-libs.tezos-context tezos-store tezos-store.shared - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-context-ops - tezos-shell-context + octez-libs.tezos-shell-context octez-libs.tezos-p2p octez-libs.tezos-stdlib-unix octez-libs.tezos-shell-services octez-libs.tezos-p2p-services tezos-protocol-updater - tezos-requester + octez-libs.tezos-requester octez-libs.tezos-workers tezos-validation octez-libs.tezos-version diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index c41d37ce8d065f1a9e9a0136324a2b7fb40af42d..6de78b1250b8902e71a26baebc9d9c6003667bb2 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -12,18 +12,18 @@ tezos-store.shared octez-libs.tezos-context tezos-context-ops - tezos-shell-context + octez-libs.tezos-shell-context tezos-protocol-updater octez-libs.tezos-p2p octez-libs.tezos-p2p-services - tezos-requester + octez-libs.tezos-requester tezos-shell octez-libs.tezos-shell-services tezos-embedded-protocol-demo-noops octez-libs.tezos-stdlib-unix tezos-validation octez-libs.tezos-event-logging-test-helpers - tezos-test-helpers + octez-libs.tezos-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 edf338748ddc6678d0a86a1763d433939af94aa6..524223a052af6046647e283e89a9243fe272fced 100644 --- a/src/lib_shell_benchmarks/dune +++ b/src/lib_shell_benchmarks/dune @@ -12,7 +12,7 @@ tezos-benchmark octez-libs.tezos-crypto octez-libs.tezos-context - tezos-shell-context + octez-libs.tezos-shell-context octez-libs.tezos-micheline) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune index 15fbcd347596620faf99e3b4473c23a4e1fad6ed..2b6076289144367f7e264ec2eac1df6a59d4b6f8 100644 --- a/src/lib_signer_backends/unix/dune +++ b/src/lib_signer_backends/unix/dune @@ -10,7 +10,7 @@ fmt octez-libs.tezos-base octez-libs.tezos-base.unix - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-stdlib-unix octez-libs.tezos-stdlib tezos-client-base diff --git a/src/lib_srs_extraction/dune b/src/lib_srs_extraction/dune index 44fd610a9c30e42dead908264c9807845973f17f..0ec4cea83ecd36e72a87faa7c0a7a79f5a169da0 100644 --- a/src/lib_srs_extraction/dune +++ b/src/lib_srs_extraction/dune @@ -3,7 +3,7 @@ (library (name octez_srs_extraction) - (public_name octez-srs-extraction) + (public_name octez-libs.octez-srs-extraction) (libraries bls12-381 octez-libs.octez-bls12-381-polynomial) @@ -15,7 +15,7 @@ (executable (name srs_extraction_main) (libraries - octez-srs-extraction + octez-libs.octez-srs-extraction cmdliner unix bls12-381 diff --git a/src/lib_srs_extraction/test/dune b/src/lib_srs_extraction/test/dune index 065f767147fada71dd8ad26aaf3499538163c740..7297d0b942cdf018173129bad2ed34a8713db8d4 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-srs-extraction + octez-libs.octez-srs-extraction octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -19,7 +19,7 @@ (rule (alias runtest) - (package octez-srs-extraction) + (package octez-libs) (deps srs_zcash_g1_5 phase1radix2m5) (action (progn @@ -35,7 +35,7 @@ (rule (alias runtest) - (package octez-srs-extraction) + (package octez-libs) (deps srs_zcash_g2_5 phase1radix2m5) (action (progn @@ -51,13 +51,13 @@ (rule (alias runtest) - (package octez-srs-extraction) + (package octez-libs) (deps srs_zcash_g1_5 srs_zcash_g2_5) (action (run ../srs_extraction_main.exe check srs_zcash_g1_5 srs_zcash_g2_5))) (rule (alias runtest) - (package octez-srs-extraction) + (package octez-libs) (deps srs_filecoin_g1_6 srs_filecoin_g2_6) (action (run ../srs_extraction_main.exe check srs_filecoin_g1_6 srs_filecoin_g2_6))) @@ -72,7 +72,7 @@ (rule (alias runtest) - (package octez-srs-extraction) + (package octez-libs) (deps phase1radix2m5) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune index 0dc3866008c3ab80d2a16bd17f8b739f3a72f87d..d54ad041b0a21610537fc56d64b7779bd282c3d7 100644 --- a/src/lib_stdlib/test-unix/dune +++ b/src/lib_stdlib/test-unix/dune @@ -10,7 +10,7 @@ octez-alcotezt bigstring lwt.unix - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest) (library_flags (:standard -linkall)) (flags diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune index 7532a76eefd5d06cdfb0fd23bd81aaa86159fa46..b132aa3e9d4748890875b281b7ac7db09faee52d 100644 --- a/src/lib_stdlib/test/dune +++ b/src/lib_stdlib/test/dune @@ -9,7 +9,7 @@ octez-libs.tezos-stdlib octez-alcotezt bigstring - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest) (js_of_ocaml) (library_flags (:standard -linkall)) diff --git a/src/lib_stdlib_unix/test/dune b/src/lib_stdlib_unix/test/dune index b22b55113e3d17f9352c671822086c1fb68e0594..1acb9ca1ee548f61fdadbe550fe6f1162155c655 100644 --- a/src/lib_stdlib_unix/test/dune +++ b/src/lib_stdlib_unix/test/dune @@ -9,7 +9,7 @@ octez-libs.tezos-error-monad octez-libs.tezos-stdlib-unix octez-libs.tezos-event-logging - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_store/mocked/dune b/src/lib_store/mocked/dune index e17afa9acc3b7179c2d3bcad7ac15d853ee9ded4..981b60cd14aa1af45f57f313147560f8f8732268 100644 --- a/src/lib_store/mocked/dune +++ b/src/lib_store/mocked/dune @@ -13,7 +13,7 @@ octez-libs.tezos-context.memory tezos-context-ops tezos-validation - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-store.shared) (flags (:standard) diff --git a/src/lib_store/unix/dune b/src/lib_store/unix/dune index 0508d3128f34bf5f6b3dccf3dd7a2a76a38c4a8e..3e13c03bb442770593d3a22a0afa7f125c9a2e5c 100644 --- a/src/lib_store/unix/dune +++ b/src/lib_store/unix/dune @@ -12,10 +12,10 @@ index irmin-pack tezos-store.shared - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-context tezos-context-ops - tezos-shell-context + octez-libs.tezos-shell-context tezos-validation tezos-protocol-updater octez-libs.tezos-stdlib-unix diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index 645d1935a9540cdf12b59796a62dab29ea77c727..7786f907a0c3ad34acb03cc087c580cc10ef9d2f 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -23,7 +23,7 @@ tezos-protocol-alpha.parameters tezos-protocol-plugin-alpha octez-alcotezt - tezos-test-helpers) + octez-libs.tezos-test-helpers) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/lib_test/dune b/src/lib_test/dune index ba18f2b8fa47f6f87a4f066eaad6dc80fd5eec5e..44ae1a69153eb53b3497807473e12c84b187e2be 100644 --- a/src/lib_test/dune +++ b/src/lib_test/dune @@ -3,7 +3,7 @@ (library (name tezos_test_helpers) - (public_name tezos-test-helpers) + (public_name octez-libs.tezos-test-helpers) (instrumentation (backend bisect_ppx)) (libraries uri diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune index b3f14da4c2274b365ed26bf84e7483c01de1e189..f4ca3ba9d05ac6c4f4cd795ac3c92649ea01b947 100644 --- a/src/lib_tree_encoding/test/dune +++ b/src/lib_tree_encoding/test/dune @@ -11,8 +11,8 @@ octez-libs.tezos-base.unix octez-libs.tezos-context.disk octez-libs.tezos-base-test-helpers - tezos-test-helpers - tezos-webassembly-interpreter + octez-libs.tezos-test-helpers + octez-libs.tezos-webassembly-interpreter qcheck-alcotest octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/lib_validation/dune b/src/lib_validation/dune index a72f7a34b2e82f2e78306f74905922bed03cdacc..9529f8c126d1ae804498e756635598921041617f 100644 --- a/src/lib_validation/dune +++ b/src/lib_validation/dune @@ -12,7 +12,7 @@ octez-libs.tezos-rpc octez-libs.tezos-context tezos-context-ops - tezos-shell-context + octez-libs.tezos-shell-context octez-libs.tezos-shell-services tezos-protocol-updater octez-libs.tezos-stdlib-unix diff --git a/src/lib_webassembly/bin/dune b/src/lib_webassembly/bin/dune index 6da755df7dccbf0a53e71e560c49549d0f5948ca..2ad524707c9e9f37cfb3d6bdcabb2bff96b77e12 100644 --- a/src/lib_webassembly/bin/dune +++ b/src/lib_webassembly/bin/dune @@ -5,7 +5,7 @@ (name main) (instrumentation (backend bisect_ppx)) (libraries - tezos-webassembly-interpreter + octez-libs.tezos-webassembly-interpreter tezos-webassembly-interpreter-extra lwt.unix octez-libs.tezos-tree-encoding diff --git a/src/lib_webassembly/dune b/src/lib_webassembly/dune index 84e48184623fdfd9b47f19654b62e8eaccc46341..246eacf4d61496c324233a4a84cbc10b18d8d2e9 100644 --- a/src/lib_webassembly/dune +++ b/src/lib_webassembly/dune @@ -3,7 +3,7 @@ (library (name tezos_webassembly_interpreter) - (public_name tezos-webassembly-interpreter) + (public_name octez-libs.tezos-webassembly-interpreter) (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-lwt-result-stdlib diff --git a/src/lib_webassembly/extra/dune b/src/lib_webassembly/extra/dune index 2ff68d9228b3e04db89f85bf08167a9f8f5ca057..c9a71978cabea794937412bddf4cde25574d9043 100644 --- a/src/lib_webassembly/extra/dune +++ b/src/lib_webassembly/extra/dune @@ -6,7 +6,7 @@ (public_name tezos-webassembly-interpreter-extra) (instrumentation (backend bisect_ppx)) (libraries - tezos-webassembly-interpreter + octez-libs.tezos-webassembly-interpreter lwt.unix octez-libs.tezos-lazy-containers) (flags diff --git a/src/lib_webassembly/tests/dune b/src/lib_webassembly/tests/dune index 6ff5f874aa5efcbb211376785f479698ee864efb..63f2382774fd5632abf2aac9d134927d6f219739 100644 --- a/src/lib_webassembly/tests/dune +++ b/src/lib_webassembly/tests/dune @@ -6,7 +6,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-webassembly-interpreter + octez-libs.tezos-webassembly-interpreter octez-alcotezt) (library_flags (:standard -linkall)) (flags @@ -29,7 +29,7 @@ (rule (alias runtest) - (package tezos-webassembly-interpreter) + (package octez-libs) (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) diff --git a/src/lib_workers/test/dune b/src/lib_workers/test/dune index e4979704b48962ec435a65e307c420fddede1b3f..d7d3a5f9b4dea0a2e051725ebed743ab2d57d0dd 100644 --- a/src/lib_workers/test/dune +++ b/src/lib_workers/test/dune @@ -10,7 +10,7 @@ octez-libs.tezos-stdlib-unix octez-libs.tezos-base octez-libs.tezos-workers - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base-test-helpers octez-alcotezt) (library_flags (:standard -linkall)) diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune index 0eaefa3925bede4f1ff6f70650a5296a855dae1f..bc0a67623317849aaf8f3fbb6f44ba4511a2d805 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune +++ b/src/proto_000_Ps9mPmXa/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-000-Ps9mPmXa) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-000-Ps9mPmXa diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune b/src/proto_000_Ps9mPmXa/lib_protocol/dune index 1781e7b27540f9e2de3a3465bbbd799c7329804f..d240d149718b335cd9ffcf0404504e53eb3d83bd 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-000-Ps9mPmXa.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_000_Ps9mPmXa)) @@ -39,8 +39,8 @@ (public_name tezos-protocol-000-Ps9mPmXa) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-000-Ps9mPmXa.raw) (flags (:standard) @@ -84,8 +84,8 @@ (public_name tezos-protocol-000-Ps9mPmXa.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-000-Ps9mPmXa) (flags (:standard) @@ -104,8 +104,8 @@ (library (name tezos_protocol_000_Ps9mPmXa_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -131,7 +131,7 @@ (libraries tezos-protocol-000-Ps9mPmXa tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (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 de18443c5a9acfa5d7145d999f35e46a08387d45..44001073f802e283d41a9e2e26bc1569e3f9c2bb 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune +++ b/src/proto_001_PtCJ7pwo/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-001-PtCJ7pwo) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-001-PtCJ7pwo diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune index b80d0e0803a422082b0915dbd722b40c8fd75c95..83c84f67ac65f435ea4c332c5511144d8499c60c 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune @@ -6,10 +6,10 @@ (public_name tezos-client-001-PtCJ7pwo.commands) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-001-PtCJ7pwo octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-001-PtCJ7pwo @@ -33,9 +33,9 @@ (public_name tezos-client-001-PtCJ7pwo.commands-registration) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-001-PtCJ7pwo - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-001-PtCJ7pwo diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune b/src/proto_001_PtCJ7pwo/lib_protocol/dune index 16ea03e5a4f5b89c67a0119f552cda3da7c1e9b3..c7349d43bdd9552330fad04dd0e182692685f436 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-001-PtCJ7pwo.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_001_PtCJ7pwo)) @@ -106,8 +106,8 @@ (public_name tezos-protocol-001-PtCJ7pwo) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-001-PtCJ7pwo.raw) (flags (:standard) @@ -217,8 +217,8 @@ (public_name tezos-protocol-001-PtCJ7pwo.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-001-PtCJ7pwo) (flags (:standard) @@ -237,8 +237,8 @@ (library (name tezos_protocol_001_PtCJ7pwo_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -329,7 +329,7 @@ (libraries tezos-protocol-001-PtCJ7pwo tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (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 4456c96d9ccd94c5d4fbeaba5352c0e211d6ba2d..5bb388a99788d8cbddd055b85936bb33aa319823 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune +++ b/src/proto_002_PsYLVpVv/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-002-PsYLVpVv) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-002-PsYLVpVv diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune index 4aa380eb9684f49a056a264a0462d64e24de6c63..626aca5e962606bb626800a5177daa211f8adf92 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune @@ -6,10 +6,10 @@ (public_name tezos-client-002-PsYLVpVv.commands) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-002-PsYLVpVv octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-002-PsYLVpVv @@ -33,9 +33,9 @@ (public_name tezos-client-002-PsYLVpVv.commands-registration) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-002-PsYLVpVv - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-002-PsYLVpVv diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune b/src/proto_002_PsYLVpVv/lib_protocol/dune index c86cd0ca6bde8767892190f85727d1607c0373e4..884659f9ccca02d8629e9604ae08226fc7300f09 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-002-PsYLVpVv.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_002_PsYLVpVv)) @@ -106,8 +106,8 @@ (public_name tezos-protocol-002-PsYLVpVv) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-002-PsYLVpVv.raw) (flags (:standard) @@ -217,8 +217,8 @@ (public_name tezos-protocol-002-PsYLVpVv.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-002-PsYLVpVv) (flags (:standard) @@ -237,8 +237,8 @@ (library (name tezos_protocol_002_PsYLVpVv_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -329,7 +329,7 @@ (libraries tezos-protocol-002-PsYLVpVv tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (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 847f1607a101cfede43763487f32f0156f02277b..17bf5c1f3e6d9172993d5f6c91e15b0ee9fdb158 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune +++ b/src/proto_003_PsddFKi3/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-003-PsddFKi3) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-003-PsddFKi3 diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune index bd160af44ab8f652ece1faa2d67c789f0d83b6ce..6de75bef8be303cd6b47b3893e60e93e1abd3ddb 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune @@ -6,10 +6,10 @@ (public_name tezos-client-003-PsddFKi3.commands) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-003-PsddFKi3 octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-003-PsddFKi3 @@ -33,9 +33,9 @@ (public_name tezos-client-003-PsddFKi3.commands-registration) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-003-PsddFKi3 - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-003-PsddFKi3 diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune b/src/proto_003_PsddFKi3/lib_protocol/dune index e63065ee93368db729cea47fff7134d9adf7e2eb..2e2c054deaa6396d8b6302999db9cc84a4e9dabf 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune +++ b/src/proto_003_PsddFKi3/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-003-PsddFKi3.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_003_PsddFKi3)) @@ -107,8 +107,8 @@ (public_name tezos-protocol-003-PsddFKi3) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-003-PsddFKi3.raw) (flags (:standard) @@ -219,8 +219,8 @@ (public_name tezos-protocol-003-PsddFKi3.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-003-PsddFKi3) (flags (:standard) @@ -239,8 +239,8 @@ (library (name tezos_protocol_003_PsddFKi3_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -332,7 +332,7 @@ (libraries tezos-protocol-003-PsddFKi3 tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (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 3c0fc8ab8b63827970fbf6e55eedab5fed4e0ec4..3ba8deac382814b52e9da93e5fcc34eefd0e4816 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune +++ b/src/proto_004_Pt24m4xi/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-004-Pt24m4xi) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-004-Pt24m4xi diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune index d66eb36d19c0f2ca3387603749c6cad607254a2f..19fd467ee9a7e6344bc2746f57b44b20d556c72f 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune @@ -6,10 +6,10 @@ (public_name tezos-client-004-Pt24m4xi.commands) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-004-Pt24m4xi octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-004-Pt24m4xi @@ -33,9 +33,9 @@ (public_name tezos-client-004-Pt24m4xi.commands-registration) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-004-Pt24m4xi - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-004-Pt24m4xi diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune b/src/proto_004_Pt24m4xi/lib_protocol/dune index 4f8ec44ea31e019f1da6b93089ee4429007fee41..9d337fc9516279001e6e12d79812db7e51033b2b 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-004-Pt24m4xi.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_004_Pt24m4xi)) @@ -107,8 +107,8 @@ (public_name tezos-protocol-004-Pt24m4xi) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-004-Pt24m4xi.raw) (flags (:standard) @@ -219,8 +219,8 @@ (public_name tezos-protocol-004-Pt24m4xi.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-004-Pt24m4xi) (flags (:standard) @@ -239,8 +239,8 @@ (library (name tezos_protocol_004_Pt24m4xi_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -332,7 +332,7 @@ (libraries tezos-protocol-004-Pt24m4xi tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune b/src/proto_005_PsBABY5H/lib_protocol/dune index e7ac4a3e6249a664a15439b8621808aa210efae2..fc9ccc6c8247abfddbd10f03dbd2524980e25058 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune +++ b/src/proto_005_PsBABY5H/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-005-PsBABY5H.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_005_PsBABY5H)) @@ -108,8 +108,8 @@ (public_name tezos-protocol-005-PsBABY5H) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBABY5H.raw) (flags (:standard) @@ -221,8 +221,8 @@ (public_name tezos-protocol-005-PsBABY5H.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBABY5H) (flags (:standard) @@ -241,8 +241,8 @@ (library (name tezos_protocol_005_PsBABY5H_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -335,7 +335,7 @@ (libraries tezos-protocol-005-PsBABY5H tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (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 dc85b901651761157c4ea304bc410a26a9d039c9..27052582ebb5bbb845184996b3bb11a080c311bc 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune +++ b/src/proto_005_PsBabyM1/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-005-PsBabyM1) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-005-PsBabyM1 diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune index 6116ec928a9c0dc06192d72b9dc217e956a76858..982bb97c4ba48e78f2aaf0f78a1418b686ddd18d 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune @@ -6,10 +6,10 @@ (public_name tezos-client-005-PsBabyM1.commands) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-005-PsBabyM1 octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-005-PsBabyM1 @@ -33,9 +33,9 @@ (public_name tezos-client-005-PsBabyM1.commands-registration) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-005-PsBabyM1 - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-005-PsBabyM1 diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune b/src/proto_005_PsBabyM1/lib_protocol/dune index 6adf7a012dd38e4c6816b9afc8a7c1827b0575bc..9949d43268c5d573f36e8264eeea41b866134951 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune +++ b/src/proto_005_PsBabyM1/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-005-PsBabyM1.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_005_PsBabyM1)) @@ -108,8 +108,8 @@ (public_name tezos-protocol-005-PsBabyM1) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBabyM1.raw) (flags (:standard) @@ -221,8 +221,8 @@ (public_name tezos-protocol-005-PsBabyM1.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-005-PsBabyM1) (flags (:standard) @@ -241,8 +241,8 @@ (library (name tezos_protocol_005_PsBabyM1_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -335,7 +335,7 @@ (libraries tezos-protocol-005-PsBabyM1 tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (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 c4946a845bd406f7cb13deae5a9bd2e6f6d5279f..148ca144f8ceaea7bd53d0f4d434d6faf033cccc 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune +++ b/src/proto_006_PsCARTHA/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-006-PsCARTHA) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-006-PsCARTHA diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune index 1d429de141c66c7d9e7d760a5d0cc02d7b9b0112..a338d91dbe20acf46560f063081912b7fdf1c805 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune @@ -6,10 +6,10 @@ (public_name tezos-client-006-PsCARTHA.commands) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-006-PsCARTHA octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-006-PsCARTHA @@ -33,9 +33,9 @@ (public_name tezos-client-006-PsCARTHA.commands-registration) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-006-PsCARTHA - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-006-PsCARTHA diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune b/src/proto_006_PsCARTHA/lib_protocol/dune index f9018030da005e9068092d6b2898d0786d765969..de31f0e42203f3ea48800589bae1a8abd7144261 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-006-PsCARTHA.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_006_PsCARTHA)) @@ -108,8 +108,8 @@ (public_name tezos-protocol-006-PsCARTHA) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-006-PsCARTHA.raw) (flags (:standard) @@ -221,8 +221,8 @@ (public_name tezos-protocol-006-PsCARTHA.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-006-PsCARTHA) (flags (:standard) @@ -241,8 +241,8 @@ (library (name tezos_protocol_006_PsCARTHA_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -335,7 +335,7 @@ (libraries tezos-protocol-006-PsCARTHA tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (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 7321e0ace5008ac2c14f5294882e7926998e125f..53640f94a0d4a4e487b1156893160b9f61ff8658 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune +++ b/src/proto_007_PsDELPH1/lib_client/dune @@ -6,7 +6,7 @@ (public_name tezos-client-007-PsDELPH1) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-007-PsDELPH1 diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune index fbd7c960f579454d9f88b612c22b4c3b1cde2042..40a5e44a83b83f1896574b791c400cb59be7e40d 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune @@ -6,10 +6,10 @@ (public_name tezos-client-007-PsDELPH1.commands) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-007-PsDELPH1 octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-007-PsDELPH1 @@ -33,9 +33,9 @@ (public_name tezos-client-007-PsDELPH1.commands-registration) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-007-PsDELPH1 - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-007-PsDELPH1 diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune b/src/proto_007_PsDELPH1/lib_protocol/dune index 1f48123cfe3169025b461c97aacee618acfae11e..b2354d30517b94ab6ed53680cb19f3086d0a25a4 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-007-PsDELPH1.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_007_PsDELPH1)) @@ -110,8 +110,8 @@ (public_name tezos-protocol-007-PsDELPH1) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-007-PsDELPH1.raw) (flags (:standard) @@ -225,8 +225,8 @@ (public_name tezos-protocol-007-PsDELPH1.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-007-PsDELPH1) (flags (:standard) @@ -245,8 +245,8 @@ (library (name tezos_protocol_007_PsDELPH1_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -341,7 +341,7 @@ (libraries tezos-protocol-007-PsDELPH1 tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune index 5c0611a384714a64ff206ea17086e3b1563272f5..fda20498ca32d4406f54d158e5b02f5f74c5f25d 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/dune +++ b/src/proto_008_PtEdo2Zk/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-008-PtEdo2Zk diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune index 51db04c1b229cf096375d2d8b4b6e0cc79ae5b78..086d6d8e82696696359f3967dfbced6cba124750 100644 --- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune +++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune @@ -7,10 +7,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-008-PtEdo2Zk octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-008-PtEdo2Zk @@ -37,9 +37,9 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-008-PtEdo2Zk - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-008-PtEdo2Zk diff --git a/src/proto_008_PtEdo2Zk/lib_protocol/dune b/src/proto_008_PtEdo2Zk/lib_protocol/dune index 069dd812742e9536679a3fadd4974c336fe4bc03..5d98a0f74e74aad92f01c3c9b16f625e8eed339e 100644 --- a/src/proto_008_PtEdo2Zk/lib_protocol/dune +++ b/src/proto_008_PtEdo2Zk/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-008-PtEdo2Zk.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_008_PtEdo2Zk)) @@ -115,8 +115,8 @@ (public_name tezos-protocol-008-PtEdo2Zk) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdo2Zk.raw) (flags (:standard) @@ -235,8 +235,8 @@ (public_name tezos-protocol-008-PtEdo2Zk.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdo2Zk) (flags (:standard) @@ -255,8 +255,8 @@ (library (name tezos_protocol_008_PtEdo2Zk_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -356,7 +356,7 @@ (libraries tezos-protocol-008-PtEdo2Zk tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_008_PtEdoTez/lib_protocol/dune b/src/proto_008_PtEdoTez/lib_protocol/dune index 81a9251fc0e5ddb2249e02e0c89c41c225cfcd8b..9be240cc648bfb68831985faac954df97d94417b 100644 --- a/src/proto_008_PtEdoTez/lib_protocol/dune +++ b/src/proto_008_PtEdoTez/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-008-PtEdoTez.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_008_PtEdoTez)) @@ -115,8 +115,8 @@ (public_name tezos-protocol-008-PtEdoTez) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdoTez.raw) (flags (:standard) @@ -235,8 +235,8 @@ (public_name tezos-protocol-008-PtEdoTez.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-008-PtEdoTez) (flags (:standard) @@ -255,8 +255,8 @@ (library (name tezos_protocol_008_PtEdoTez_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -356,7 +356,7 @@ (libraries tezos-protocol-008-PtEdoTez tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index e9f05d526c8a2fbd6f2f5389751796f41fdb2d21..055d1f51644f7fa5cfe75a15e669e83232d180ae 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-009-PsFLoren diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune index b77cfbf43fa9065a686fd96ba21baed30de003cf..90a96786bb926f567c9cda654ace700c55d5d126 100644 --- a/src/proto_009_PsFLoren/lib_client_commands/dune +++ b/src/proto_009_PsFLoren/lib_client_commands/dune @@ -7,10 +7,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-009-PsFLoren octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-009-PsFLoren @@ -39,9 +39,9 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-009-PsFLoren - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-009-PsFLoren diff --git a/src/proto_009_PsFLoren/lib_protocol/dune b/src/proto_009_PsFLoren/lib_protocol/dune index 9e4c7d5d757ef1b57c6d863ff2ed4ada153e8805..ac16d840cc4bce5d0f0202d513f188db57d17d0d 100644 --- a/src/proto_009_PsFLoren/lib_protocol/dune +++ b/src/proto_009_PsFLoren/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-009-PsFLoren.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_009_PsFLoren)) @@ -118,8 +118,8 @@ (public_name tezos-protocol-009-PsFLoren) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-009-PsFLoren.raw) (flags (:standard) @@ -241,8 +241,8 @@ (public_name tezos-protocol-009-PsFLoren.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-009-PsFLoren) (flags (:standard) @@ -261,8 +261,8 @@ (library (name tezos_protocol_009_PsFLoren_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -365,7 +365,7 @@ (libraries tezos-protocol-009-PsFLoren tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index ee9b7a29f1a7dbfb41648e2866d9db194b43fd31..9b3424ba64bad189ac524efd767a5b7517254755 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-010-PtGRANAD diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune index 0bb9e796ccadbe7941cbae30390ff32a2d2f53e8..a71ce8782531ddf9d46a26fa2f66d6fa187338e2 100644 --- a/src/proto_010_PtGRANAD/lib_client_commands/dune +++ b/src/proto_010_PtGRANAD/lib_client_commands/dune @@ -7,10 +7,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-010-PtGRANAD octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-010-PtGRANAD @@ -39,9 +39,9 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-010-PtGRANAD - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-010-PtGRANAD diff --git a/src/proto_010_PtGRANAD/lib_protocol/dune b/src/proto_010_PtGRANAD/lib_protocol/dune index d715daf52d71adea12cf5bf3f48651439d5bf05d..b49429beedebebfac0a0587d8234733d0d9c3a88 100644 --- a/src/proto_010_PtGRANAD/lib_protocol/dune +++ b/src/proto_010_PtGRANAD/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-010-PtGRANAD.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_010_PtGRANAD)) @@ -123,8 +123,8 @@ (public_name tezos-protocol-010-PtGRANAD) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-010-PtGRANAD.raw) (flags (:standard) @@ -251,8 +251,8 @@ (public_name tezos-protocol-010-PtGRANAD.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-010-PtGRANAD) (flags (:standard) @@ -271,8 +271,8 @@ (library (name tezos_protocol_010_PtGRANAD_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -6-7-9-16-29-32-51-68 @@ -380,7 +380,7 @@ (libraries tezos-protocol-010-PtGRANAD tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index 0084cbc3cccf534a9cc42870ae98b85f9f86cf96..80c6a9f1c702ed39c26315df4e5e53ce2c4f8de9 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-011-PtHangz2 diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune index 29cc24a797ee9f1746c450be688df34071e6344d..867dda9208d22c9532c5eba5d970336079c7ac6e 100644 --- a/src/proto_011_PtHangz2/lib_client_commands/dune +++ b/src/proto_011_PtHangz2/lib_client_commands/dune @@ -7,10 +7,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-011-PtHangz2 octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration @@ -43,9 +43,9 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-011-PtHangz2 - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-011-PtHangz2 diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune index df12d4bf49bd11daabf860e2df3c716a68467e19..b3c22a573185fb7cc1fd05d57cff298d3fe2c92f 100644 --- a/src/proto_011_PtHangz2/lib_client_sapling/dune +++ b/src/proto_011_PtHangz2/lib_client_sapling/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix tezos-client-base diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune index b133366e5a981e00710b0b8747eb07675c908276..99a1e461b50c2b7d39368beb450342bd36cf2164 100644 --- a/src/proto_011_PtHangz2/lib_parameters/dune +++ b/src/proto_011_PtHangz2/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-011-PtHangz2) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index eb025d6ace7b28b83d78b497bab6a75fdb60656a..afcf1fdb3f9ce3240e908bf7c01c30c0ad410e4a 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-011-PtHangz2.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_011_PtHangz2)) @@ -136,8 +136,8 @@ (public_name tezos-protocol-011-PtHangz2) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-011-PtHangz2.raw) (flags (:standard) @@ -272,8 +272,8 @@ (public_name tezos-protocol-011-PtHangz2.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-011-PtHangz2) (flags (:standard) @@ -292,8 +292,8 @@ (library (name tezos_protocol_011_PtHangz2_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -51 @@ -414,7 +414,7 @@ (libraries tezos-protocol-011-PtHangz2 tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index 04f34d78821ba9757aa77ca52b9c2614ac4b499e..b29571bf7379ceff941bc6d3ec190317293d370b 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-012-Psithaca diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune index 331e82bbec034914b252f3b587c84ff2e494ed15..673b260000861e07d84e57803e8be258dd44b5f7 100644 --- a/src/proto_012_Psithaca/lib_client_commands/dune +++ b/src/proto_012_Psithaca/lib_client_commands/dune @@ -7,10 +7,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-012-Psithaca octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration @@ -43,9 +43,9 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-012-Psithaca - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-012-Psithaca diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune index be0edb69edc6d8a12e938d733b574a78ca55f514..d21e2fd5ce4697ccc71117be9c73b78bb18defe7 100644 --- a/src/proto_012_Psithaca/lib_client_sapling/dune +++ b/src/proto_012_Psithaca/lib_client_sapling/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix tezos-client-base diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune index 10959854f7ec1f26256090224896c3fa33530097..22de2f0fc052bfe02f7b4d54f2750fd7a6056c86 100644 --- a/src/proto_012_Psithaca/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-012-Psithaca) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index b48ceacc88d8bc6765c3deb3037f2a400489dfc5..dbb97194aed6e5d34ab8471b26ee1385e9fbc2bb 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-012-Psithaca.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_012_Psithaca)) @@ -153,8 +153,8 @@ (public_name tezos-protocol-012-Psithaca) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-012-Psithaca.raw) (flags (:standard) @@ -306,8 +306,8 @@ (public_name tezos-protocol-012-Psithaca.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-012-Psithaca) (flags (:standard) @@ -326,8 +326,8 @@ (library (name tezos_protocol_012_Psithaca_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -51 @@ -465,7 +465,7 @@ (libraries tezos-protocol-012-Psithaca tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index 42100b03fb73b3db76b4a335c7c3b2992040617d..85cd4d450d18541ab8fd3a0dfd32cb6e8d79bdcc 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-013-PtJakart diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune index 0f948dd83a1a0f0340d03f08a738ffc5d01f0871..e04869f9588677135aa18f797942e5ffab31de6f 100644 --- a/src/proto_013_PtJakart/lib_client_commands/dune +++ b/src/proto_013_PtJakart/lib_client_commands/dune @@ -7,11 +7,11 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration @@ -45,10 +45,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-013-PtJakart diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune index 59582996f10605d7dcf74e9f20ff114aef8d830c..d62537b040495f89f0213979d591d147233e10c4 100644 --- a/src/proto_013_PtJakart/lib_client_sapling/dune +++ b/src/proto_013_PtJakart/lib_client_sapling/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix tezos-client-base diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune index 46d9704b18d086f12c33dbdf58bbbe3b82338e15..791a6a5c2888e1486f5ef86d84345b42b075246d 100644 --- a/src/proto_013_PtJakart/lib_parameters/dune +++ b/src/proto_013_PtJakart/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-013-PtJakart) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index 9e3264aa8e1d436fa5a31315e96191d61dea2582..a8ed057f1bb60814867f161b323b3aae5f0dcaf3 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-013-PtJakart.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_013_PtJakart)) @@ -218,8 +218,8 @@ (public_name tezos-protocol-013-PtJakart) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-013-PtJakart.raw) (flags (:standard) @@ -437,8 +437,8 @@ (public_name tezos-protocol-013-PtJakart.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-013-PtJakart) (flags (:standard) @@ -457,8 +457,8 @@ (library (name tezos_protocol_013_PtJakart_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -w -51 @@ -662,7 +662,7 @@ (libraries tezos-protocol-013-PtJakart tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune index c387fa10988cc64ad1ee1efb39667e59b91387e8..a27221fb0e508d6276065bba1056d25f32afcf3c 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-014-PtKathma diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune index 14e362694cc249a52d1c7ee3de80f6bd30ad8b4b..61e539f20c7c8677b84d6b4afb5a1e6f911df327 100644 --- a/src/proto_014_PtKathma/lib_client_commands/dune +++ b/src/proto_014_PtKathma/lib_client_commands/dune @@ -7,11 +7,11 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration @@ -45,10 +45,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-014-PtKathma diff --git a/src/proto_014_PtKathma/lib_client_sapling/dune b/src/proto_014_PtKathma/lib_client_sapling/dune index ada9bf0e1bf813ea041a5100ebc92e8226c72a1d..84700fa1ae4f889b5970502fa72e223882d7e0a9 100644 --- a/src/proto_014_PtKathma/lib_client_sapling/dune +++ b/src/proto_014_PtKathma/lib_client_sapling/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix tezos-client-base diff --git a/src/proto_014_PtKathma/lib_parameters/dune b/src/proto_014_PtKathma/lib_parameters/dune index ff9dcdeb888387425dda796dd5b3254a9293af02..f81466eded4bbfe459739ab4ba2ded240a9fa6b4 100644 --- a/src/proto_014_PtKathma/lib_parameters/dune +++ b/src/proto_014_PtKathma/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-014-PtKathma) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_014_PtKathma/lib_protocol/dune b/src/proto_014_PtKathma/lib_protocol/dune index 7ffe064a22a976220bfbf6e4b887b5641ed1b320..596711949d6f26391d32fca13d2580a4249d1408 100644 --- a/src/proto_014_PtKathma/lib_protocol/dune +++ b/src/proto_014_PtKathma/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-014-PtKathma.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_014_PtKathma)) @@ -241,8 +241,8 @@ (public_name tezos-protocol-014-PtKathma) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-014-PtKathma.raw) (flags (:standard) @@ -484,8 +484,8 @@ (public_name tezos-protocol-014-PtKathma.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-014-PtKathma) (flags (:standard) @@ -503,8 +503,8 @@ (library (name tezos_protocol_014_PtKathma_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -732,7 +732,7 @@ (libraries tezos-protocol-014-PtKathma tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_015_PtLimaPt/lib_client/dune b/src/proto_015_PtLimaPt/lib_client/dune index 2f34e64828d0544e606436fbe83562fb3e087d47..ad2ca11d6ace31324475455d65c3f8f48a5ef3dc 100644 --- a/src/proto_015_PtLimaPt/lib_client/dune +++ b/src/proto_015_PtLimaPt/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-015-PtLimaPt diff --git a/src/proto_015_PtLimaPt/lib_client_commands/dune b/src/proto_015_PtLimaPt/lib_client_commands/dune index c9cca52a8eaeeec599c2e27ba17e2f9831f92132..bbc97162cc67aeff5a5db27512c2417659c60766 100644 --- a/src/proto_015_PtLimaPt/lib_client_commands/dune +++ b/src/proto_015_PtLimaPt/lib_client_commands/dune @@ -7,11 +7,11 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration @@ -44,10 +44,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-015-PtLimaPt diff --git a/src/proto_015_PtLimaPt/lib_client_sapling/dune b/src/proto_015_PtLimaPt/lib_client_sapling/dune index 82991c64c24ca756c3ee38cc6407a01035a7fa84..cf26b963080e3ab679cd12b8bc73112950a3c8b1 100644 --- a/src/proto_015_PtLimaPt/lib_client_sapling/dune +++ b/src/proto_015_PtLimaPt/lib_client_sapling/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix tezos-client-base diff --git a/src/proto_015_PtLimaPt/lib_parameters/dune b/src/proto_015_PtLimaPt/lib_parameters/dune index 41148d5ff4975766c84ed841df4b355030d50a2a..218b5d2276aa73c6149be82d45be13686e3ffd47 100644 --- a/src/proto_015_PtLimaPt/lib_parameters/dune +++ b/src/proto_015_PtLimaPt/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-015-PtLimaPt) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_015_PtLimaPt/lib_protocol/dune b/src/proto_015_PtLimaPt/lib_protocol/dune index dc8a78ca0ba3d7fd128b02f79f12d83e269f076e..2864672c198d95936cf1cf780bd96c87854a27b1 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-015-PtLimaPt.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_015_PtLimaPt)) @@ -265,8 +265,8 @@ (public_name tezos-protocol-015-PtLimaPt) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-015-PtLimaPt.raw) (flags (:standard) @@ -533,8 +533,8 @@ (public_name tezos-protocol-015-PtLimaPt.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-015-PtLimaPt) (flags (:standard) @@ -552,8 +552,8 @@ (library (name tezos_protocol_015_PtLimaPt_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -806,7 +806,7 @@ (libraries tezos-protocol-015-PtLimaPt tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_016_PtMumbai/lib_client/dune b/src/proto_016_PtMumbai/lib_client/dune index 9ff53959533e9ce002d6199ab9c92c641c51d7cd..95671d31e05f5c5f08853c58cc20018e339e733b 100644 --- a/src/proto_016_PtMumbai/lib_client/dune +++ b/src/proto_016_PtMumbai/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_client_commands/dune b/src/proto_016_PtMumbai/lib_client_commands/dune index e241fdcd51c6ebe7c597a099d55be360068ba912..6a4d5e8089c351f8e1fc8a36305f424ac632927f 100644 --- a/src/proto_016_PtMumbai/lib_client_commands/dune +++ b/src/proto_016_PtMumbai/lib_client_commands/dune @@ -7,11 +7,11 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration @@ -44,10 +44,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-016-PtMumbai diff --git a/src/proto_016_PtMumbai/lib_client_sapling/dune b/src/proto_016_PtMumbai/lib_client_sapling/dune index 51fc27fdc74626646da551383afb110f1bb0dcdd..acbe8d47a02d7fc1ea5b43d3a0df128e7aac65a5 100644 --- a/src/proto_016_PtMumbai/lib_client_sapling/dune +++ b/src/proto_016_PtMumbai/lib_client_sapling/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix tezos-client-base diff --git a/src/proto_016_PtMumbai/lib_parameters/dune b/src/proto_016_PtMumbai/lib_parameters/dune index 521b04ff896e90714020c03477f3ac8873f8b970..d86489e6d6741a4ae4d6ee141502b136591cc930 100644 --- a/src/proto_016_PtMumbai/lib_parameters/dune +++ b/src/proto_016_PtMumbai/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-016-PtMumbai) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_016_PtMumbai/lib_protocol/dune b/src/proto_016_PtMumbai/lib_protocol/dune index 81fa7a916a63299d88cfd9b1ad8e0c8e18dcd708..279fb749c9d6e72e1d318300e964a43ca1ca857a 100644 --- a/src/proto_016_PtMumbai/lib_protocol/dune +++ b/src/proto_016_PtMumbai/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-016-PtMumbai.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_016_PtMumbai)) @@ -281,8 +281,8 @@ (public_name tezos-protocol-016-PtMumbai) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-016-PtMumbai.raw) (flags (:standard) @@ -567,8 +567,8 @@ (public_name tezos-protocol-016-PtMumbai.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-016-PtMumbai) (flags (:standard) @@ -586,8 +586,8 @@ (library (name tezos_protocol_016_PtMumbai_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -858,7 +858,7 @@ (libraries tezos-protocol-016-PtMumbai tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_017_PtNairob/bin_accuser/dune b/src/proto_017_PtNairob/bin_accuser/dune index 441613ee6c7aa967b78f731d5a148b95790f841f..81bfdb52f33781e7c036e2e696e67cdca8e2f3b8 100644 --- a/src/proto_017_PtNairob/bin_accuser/dune +++ b/src/proto_017_PtNairob/bin_accuser/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-client-commands diff --git a/src/proto_017_PtNairob/bin_baker/dune b/src/proto_017_PtNairob/bin_baker/dune index 5bb617527a118da5135428f37240ff21fd82a833..028186ff7290c9b19a429c45277ffb89dd59b44d 100644 --- a/src/proto_017_PtNairob/bin_baker/dune +++ b/src/proto_017_PtNairob/bin_baker/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-client-commands diff --git a/src/proto_017_PtNairob/bin_sc_rollup_client/dune b/src/proto_017_PtNairob/bin_sc_rollup_client/dune index c5588a6d3ee554bab349533b0f0c6bbfa3bd857b..9b1a7a1db37ca7ea8fbe826e8f35d6b923865387 100644 --- a/src/proto_017_PtNairob/bin_sc_rollup_client/dune +++ b/src/proto_017_PtNairob/bin_sc_rollup_client/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-017-PtNairob 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 fb02b5d086ec7d55175de9644b0ef6ec1c62281c..7f2b3df73f1c00a95369d4b590577b22ded520a9 100644 --- a/src/proto_017_PtNairob/bin_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/bin_sc_rollup_node/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-017-PtNairob octez-libs.tezos-shell-services tezos-client-base diff --git a/src/proto_017_PtNairob/lib_benchmarks_proto/dune b/src/proto_017_PtNairob/lib_benchmarks_proto/dune index 67fd0b8de2b3568f5af6163e077ec59fc931bb0b..a2367fbccc485dba711025bba2c891c2961c5a8c 100644 --- a/src/proto_017_PtNairob/lib_benchmarks_proto/dune +++ b/src/proto_017_PtNairob/lib_benchmarks_proto/dune @@ -20,10 +20,10 @@ tezos-shell-benchmarks octez-libs.tezos-micheline tezos-017-PtNairob-test-helpers - tezos-sapling + octez-libs.tezos-sapling tezos-client-017-PtNairob tezos-protocol-plugin-017-PtNairob - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_017_PtNairob/lib_client/dune b/src/proto_017_PtNairob/lib_client/dune index d3881234189a29c3ab374ba0dfa445253fa5aaae..e433969ebab93707c8bcf493d5bf579ccaf96116 100644 --- a/src/proto_017_PtNairob/lib_client/dune +++ b/src/proto_017_PtNairob/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_client/test/dune b/src/proto_017_PtNairob/lib_client/test/dune index 53b7c4bbe104ebbf867963b2803e029e6f096e9b..01690a4a58f89c815a2c4433a34abde2c7fdf707 100644 --- a/src/proto_017_PtNairob/lib_client/test/dune +++ b/src/proto_017_PtNairob/lib_client/test/dune @@ -11,7 +11,7 @@ tezos-client-017-PtNairob tezos-protocol-017-PtNairob octez-libs.tezos-base-test-helpers - tezos-test-helpers + octez-libs.tezos-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 0a91c6cd47965e66906da1f482ab24504edce3ab..d7630d672743a61b598748a0f20765e95a7cd038 100644 --- a/src/proto_017_PtNairob/lib_client_commands/dune +++ b/src/proto_017_PtNairob/lib_client_commands/dune @@ -7,11 +7,11 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration @@ -44,10 +44,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_client_sapling/dune b/src/proto_017_PtNairob/lib_client_sapling/dune index c48773c5a049961ef1fb7dae67f82010dcd659b3..cc2542332f3d58cab6ada8418963ea6c4a4eaba5 100644 --- a/src/proto_017_PtNairob/lib_client_sapling/dune +++ b/src/proto_017_PtNairob/lib_client_sapling/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix tezos-client-base diff --git a/src/proto_017_PtNairob/lib_delegate/dune b/src/proto_017_PtNairob/lib_delegate/dune index d12dce570ca0b05422da756d76120feb11e1e112..bb5e7920b3b91ff37142e768ff8cbdf22979750e 100644 --- a/src/proto_017_PtNairob/lib_delegate/dune +++ b/src/proto_017_PtNairob/lib_delegate/dune @@ -7,18 +7,18 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-version.value tezos-protocol-017-PtNairob tezos-protocol-plugin-017-PtNairob - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-017-PtNairob tezos-client-commands octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - tezos-shell-context + octez-libs.tezos-shell-context octez-libs.tezos-context octez-libs.tezos-context.memory octez-libs.tezos-rpc-http-client-unix @@ -56,7 +56,7 @@ octez-libs.tezos-base tezos-protocol-017-PtNairob octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-017-PtNairob @@ -85,7 +85,7 @@ (libraries octez-libs.tezos-base tezos-protocol-017-PtNairob - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-017-PtNairob diff --git a/src/proto_017_PtNairob/lib_parameters/dune b/src/proto_017_PtNairob/lib_parameters/dune index 49d406d6a4fcd72837fecef5dc21b418c249e459..bdc1290e9a0e9dae638ba86189129fb7d0be9753 100644 --- a/src/proto_017_PtNairob/lib_parameters/dune +++ b/src/proto_017_PtNairob/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-017-PtNairob) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_plugin/test/dune b/src/proto_017_PtNairob/lib_plugin/test/dune index eb2c52924ce77e88b1b1a779834957383a1ebd4c..2f35c57011d27a3e46a99d595aaaa7925d490b7b 100644 --- a/src/proto_017_PtNairob/lib_plugin/test/dune +++ b/src/proto_017_PtNairob/lib_plugin/test/dune @@ -10,7 +10,7 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-base.unix octez-alcotezt - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest octez-libs.tezos-stdlib-unix octez-libs.tezos-micheline diff --git a/src/proto_017_PtNairob/lib_protocol/dune b/src/proto_017_PtNairob/lib_protocol/dune index 05956a2b2b4c837f6febba07f70fc0a908f9dd3b..66b530842afee64a45999d21e368b94ace76c652 100644 --- a/src/proto_017_PtNairob/lib_protocol/dune +++ b/src/proto_017_PtNairob/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-017-PtNairob.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_017_PtNairob)) @@ -284,8 +284,8 @@ (public_name tezos-protocol-017-PtNairob) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-017-PtNairob.raw) (flags (:standard) @@ -573,8 +573,8 @@ (public_name tezos-protocol-017-PtNairob.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-017-PtNairob) (flags (:standard) @@ -592,8 +592,8 @@ (library (name tezos_protocol_017_PtNairob_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -867,7 +867,7 @@ (libraries tezos-protocol-017-PtNairob tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune index 3cfb11bb497d4bc69a226d2b40bfd380f1aebc49..9e9a9730c9611b9fdb4f09545ad87a561d74700d 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/helpers/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/helpers/dune @@ -7,17 +7,17 @@ (instrumentation (backend bisect_ppx)) (libraries qcheck-alcotest - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base octez-libs.tezos-micheline octez-libs.tezos-stdlib-unix tezos-protocol-017-PtNairob tezos-client-017-PtNairob tezos-protocol-017-PtNairob.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-plugin-017-PtNairob octez-libs.tezos-shell-services - octez-plompiler + octez-libs.octez-plompiler octez-libs.tezos-crypto-dal) (flags (:standard) 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 0850055749568c154f17f6f4b10be7692106cb13..d8ccbf7c96ccea7029202b6de0a76a7e2b894eb0 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune @@ -11,7 +11,7 @@ tezos-protocol-017-PtNairob qcheck-alcotest tezos-client-017-PtNairob - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-017-PtNairob-test-helpers octez-libs.tezos-base-test-helpers tezos-protocol-plugin-017-PtNairob) diff --git a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune index 0528986ee801d20b8593196b7e1006161e04fed8..f6696e6ac7feae8c6d9e24f6b31d2f1bfa52d9ed 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune @@ -11,7 +11,7 @@ tezos-client-017-PtNairob tezos-protocol-017-PtNairob octez-libs.tezos-context.merkle_proof_encoding - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-017-PtNairob-test-helpers octez-alcotezt qcheck-alcotest diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune index a5baa5ecca6e519444e9cbe53903db069b04805e..06c137a20c6c51934a8eb9b6235d18cb779d47db 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune @@ -12,16 +12,16 @@ tezos-client-017-PtNairob tezos-client-base tezos-protocol-017-PtNairob.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix tezos-protocol-017-PtNairob - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-017-PtNairob-test-helpers octez-alcotezt tezos-scoru-wasm-helpers octez-libs.tezos-stdlib octez-libs.tezos-crypto-dal - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/dune index 7ffcb28a5d89fbea1cd766f25013a1796bbdc4c4..294c711217ff85d434b7476a0106b5255f123507 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/dune @@ -39,7 +39,7 @@ aches-lwt octez-injector octez-smart-rollup-node-lib - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-scoru-wasm-fast octez-libs.tezos-crypto-dal tezos-version.value) 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 bd1a82e8ce4f8d58452fb79dc20f3b8bf34022ee..a30db7c448664b12d1d479e54985f72916578b68 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune @@ -8,7 +8,7 @@ tezt.core octez-libs.tezos-base tezos-protocol-017-PtNairob - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-smart-rollup-layer2-017-PtNairob 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 6f1fe675034f6269f47b7464a423b7460321cb04..a7893edb76a0bc8ccf5f73bd0ee3cd7a4285995a 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 @@ -10,7 +10,7 @@ tezos-protocol-017-PtNairob tezos-protocol-017-PtNairob.parameters tezos-client-017-PtNairob - tezos-test-helpers + octez-libs.tezos-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 242c82a3aee5c4d519844fc5ce0a3df08c3de16d..06c519aed0873b9a008784fac901c3bd7ca1b968 100644 --- a/src/proto_018_Proxford/bin_accuser/dune +++ b/src/proto_018_Proxford/bin_accuser/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-client-commands diff --git a/src/proto_018_Proxford/bin_baker/dune b/src/proto_018_Proxford/bin_baker/dune index 90edd475f29fad0daf57ba11bb27d9424ed16c85..bc5a89bb1dddd743338b61301723b6e96e23d47a 100644 --- a/src/proto_018_Proxford/bin_baker/dune +++ b/src/proto_018_Proxford/bin_baker/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-client-commands diff --git a/src/proto_018_Proxford/bin_sc_rollup_client/dune b/src/proto_018_Proxford/bin_sc_rollup_client/dune index 17a3876a7a67d5ae52ca57b9a9cb98889f317182..f74ffc91f9b401fac0abf623ad41865109b92306 100644 --- a/src/proto_018_Proxford/bin_sc_rollup_client/dune +++ b/src/proto_018_Proxford/bin_sc_rollup_client/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-018-Proxford 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 5489696725fc3cd40d8efe41bd2b00506b5d2ed6..4101d382502f3e0b7416aedf316ae43cd269ef66 100644 --- a/src/proto_018_Proxford/bin_sc_rollup_node/dune +++ b/src/proto_018_Proxford/bin_sc_rollup_node/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-018-Proxford octez-libs.tezos-shell-services tezos-client-base diff --git a/src/proto_018_Proxford/lib_benchmarks_proto/dune b/src/proto_018_Proxford/lib_benchmarks_proto/dune index bd1bb13c3dc3ebd02dd4e3b531e441a68724eb3d..5edb12823f39bbfead83874ae53ef6e653a3cc0e 100644 --- a/src/proto_018_Proxford/lib_benchmarks_proto/dune +++ b/src/proto_018_Proxford/lib_benchmarks_proto/dune @@ -20,10 +20,10 @@ tezos-shell-benchmarks octez-libs.tezos-micheline tezos-018-Proxford-test-helpers - tezos-sapling + octez-libs.tezos-sapling tezos-client-018-Proxford tezos-protocol-plugin-018-Proxford - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_018_Proxford/lib_client/dune b/src/proto_018_Proxford/lib_client/dune index c6e30cd1f7efa4d9f65bf41a4b7d3b3c5e1dcbf2..d59d56191dc63eb312fae89e5250996fd91a9d99 100644 --- a/src/proto_018_Proxford/lib_client/dune +++ b/src/proto_018_Proxford/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-018-Proxford diff --git a/src/proto_018_Proxford/lib_client/test/dune b/src/proto_018_Proxford/lib_client/test/dune index c40aecb81c879e1bd5f17595a24fb9b21653922a..3f3e276d10533d437fa419e0c465e541082e0fdc 100644 --- a/src/proto_018_Proxford/lib_client/test/dune +++ b/src/proto_018_Proxford/lib_client/test/dune @@ -11,7 +11,7 @@ tezos-client-018-Proxford tezos-protocol-018-Proxford octez-libs.tezos-base-test-helpers - tezos-test-helpers + octez-libs.tezos-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 f50e6e64b0dd9f26e816051c865743af1f9d4cbd..d5967eb47986f968e5e9dd4c4bd93a376105fdbd 100644 --- a/src/proto_018_Proxford/lib_client_commands/dune +++ b/src/proto_018_Proxford/lib_client_commands/dune @@ -7,11 +7,11 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration @@ -44,10 +44,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-018-Proxford diff --git a/src/proto_018_Proxford/lib_client_sapling/dune b/src/proto_018_Proxford/lib_client_sapling/dune index 2c53798f1e002a369f6ef8a4d6227eb2eef46157..2936cda3a0f1b154a8a16fc09b7db78ce6df9ed1 100644 --- a/src/proto_018_Proxford/lib_client_sapling/dune +++ b/src/proto_018_Proxford/lib_client_sapling/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix tezos-client-base diff --git a/src/proto_018_Proxford/lib_delegate/dune b/src/proto_018_Proxford/lib_delegate/dune index c6f71371f5aa94277812b66f2a1a8ba161795273..24cf1a414457f53adce4b2cb1fb76af0fe99aad8 100644 --- a/src/proto_018_Proxford/lib_delegate/dune +++ b/src/proto_018_Proxford/lib_delegate/dune @@ -7,19 +7,19 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-version.value tezos-protocol-018-Proxford tezos-protocol-018-Proxford.lifted tezos-protocol-plugin-018-Proxford - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-018-Proxford tezos-client-commands octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - tezos-shell-context + octez-libs.tezos-shell-context octez-libs.tezos-context octez-libs.tezos-context.memory octez-libs.tezos-rpc-http-client-unix @@ -59,7 +59,7 @@ tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-018-Proxford @@ -89,7 +89,7 @@ (libraries octez-libs.tezos-base tezos-protocol-018-Proxford - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-018-Proxford diff --git a/src/proto_018_Proxford/lib_parameters/dune b/src/proto_018_Proxford/lib_parameters/dune index 8ea8cdcac8408e56951ce232b6a217be450bd478..f452e1bb27a516d4796e4478f886c55f3849a1ab 100644 --- a/src/proto_018_Proxford/lib_parameters/dune +++ b/src/proto_018_Proxford/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-018-Proxford) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_plugin/test/dune b/src/proto_018_Proxford/lib_plugin/test/dune index 99040f0d1fa0da42a61f3f42f5097d4b8a11534c..34c1c262feb2bd35eca2cefa7606636d0ba49023 100644 --- a/src/proto_018_Proxford/lib_plugin/test/dune +++ b/src/proto_018_Proxford/lib_plugin/test/dune @@ -10,7 +10,7 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-base.unix octez-alcotezt - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest octez-libs.tezos-stdlib-unix octez-libs.tezos-micheline diff --git a/src/proto_018_Proxford/lib_protocol/dune b/src/proto_018_Proxford/lib_protocol/dune index 15ee1183c5cd80eba5a095e1b5ebc6a81cd4a823..4e63afed92f3a4f05e3fc94552426861eb6b0bdc 100644 --- a/src/proto_018_Proxford/lib_protocol/dune +++ b/src/proto_018_Proxford/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-018-Proxford.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_018_Proxford)) @@ -270,8 +270,8 @@ (public_name tezos-protocol-018-Proxford) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-018-Proxford.raw) (flags (:standard) @@ -544,8 +544,8 @@ (public_name tezos-protocol-018-Proxford.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-018-Proxford) (flags (:standard) @@ -563,8 +563,8 @@ (library (name tezos_protocol_018_Proxford_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -823,7 +823,7 @@ (libraries tezos-protocol-018-Proxford tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_018_Proxford/lib_protocol/test/helpers/dune b/src/proto_018_Proxford/lib_protocol/test/helpers/dune index 59b845947149035c0b246ef743ad8c4ae9e87eb7..c9283e9c1ba45700074dc5333d4159df31abbd9e 100644 --- a/src/proto_018_Proxford/lib_protocol/test/helpers/dune +++ b/src/proto_018_Proxford/lib_protocol/test/helpers/dune @@ -7,17 +7,17 @@ (instrumentation (backend bisect_ppx)) (libraries qcheck-alcotest - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base octez-libs.tezos-micheline octez-libs.tezos-stdlib-unix tezos-protocol-018-Proxford tezos-client-018-Proxford tezos-protocol-018-Proxford.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-plugin-018-Proxford octez-libs.tezos-shell-services - octez-plompiler + octez-libs.octez-plompiler octez-libs.tezos-crypto-dal tezos-smart-rollup-018-Proxford) (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 3d582e4d0b69fbe4a01e84b8dee8d93177ecf1fa..16d52da1bfa18c7f309ad6facf34b5fd1ccf355d 100644 --- a/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune +++ b/src/proto_018_Proxford/lib_protocol/test/integration/validate/dune @@ -11,7 +11,7 @@ tezos-protocol-018-Proxford qcheck-alcotest tezos-client-018-Proxford - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-018-Proxford-test-helpers octez-libs.tezos-base-test-helpers tezos-protocol-plugin-018-Proxford) diff --git a/src/proto_018_Proxford/lib_protocol/test/pbt/dune b/src/proto_018_Proxford/lib_protocol/test/pbt/dune index 00a1b04df50de2ae3597c5d61f8573337b6ecb38..3d061148bd06640dd08917cfbdba80c56d480117 100644 --- a/src/proto_018_Proxford/lib_protocol/test/pbt/dune +++ b/src/proto_018_Proxford/lib_protocol/test/pbt/dune @@ -11,7 +11,7 @@ tezos-client-018-Proxford tezos-protocol-018-Proxford octez-libs.tezos-context.merkle_proof_encoding - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-018-Proxford-test-helpers octez-alcotezt qcheck-alcotest diff --git a/src/proto_018_Proxford/lib_protocol/test/unit/dune b/src/proto_018_Proxford/lib_protocol/test/unit/dune index 6d544b41d2a25d31c4f003b535138b4e4ddab12a..2516128f91538a86047dfd274c318258f3a64c8d 100644 --- a/src/proto_018_Proxford/lib_protocol/test/unit/dune +++ b/src/proto_018_Proxford/lib_protocol/test/unit/dune @@ -12,16 +12,16 @@ tezos-client-018-Proxford tezos-client-base tezos-protocol-018-Proxford.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix tezos-protocol-018-Proxford - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-018-Proxford-test-helpers octez-alcotezt tezos-scoru-wasm-helpers octez-libs.tezos-stdlib octez-libs.tezos-crypto-dal - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_018_Proxford/lib_sc_rollup_node/dune b/src/proto_018_Proxford/lib_sc_rollup_node/dune index 2e4b97f0b862c8794893e6c6f6c3bc496b026e14..abb96dbe932b396131bcd3075689568058433cf7 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/dune @@ -41,7 +41,7 @@ aches-lwt octez-injector octez-smart-rollup-node-lib - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-scoru-wasm-fast octez-libs.tezos-crypto-dal tezos-version.value) 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 21dd195ddc62aa082e21aaa6debac0e12e18ed6a..dcb557568d954432e6fc1fea119ce69d8fb88da3 100644 --- a/src/proto_018_Proxford/lib_sc_rollup_node/test/dune +++ b/src/proto_018_Proxford/lib_sc_rollup_node/test/dune @@ -8,7 +8,7 @@ tezt.core octez-libs.tezos-base tezos-protocol-018-Proxford - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-smart-rollup-layer2-018-Proxford 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 44c5175ca7727515b0c70ebfe2052f15ab41f388..3430b477b79a12aa60a26903d870488718bd0d05 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 @@ -10,7 +10,7 @@ tezos-protocol-018-Proxford tezos-protocol-018-Proxford.parameters tezos-client-018-Proxford - tezos-test-helpers + octez-libs.tezos-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 970b90ec42ac172c89d5d60114c25ef97083d58a..4252519bda432b918e754d8dadda42a7a3a46ee4 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-commands diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index a95839e798c547c69c75b3cc0773da9c265fde53..29624ddf49d22d318b006c507944d8ed46ba172e 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-commands diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index c8d15359368fd44b36504b5b7317c777f4c94a94..3df89e869a02f78d617a27237ddada5f2517e363 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-alpha 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 608392f22b0fce4b0a97812648e18f014ecfb88c..9c74d1dc4c404b710c4705c7b15bbeea4cfff4cb 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -8,7 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-alpha octez-libs.tezos-shell-services tezos-client-base diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune index 7d46553450f5d5cd12fa4dc967eecf2ea873cf03..8f9a0936e77649f1e7636ab9da28144f054d9243 100644 --- a/src/proto_alpha/lib_benchmarks_proto/dune +++ b/src/proto_alpha/lib_benchmarks_proto/dune @@ -20,10 +20,10 @@ tezos-shell-benchmarks octez-libs.tezos-micheline tezos-alpha-test-helpers - tezos-sapling + octez-libs.tezos-sapling tezos-client-alpha tezos-protocol-plugin-alpha - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (flags (:standard) diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index aa1693c7c89883ffb3a7344f0334a8879f665e81..3c2a74fbd91337554621156094fdd4051f47ef8b 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-shell-services tezos-client-base tezos-protocol-alpha diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune index b233813867838d83f1210349e60e417f4a2ba723..744e848730880edb918745303da5c9f314d3446f 100644 --- a/src/proto_alpha/lib_client/test/dune +++ b/src/proto_alpha/lib_client/test/dune @@ -11,7 +11,7 @@ tezos-client-alpha tezos-protocol-alpha octez-libs.tezos-base-test-helpers - tezos-test-helpers + octez-libs.tezos-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 3edd13238e6fae1869b9c339d6f8a1c374225aac..226e8ca7a0cc919679eb82b71085ee9bbdcdd665 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -7,11 +7,11 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-mockup tezos-mockup-registration @@ -44,10 +44,10 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-alpha diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune index 43634c2c9e47f19383a8c20aa965e05f342f753d..51d616311ba221dbb2f544ad563082bd45d01ca6 100644 --- a/src/proto_alpha/lib_client_sapling/dune +++ b/src/proto_alpha/lib_client_sapling/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic octez-libs.tezos-crypto octez-libs.tezos-stdlib-unix tezos-client-base diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index 9c2e7847997b757c9c39b16a255845331a047a24..46f5443642a0c0527c16549456c50e3ff42f6a57 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -7,19 +7,19 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-clic + octez-libs.tezos-clic tezos-version.value tezos-protocol-alpha tezos-protocol-alpha.lifted tezos-protocol-plugin-alpha - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-alpha tezos-client-commands octez-libs.tezos-stdlib octez-libs.tezos-stdlib-unix - tezos-shell-context + octez-libs.tezos-shell-context octez-libs.tezos-context octez-libs.tezos-context.memory octez-libs.tezos-rpc-http-client-unix @@ -59,7 +59,7 @@ tezos-protocol-alpha tezos-protocol-alpha.parameters octez-libs.tezos-stdlib-unix - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-alpha @@ -89,7 +89,7 @@ (libraries octez-libs.tezos-base tezos-protocol-alpha - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-shell-services tezos-client-base tezos-client-alpha diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index 9099ea341db4c1532256d027c2eaaa28dd1a1456..cd06bb6d21df450b2f65696e4f16143aba0ba3e2 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -7,7 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries octez-libs.tezos-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-alpha) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune index 01fcbf13cbabe2feff17b98c1ada988550ce388a..8e5c3ae0ad73456223e690cb98f2580e58f25127 100644 --- a/src/proto_alpha/lib_plugin/test/dune +++ b/src/proto_alpha/lib_plugin/test/dune @@ -10,7 +10,7 @@ octez-libs.tezos-base-test-helpers octez-libs.tezos-base.unix octez-alcotezt - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest octez-libs.tezos-stdlib-unix octez-libs.tezos-micheline diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index a3fd767b965f111b51b1ad4990108068fa6e5da0..934eb986562472986f2f0c29841ec4e9eca09a3a 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-alpha.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_alpha)) @@ -272,8 +272,8 @@ (public_name tezos-protocol-alpha) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-alpha.raw) (flags (:standard) @@ -548,8 +548,8 @@ (public_name tezos-protocol-alpha.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-alpha) (flags (:standard) @@ -567,8 +567,8 @@ (library (name tezos_protocol_alpha_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -829,7 +829,7 @@ (libraries tezos-protocol-alpha tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index c068759043543171e72663ccc1c476836280afd7..ec730e07e8bec73e15c94953401afbaf936827ad 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -7,17 +7,17 @@ (instrumentation (backend bisect_ppx)) (libraries qcheck-alcotest - tezos-test-helpers + octez-libs.tezos-test-helpers octez-libs.tezos-base octez-libs.tezos-micheline octez-libs.tezos-stdlib-unix tezos-protocol-alpha tezos-client-alpha tezos-protocol-alpha.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-plugin-alpha octez-libs.tezos-shell-services - octez-plompiler + octez-libs.octez-plompiler octez-libs.tezos-crypto-dal tezos-smart-rollup-alpha) (flags diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/dune b/src/proto_alpha/lib_protocol/test/integration/validate/dune index 797cfa78d2614b8d0d6acfdd7c7be3346510c113..1ec2c29d79fe3f7931f6cacb433b7943bee10f55 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/dune +++ b/src/proto_alpha/lib_protocol/test/integration/validate/dune @@ -11,7 +11,7 @@ tezos-protocol-alpha qcheck-alcotest tezos-client-alpha - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-alpha-test-helpers octez-libs.tezos-base-test-helpers tezos-protocol-plugin-alpha) diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune index 1a2502fdd83ee312f7a6fb75aa09a2e2bf992ef8..83dc727abfe40653732dfb70ba36ae681fc67bbc 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/dune +++ b/src/proto_alpha/lib_protocol/test/pbt/dune @@ -11,7 +11,7 @@ tezos-client-alpha tezos-protocol-alpha octez-libs.tezos-context.merkle_proof_encoding - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-alpha-test-helpers octez-alcotezt qcheck-alcotest diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 22cfd82240ce698e9aa13e54406c2f0cecf277e0..045e978788f8da380bd26acd76ae7ce5862c4e49 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -12,16 +12,16 @@ tezos-client-alpha tezos-client-base tezos-protocol-alpha.parameters - tezos-protocol-environment + octez-libs.tezos-protocol-environment octez-libs.tezos-stdlib-unix tezos-protocol-alpha - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-alpha-test-helpers octez-alcotezt tezos-scoru-wasm-helpers octez-libs.tezos-stdlib octez-libs.tezos-crypto-dal - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-webassembly-interpreter-extra) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_alpha/lib_sc_rollup_node/dune b/src/proto_alpha/lib_sc_rollup_node/dune index e2364a620469bb9881012b8f42e888b10000c7cf..6dbe071ff92fab5f8a5d0fa0aaee3058836c2dd8 100644 --- a/src/proto_alpha/lib_sc_rollup_node/dune +++ b/src/proto_alpha/lib_sc_rollup_node/dune @@ -41,7 +41,7 @@ aches-lwt octez-injector octez-smart-rollup-node-lib - tezos-scoru-wasm + octez-libs.tezos-scoru-wasm tezos-scoru-wasm-fast octez-libs.tezos-crypto-dal tezos-version.value) diff --git a/src/proto_alpha/lib_sc_rollup_node/test/dune b/src/proto_alpha/lib_sc_rollup_node/test/dune index 536e46c0824324b10433dc550b75ee4dbb4ae48d..639d139e5d0931ce3c1e137048d4a7f294ecc172 100644 --- a/src/proto_alpha/lib_sc_rollup_node/test/dune +++ b/src/proto_alpha/lib_sc_rollup_node/test/dune @@ -8,7 +8,7 @@ tezt.core octez-libs.tezos-base tezos-protocol-alpha - tezos-test-helpers + octez-libs.tezos-test-helpers tezos-smart-rollup-layer2-alpha 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 c6766c0d16ad522e9caa59955d972e503cd16593..a243a0d27124773be90f6679fc398ab7b16db008 100644 --- a/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune +++ b/src/proto_alpha/lib_sc_rollup_node/test/helpers/dune @@ -10,7 +10,7 @@ tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-client-alpha - tezos-test-helpers + octez-libs.tezos-test-helpers qcheck-alcotest qcheck-core logs.lwt diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index 28ab4812e010328066ed70dec5b1b409b7abd68b..a6bfd1d55de3c280930ceabfd130e740ebaa6fb1 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-demo-counter.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_demo_counter)) @@ -47,8 +47,8 @@ (public_name tezos-protocol-demo-counter) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-demo-counter.raw) (flags (:standard) @@ -94,8 +94,8 @@ (public_name tezos-protocol-demo-counter.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-demo-counter) (flags (:standard) @@ -113,8 +113,8 @@ (library (name tezos_protocol_demo_counter_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -146,7 +146,7 @@ (libraries tezos-protocol-demo-counter tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index 5307a1a72ebfd6c9f35d985050480edc2aeca849..f25653c71359bf2a0e2c4fc64be734fdd1e95351 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-demo-noops.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_demo_noops)) @@ -38,8 +38,8 @@ (public_name tezos-protocol-demo-noops) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-demo-noops.raw) (flags (:standard) @@ -75,8 +75,8 @@ (public_name tezos-protocol-demo-noops.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-demo-noops) (flags (:standard) @@ -94,8 +94,8 @@ (library (name tezos_protocol_demo_noops_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -118,7 +118,7 @@ (libraries tezos-protocol-demo-noops tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune index b39765280101e0f0692629386b45dbc1ff439eca..fb9b30da4665383ddad4f2951fa509f54f9a5e55 100644 --- a/src/proto_genesis/lib_client/dune +++ b/src/proto_genesis/lib_client/dune @@ -9,7 +9,7 @@ octez-libs.tezos-base octez-libs.tezos-shell-services tezos-client-base - tezos-protocol-environment + octez-libs.tezos-protocol-environment tezos-protocol-genesis tezos-protocol-genesis.lifted tezos-client-commands diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index 043320af131069a4809c53dc37696ba28c007f16..b5e824ea8e02269d0995a8108af06502d5107660 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -6,7 +6,7 @@ (public_name tezos-protocol-genesis.environment) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Tezos_protocol_environment_genesis)) @@ -38,8 +38,8 @@ (public_name tezos-protocol-genesis) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-genesis.raw) (flags (:standard) @@ -77,8 +77,8 @@ (public_name tezos-protocol-genesis.lifted) (instrumentation (backend bisect_ppx)) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs tezos-protocol-genesis) (flags (:standard) @@ -96,8 +96,8 @@ (library (name tezos_protocol_genesis_functor) (libraries - tezos-protocol-environment - tezos-protocol-environment.sigs) + octez-libs.tezos-protocol-environment + octez-libs.tezos-protocol-environment.sigs) (flags (:standard) -nopervasives) @@ -122,7 +122,7 @@ (libraries tezos-protocol-genesis tezos-protocol-updater - tezos-protocol-environment) + octez-libs.tezos-protocol-environment) (library_flags (:standard -linkall)) (modules Registerer)) diff --git a/tezt/lib_ethereum/dune b/tezt/lib_ethereum/dune index fccea86225ffb1e426a9d9bb43df777038bf81bc..cf174fa6fb9718bd51344438544b6a80aad4fa66 100644 --- a/tezt/lib_ethereum/dune +++ b/tezt/lib_ethereum/dune @@ -6,7 +6,7 @@ (package tezt-ethereum) (libraries tezt - tezt-performance-regression) + octez-libs.tezt-performance-regression) (flags (:standard) -open Tezt diff --git a/tezt/lib_performance_regression/dune b/tezt/lib_performance_regression/dune index 5aa7dcb43042e1d6c5924abb7eb81db382a4eed0..fb6ff512def605112da43635b63dd3b47aec4d88 100644 --- a/tezt/lib_performance_regression/dune +++ b/tezt/lib_performance_regression/dune @@ -3,7 +3,7 @@ (library (name tezt_performance_regression) - (public_name tezt-performance-regression) + (public_name octez-libs.tezt-performance-regression) (libraries tezt uri diff --git a/tezt/lib_tezos/dune b/tezt/lib_tezos/dune index feb4ef938f514d981ddeebfb47a438c6810d52ca..334d2d8f9c8606633697724df5ba038866506e64 100644 --- a/tezt/lib_tezos/dune +++ b/tezt/lib_tezos/dune @@ -6,7 +6,7 @@ (public_name octez-libs.tezt-tezos) (libraries tezt - tezt-performance-regression + octez-libs.tezt-performance-regression uri hex octez-libs.tezos-crypto-dal diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index 33970e6813f586cffe533861ebc1d7b572b866e1..0acbdbbd03d0e493bcec361052ebb3a14656c3ad 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -2,7 +2,7 @@ (name main) (libraries tezt octez-libs.tezt-tezos - tezt-performance-regression + octez-libs.tezt-performance-regression octez-libs.tezos-lwt-result-stdlib tezos-alpha-test-helpers octez-libs.tezos-micheline @@ -12,7 +12,7 @@ tezos-time-measurement data-encoding octez-libs.tezos-event-logging - tezos-test-helpers + octez-libs.tezos-test-helpers ) (flags (:standard -open Tezt diff --git a/tezt/tests/dune b/tezt/tests/dune index d34de62671e43fa41fdf6138d1e15dddf07f6f4e..0df87158779fcfd4ae349d0f41ec3fb373f002d9 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -5,7 +5,7 @@ (name main) (instrumentation (backend bisect_ppx --bisect-sigterm)) (libraries - tezos-test-helpers + octez-libs.tezos-test-helpers tezt str bls12-381