From dee60caffb01a0db69a60f6f25a5096e69be1d69 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Mon, 23 May 2022 16:52:55 +0200 Subject: [PATCH] Opam: merge parameters inside protocol --- .gitlab/ci/opam-ci.yml | 35 ------------------- dune-project | 7 ---- manifest/main.ml | 7 ++-- opam/tezos-012-Psithaca-test-helpers.opam | 1 - opam/tezos-013-PtJakart-test-helpers.opam | 1 - opam/tezos-alpha-test-helpers.opam | 1 - opam/tezos-baking-012-Psithaca.opam | 1 - opam/tezos-baking-013-PtJakart.opam | 1 - opam/tezos-baking-alpha.opam | 1 - opam/tezos-benchmark-012-Psithaca.opam | 1 - opam/tezos-benchmark-013-PtJakart.opam | 1 - opam/tezos-benchmark-alpha.opam | 1 - opam/tezos-benchmarks-proto-012-Psithaca.opam | 3 +- opam/tezos-benchmarks-proto-013-PtJakart.opam | 3 +- opam/tezos-benchmarks-proto-alpha.opam | 3 +- opam/tezos-client-008-PtEdo2Zk.opam | 1 - opam/tezos-client-009-PsFLoren.opam | 1 - opam/tezos-client-010-PtGRANAD.opam | 1 - opam/tezos-client-011-PtHangz2.opam | 1 - opam/tezos-client-012-Psithaca.opam | 1 - ...nt-013-PtJakart-commands-registration.opam | 1 - opam/tezos-client-013-PtJakart-commands.opam | 1 - opam/tezos-client-013-PtJakart.opam | 1 - ...os-client-alpha-commands-registration.opam | 1 - opam/tezos-client-alpha-commands.opam | 1 - opam/tezos-client-alpha.opam | 1 - ...ezos-protocol-008-PtEdo2Zk-parameters.opam | 21 ----------- opam/tezos-protocol-008-PtEdo2Zk.opam | 1 + ...ezos-protocol-009-PsFLoren-parameters.opam | 21 ----------- opam/tezos-protocol-009-PsFLoren.opam | 1 + ...ezos-protocol-010-PtGRANAD-parameters.opam | 21 ----------- opam/tezos-protocol-010-PtGRANAD.opam | 1 + ...ezos-protocol-011-PtHangz2-parameters.opam | 21 ----------- opam/tezos-protocol-011-PtHangz2.opam | 1 + ...ezos-protocol-012-Psithaca-parameters.opam | 21 ----------- opam/tezos-protocol-012-Psithaca-tests.opam | 1 - opam/tezos-protocol-012-Psithaca.opam | 1 + ...ezos-protocol-013-PtJakart-parameters.opam | 21 ----------- opam/tezos-protocol-013-PtJakart-tests.opam | 1 - opam/tezos-protocol-013-PtJakart.opam | 1 + opam/tezos-protocol-alpha-parameters.opam | 21 ----------- opam/tezos-protocol-alpha-tests.opam | 1 - opam/tezos-protocol-alpha.opam | 1 + ...os-protocol-plugin-012-Psithaca-tests.opam | 1 - ...os-protocol-plugin-013-PtJakart-tests.opam | 1 - opam/tezos-protocol-plugin-alpha-tests.opam | 1 - opam/tezos-sc-rollup-013-PtJakart.opam | 1 - opam/tezos-sc-rollup-alpha.opam | 1 - opam/tezos-sc-rollup-node-013-PtJakart.opam | 1 - opam/tezos-sc-rollup-node-alpha.opam | 1 - opam/tezos-store.opam | 2 +- src/lib_store/test/dune | 2 +- src/proto_008_PtEdo2Zk/lib_client/dune | 2 +- src/proto_008_PtEdo2Zk/lib_parameters/dune | 6 ++-- src/proto_009_PsFLoren/lib_client/dune | 2 +- src/proto_009_PsFLoren/lib_parameters/dune | 6 ++-- src/proto_010_PtGRANAD/lib_client/dune | 2 +- src/proto_010_PtGRANAD/lib_parameters/dune | 6 ++-- src/proto_011_PtHangz2/lib_client/dune | 2 +- src/proto_011_PtHangz2/lib_parameters/dune | 6 ++-- src/proto_012_Psithaca/lib_benchmark/dune | 2 +- .../lib_benchmarks_proto/dune | 2 +- src/proto_012_Psithaca/lib_client/dune | 2 +- src/proto_012_Psithaca/lib_delegate/test/dune | 2 +- .../lib_delegate/test/mockup_simulator/dune | 2 +- src/proto_012_Psithaca/lib_parameters/dune | 6 ++-- src/proto_012_Psithaca/lib_plugin/test/dune | 2 +- .../lib_protocol/test/helpers/dune | 2 +- .../test/integration/consensus/dune | 2 +- .../lib_protocol/test/integration/dune | 2 +- .../lib_protocol/test/unit/dune | 2 +- .../bin_sc_rollup_node/dune | 2 +- src/proto_013_PtJakart/lib_benchmark/dune | 2 +- .../lib_benchmarks_proto/dune | 2 +- src/proto_013_PtJakart/lib_client/dune | 2 +- .../lib_client_commands/dune | 4 +-- src/proto_013_PtJakart/lib_delegate/test/dune | 2 +- .../lib_delegate/test/mockup_simulator/dune | 2 +- src/proto_013_PtJakart/lib_parameters/dune | 6 ++-- src/proto_013_PtJakart/lib_plugin/test/dune | 2 +- .../lib_protocol/test/helpers/dune | 2 +- .../test/integration/consensus/dune | 2 +- .../lib_protocol/test/integration/dune | 2 +- .../test/integration/michelson/dune | 2 +- .../lib_protocol/test/unit/dune | 2 +- src/proto_013_PtJakart/lib_sc_rollup/dune | 2 +- src/proto_alpha/bin_sc_rollup_node/dune | 2 +- src/proto_alpha/lib_benchmark/dune | 2 +- src/proto_alpha/lib_benchmarks_proto/dune | 2 +- src/proto_alpha/lib_client/dune | 2 +- src/proto_alpha/lib_client_commands/dune | 4 +-- src/proto_alpha/lib_delegate/test/dune | 2 +- .../lib_delegate/test/mockup_simulator/dune | 2 +- src/proto_alpha/lib_parameters/dune | 6 ++-- src/proto_alpha/lib_plugin/test/dune | 2 +- .../lib_protocol/test/helpers/dune | 2 +- .../test/integration/consensus/dune | 2 +- .../lib_protocol/test/integration/dune | 2 +- .../test/integration/michelson/dune | 2 +- src/proto_alpha/lib_protocol/test/unit/dune | 2 +- src/proto_alpha/lib_sc_rollup/dune | 2 +- 101 files changed, 80 insertions(+), 296 deletions(-) delete mode 100644 opam/tezos-protocol-008-PtEdo2Zk-parameters.opam delete mode 100644 opam/tezos-protocol-009-PsFLoren-parameters.opam delete mode 100644 opam/tezos-protocol-010-PtGRANAD-parameters.opam delete mode 100644 opam/tezos-protocol-011-PtHangz2-parameters.opam delete mode 100644 opam/tezos-protocol-012-Psithaca-parameters.opam delete mode 100644 opam/tezos-protocol-013-PtJakart-parameters.opam delete mode 100644 opam/tezos-protocol-alpha-parameters.opam diff --git a/.gitlab/ci/opam-ci.yml b/.gitlab/ci/opam-ci.yml index 36b23d572a88..b73f71950f02 100644 --- a/.gitlab/ci/opam-ci.yml +++ b/.gitlab/ci/opam-ci.yml @@ -647,11 +647,6 @@ opam:tezos-protocol-008-PtEdo2Zk: variables: package: tezos-protocol-008-PtEdo2Zk -opam:tezos-protocol-008-PtEdo2Zk-parameters: - extends: .opam_template - variables: - package: tezos-protocol-008-PtEdo2Zk-parameters - opam:tezos-protocol-008-PtEdoTez: extends: .opam_template variables: @@ -662,41 +657,21 @@ opam:tezos-protocol-009-PsFLoren: variables: package: tezos-protocol-009-PsFLoren -opam:tezos-protocol-009-PsFLoren-parameters: - extends: .opam_template - variables: - package: tezos-protocol-009-PsFLoren-parameters - opam:tezos-protocol-010-PtGRANAD: extends: .opam_template variables: package: tezos-protocol-010-PtGRANAD -opam:tezos-protocol-010-PtGRANAD-parameters: - extends: .opam_template - variables: - package: tezos-protocol-010-PtGRANAD-parameters - opam:tezos-protocol-011-PtHangz2: extends: .opam_template variables: package: tezos-protocol-011-PtHangz2 -opam:tezos-protocol-011-PtHangz2-parameters: - extends: .opam_template - variables: - package: tezos-protocol-011-PtHangz2-parameters - opam:tezos-protocol-012-Psithaca: extends: .opam_template variables: package: tezos-protocol-012-Psithaca -opam:tezos-protocol-012-Psithaca-parameters: - extends: .opam_template - variables: - package: tezos-protocol-012-Psithaca-parameters - # Ignoring package tezos-protocol-012-Psithaca-tests, it only contains tests or private targets opam:tezos-protocol-013-PtJakart: @@ -704,11 +679,6 @@ opam:tezos-protocol-013-PtJakart: variables: package: tezos-protocol-013-PtJakart -opam:tezos-protocol-013-PtJakart-parameters: - extends: .opam_template - variables: - package: tezos-protocol-013-PtJakart-parameters - # Ignoring package tezos-protocol-013-PtJakart-tests, it only contains tests or private targets opam:tezos-protocol-alpha: @@ -716,11 +686,6 @@ opam:tezos-protocol-alpha: variables: package: tezos-protocol-alpha -opam:tezos-protocol-alpha-parameters: - extends: .opam_template - variables: - package: tezos-protocol-alpha-parameters - # Ignoring package tezos-protocol-alpha-tests, it only contains tests or private targets opam:tezos-protocol-compiler: diff --git a/dune-project b/dune-project index 52906695fe6f..ca7bef7cacb6 100644 --- a/dune-project +++ b/dune-project @@ -133,22 +133,15 @@ (package (name tezos-protocol-006-PsCARTHA)) (package (name tezos-protocol-007-PsDELPH1)) (package (name tezos-protocol-008-PtEdo2Zk)) -(package (name tezos-protocol-008-PtEdo2Zk-parameters)) (package (name tezos-protocol-008-PtEdoTez)) (package (name tezos-protocol-009-PsFLoren)) -(package (name tezos-protocol-009-PsFLoren-parameters)) (package (name tezos-protocol-010-PtGRANAD)) -(package (name tezos-protocol-010-PtGRANAD-parameters)) (package (name tezos-protocol-011-PtHangz2)) -(package (name tezos-protocol-011-PtHangz2-parameters)) (package (name tezos-protocol-012-Psithaca)) -(package (name tezos-protocol-012-Psithaca-parameters)) (package (name tezos-protocol-012-Psithaca-tests)) (package (name tezos-protocol-013-PtJakart)) -(package (name tezos-protocol-013-PtJakart-parameters)) (package (name tezos-protocol-013-PtJakart-tests)) (package (name tezos-protocol-alpha)) -(package (name tezos-protocol-alpha-parameters)) (package (name tezos-protocol-alpha-tests)) (package (name tezos-protocol-compiler)) (package (name tezos-protocol-demo-counter)) diff --git a/manifest/main.ml b/manifest/main.ml index 8162f287c42b..a7dd4811f589 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3515,9 +3515,8 @@ include Tezos_raw_protocol_%s.Main let parameters = some_if (N.(number >= 008) && not_overridden) @@ fun () -> public_lib - (sf "tezos-protocol-%s-parameters" name_dash) + (sf "tezos-protocol-%s.parameters" name_dash) ~path:(sf "src/proto_%s/lib_parameters" name_underscore) - ~synopsis:"Tezos/Protocol: parameters" ~all_modules_except:["gen"] ~deps: [ @@ -3532,7 +3531,7 @@ include Tezos_raw_protocol_%s.Main private_exe "gen" ~path:(sf "src/proto_%s/lib_parameters" name_underscore) - ~opam:(sf "tezos-protocol-%s-parameters" name_dash) + ~opam:(sf "tezos-protocol-%s" name_dash) ~deps: [ tezos_base |> open_ ~m:"TzPervasives"; @@ -3560,7 +3559,7 @@ include Tezos_raw_protocol_%s.Main S "test-parameters.json"; S "mainnet-parameters.json"; ] - ~package:(sf "tezos-protocol-%s-parameters" name_dash) + ~package:(sf "tezos-protocol-%s" name_dash) ~section:"lib"; ]) ~bisect_ppx:false diff --git a/opam/tezos-012-Psithaca-test-helpers.opam b/opam/tezos-012-Psithaca-test-helpers.opam index 0c66999d4e7c..af898fbffa63 100644 --- a/opam/tezos-012-Psithaca-test-helpers.opam +++ b/opam/tezos-012-Psithaca-test-helpers.opam @@ -17,7 +17,6 @@ depends: [ "tezos-stdlib-unix" "tezos-protocol-012-Psithaca" "tezos-client-012-Psithaca" - "tezos-protocol-012-Psithaca-parameters" "tezos-protocol-environment" "tezos-protocol-plugin-012-Psithaca" "tezos-shell-services" diff --git a/opam/tezos-013-PtJakart-test-helpers.opam b/opam/tezos-013-PtJakart-test-helpers.opam index 002761050689..cef2c5d32bc6 100644 --- a/opam/tezos-013-PtJakart-test-helpers.opam +++ b/opam/tezos-013-PtJakart-test-helpers.opam @@ -17,7 +17,6 @@ depends: [ "tezos-stdlib-unix" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" - "tezos-protocol-013-PtJakart-parameters" "tezos-protocol-environment" "tezos-protocol-plugin-013-PtJakart" "tezos-shell-services" diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam index 40c411cdb452..bc48912ae998 100644 --- a/opam/tezos-alpha-test-helpers.opam +++ b/opam/tezos-alpha-test-helpers.opam @@ -17,7 +17,6 @@ depends: [ "tezos-stdlib-unix" "tezos-protocol-alpha" "tezos-client-alpha" - "tezos-protocol-alpha-parameters" "tezos-protocol-environment" "tezos-protocol-plugin-alpha" "tezos-shell-services" diff --git a/opam/tezos-baking-012-Psithaca.opam b/opam/tezos-baking-012-Psithaca.opam index 8622671f7d8d..183509f35e89 100644 --- a/opam/tezos-baking-012-Psithaca.opam +++ b/opam/tezos-baking-012-Psithaca.opam @@ -28,7 +28,6 @@ depends: [ "lwt-canceler" { >= "0.3" & < "0.4" } "lwt-exit" "tezos-client-base-unix" - "tezos-protocol-012-Psithaca-parameters" "tezos-mockup" "tezos-mockup-proxy" "tezos-mockup-commands" diff --git a/opam/tezos-baking-013-PtJakart.opam b/opam/tezos-baking-013-PtJakart.opam index 59ac063df581..c5b0ae448083 100644 --- a/opam/tezos-baking-013-PtJakart.opam +++ b/opam/tezos-baking-013-PtJakart.opam @@ -29,7 +29,6 @@ depends: [ "lwt-exit" "data-encoding" { >= "0.5.3" & < "0.6" } "tezos-client-base-unix" - "tezos-protocol-013-PtJakart-parameters" "tezos-mockup" "tezos-mockup-proxy" "tezos-mockup-commands" diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index c48a93ff5161..f4fdb5bc1b45 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -29,7 +29,6 @@ depends: [ "lwt-exit" "data-encoding" { >= "0.5.3" & < "0.6" } "tezos-client-base-unix" - "tezos-protocol-alpha-parameters" "tezos-mockup" "tezos-mockup-proxy" "tezos-mockup-commands" diff --git a/opam/tezos-benchmark-012-Psithaca.opam b/opam/tezos-benchmark-012-Psithaca.opam index 40fe328897bc..22fc9be89c5f 100644 --- a/opam/tezos-benchmark-012-Psithaca.opam +++ b/opam/tezos-benchmark-012-Psithaca.opam @@ -18,7 +18,6 @@ depends: [ "tezos-benchmark-type-inference-012-Psithaca" "tezos-protocol-012-Psithaca" "tezos-crypto" - "tezos-protocol-012-Psithaca-parameters" "hashcons" "tezos-012-Psithaca-test-helpers" "prbnmcn-stats" { = "0.0.4" } diff --git a/opam/tezos-benchmark-013-PtJakart.opam b/opam/tezos-benchmark-013-PtJakart.opam index ed877c4fec69..bf7c9bcb6bd4 100644 --- a/opam/tezos-benchmark-013-PtJakart.opam +++ b/opam/tezos-benchmark-013-PtJakart.opam @@ -18,7 +18,6 @@ depends: [ "tezos-benchmark-type-inference-013-PtJakart" "tezos-protocol-013-PtJakart" "tezos-crypto" - "tezos-protocol-013-PtJakart-parameters" "hashcons" "tezos-013-PtJakart-test-helpers" "prbnmcn-stats" { = "0.0.4" } diff --git a/opam/tezos-benchmark-alpha.opam b/opam/tezos-benchmark-alpha.opam index 8443fd0a3cd5..5ae78dec1136 100644 --- a/opam/tezos-benchmark-alpha.opam +++ b/opam/tezos-benchmark-alpha.opam @@ -18,7 +18,6 @@ depends: [ "tezos-benchmark-type-inference-alpha" "tezos-protocol-alpha" "tezos-crypto" - "tezos-protocol-alpha-parameters" "hashcons" "tezos-alpha-test-helpers" "prbnmcn-stats" { = "0.0.4" } diff --git a/opam/tezos-benchmarks-proto-012-Psithaca.opam b/opam/tezos-benchmarks-proto-012-Psithaca.opam index be4bac10620c..bcab6c35e778 100644 --- a/opam/tezos-benchmarks-proto-012-Psithaca.opam +++ b/opam/tezos-benchmarks-proto-012-Psithaca.opam @@ -12,11 +12,10 @@ depends: [ "tezos-stdlib" "tezos-base" "tezos-error-monad" - "tezos-protocol-012-Psithaca-parameters" + "tezos-protocol-012-Psithaca" "tezos-benchmark" "tezos-benchmark-012-Psithaca" "tezos-benchmark-type-inference-012-Psithaca" - "tezos-protocol-012-Psithaca" "tezos-crypto" "tezos-shell-benchmarks" "tezos-micheline" diff --git a/opam/tezos-benchmarks-proto-013-PtJakart.opam b/opam/tezos-benchmarks-proto-013-PtJakart.opam index 11b8485774c1..fa4d26a1872c 100644 --- a/opam/tezos-benchmarks-proto-013-PtJakart.opam +++ b/opam/tezos-benchmarks-proto-013-PtJakart.opam @@ -12,11 +12,10 @@ depends: [ "tezos-stdlib" "tezos-base" "tezos-error-monad" - "tezos-protocol-013-PtJakart-parameters" + "tezos-protocol-013-PtJakart" "tezos-benchmark" "tezos-benchmark-013-PtJakart" "tezos-benchmark-type-inference-013-PtJakart" - "tezos-protocol-013-PtJakart" "tezos-crypto" "tezos-shell-benchmarks" "tezos-micheline" diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam index 89ced3534117..bfb620f3d63e 100644 --- a/opam/tezos-benchmarks-proto-alpha.opam +++ b/opam/tezos-benchmarks-proto-alpha.opam @@ -12,11 +12,10 @@ depends: [ "tezos-stdlib" "tezos-base" "tezos-error-monad" - "tezos-protocol-alpha-parameters" + "tezos-protocol-alpha" "tezos-benchmark" "tezos-benchmark-alpha" "tezos-benchmark-type-inference-alpha" - "tezos-protocol-alpha" "tezos-crypto" "tezos-shell-benchmarks" "tezos-micheline" diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index 5b510b611894..274410b0be7f 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -17,7 +17,6 @@ depends: [ "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-008-PtEdo2Zk" - "tezos-protocol-008-PtEdo2Zk-parameters" "tezos-rpc" ] build: [ diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index 95f339ab93ee..b86a79c9a9b9 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -18,7 +18,6 @@ depends: [ "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-009-PsFLoren" - "tezos-protocol-009-PsFLoren-parameters" "tezos-rpc" ] build: [ diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index 191e84b285ac..deb39ded124c 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -18,7 +18,6 @@ depends: [ "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-010-PtGRANAD" - "tezos-protocol-010-PtGRANAD-parameters" "tezos-rpc" ] build: [ diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index 3d90a1f1cd48..e26c0cc50674 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -18,7 +18,6 @@ depends: [ "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-011-PtHangz2" - "tezos-protocol-011-PtHangz2-parameters" "tezos-rpc" "tezos-micheline" {with-test} "tezos-base-test-helpers" {with-test} diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index eb70932b8304..7b0cd6b88155 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -18,7 +18,6 @@ depends: [ "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-012-Psithaca" - "tezos-protocol-012-Psithaca-parameters" "tezos-rpc" "tezos-micheline" {with-test} "tezos-base-test-helpers" {with-test} diff --git a/opam/tezos-client-013-PtJakart-commands-registration.opam b/opam/tezos-client-013-PtJakart-commands-registration.opam index 4f576c0ace1b..50ae6a5552b6 100644 --- a/opam/tezos-client-013-PtJakart-commands-registration.opam +++ b/opam/tezos-client-013-PtJakart-commands-registration.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-base" "tezos-protocol-013-PtJakart" - "tezos-protocol-013-PtJakart-parameters" "tezos-protocol-environment" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-013-PtJakart-commands.opam b/opam/tezos-client-013-PtJakart-commands.opam index 4607b3e5ce63..5f68535eab93 100644 --- a/opam/tezos-client-013-PtJakart-commands.opam +++ b/opam/tezos-client-013-PtJakart-commands.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-base" "tezos-protocol-013-PtJakart" - "tezos-protocol-013-PtJakart-parameters" "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-shell-services" diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index 76fa51ca96bf..8c359620c515 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -18,7 +18,6 @@ depends: [ "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-013-PtJakart" - "tezos-protocol-013-PtJakart-parameters" "tezos-rpc" "tezos-micheline" {with-test} "tezos-base-test-helpers" {with-test} diff --git a/opam/tezos-client-alpha-commands-registration.opam b/opam/tezos-client-alpha-commands-registration.opam index e146d0d6a449..12977c78d378 100644 --- a/opam/tezos-client-alpha-commands-registration.opam +++ b/opam/tezos-client-alpha-commands-registration.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-base" "tezos-protocol-alpha" - "tezos-protocol-alpha-parameters" "tezos-protocol-environment" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-alpha-commands.opam b/opam/tezos-client-alpha-commands.opam index d0d3d2f0caf7..743568d60e84 100644 --- a/opam/tezos-client-alpha-commands.opam +++ b/opam/tezos-client-alpha-commands.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-base" "tezos-protocol-alpha" - "tezos-protocol-alpha-parameters" "tezos-stdlib-unix" "tezos-protocol-environment" "tezos-shell-services" diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index d2a129051c97..9f1a31bddfd8 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -18,7 +18,6 @@ depends: [ "tezos-proxy" "tezos-signer-backends" "tezos-protocol-plugin-alpha" - "tezos-protocol-alpha-parameters" "tezos-rpc" "tezos-micheline" {with-test} "tezos-base-test-helpers" {with-test} diff --git a/opam/tezos-protocol-008-PtEdo2Zk-parameters.opam b/opam/tezos-protocol-008-PtEdo2Zk-parameters.opam deleted file mode 100644 index 4e1fd1c8a042..000000000000 --- a/opam/tezos-protocol-008-PtEdo2Zk-parameters.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" { >= "2.9" & < "3.0" } - "tezos-base" - "tezos-protocol-environment" - "tezos-protocol-008-PtEdo2Zk" -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos/Protocol: parameters" diff --git a/opam/tezos-protocol-008-PtEdo2Zk.opam b/opam/tezos-protocol-008-PtEdo2Zk.opam index 56e1d07f3cfe..0c1125dcd55e 100644 --- a/opam/tezos-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-008-PtEdo2Zk.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-protocol-environment" + "tezos-base" ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-protocol-009-PsFLoren-parameters.opam b/opam/tezos-protocol-009-PsFLoren-parameters.opam deleted file mode 100644 index 9c8f6d50ceb2..000000000000 --- a/opam/tezos-protocol-009-PsFLoren-parameters.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" { >= "2.9" & < "3.0" } - "tezos-base" - "tezos-protocol-environment" - "tezos-protocol-009-PsFLoren" -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos/Protocol: parameters" diff --git a/opam/tezos-protocol-009-PsFLoren.opam b/opam/tezos-protocol-009-PsFLoren.opam index 56e1d07f3cfe..0c1125dcd55e 100644 --- a/opam/tezos-protocol-009-PsFLoren.opam +++ b/opam/tezos-protocol-009-PsFLoren.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-protocol-environment" + "tezos-base" ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-protocol-010-PtGRANAD-parameters.opam b/opam/tezos-protocol-010-PtGRANAD-parameters.opam deleted file mode 100644 index 743c8311e3fa..000000000000 --- a/opam/tezos-protocol-010-PtGRANAD-parameters.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" { >= "2.9" & < "3.0" } - "tezos-base" - "tezos-protocol-environment" - "tezos-protocol-010-PtGRANAD" -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos/Protocol: parameters" diff --git a/opam/tezos-protocol-010-PtGRANAD.opam b/opam/tezos-protocol-010-PtGRANAD.opam index 56e1d07f3cfe..0c1125dcd55e 100644 --- a/opam/tezos-protocol-010-PtGRANAD.opam +++ b/opam/tezos-protocol-010-PtGRANAD.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-protocol-environment" + "tezos-base" ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-protocol-011-PtHangz2-parameters.opam b/opam/tezos-protocol-011-PtHangz2-parameters.opam deleted file mode 100644 index e4f3ae7617c7..000000000000 --- a/opam/tezos-protocol-011-PtHangz2-parameters.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" { >= "2.9" & < "3.0" } - "tezos-base" - "tezos-protocol-environment" - "tezos-protocol-011-PtHangz2" -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos/Protocol: parameters" diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam index 56e1d07f3cfe..0c1125dcd55e 100644 --- a/opam/tezos-protocol-011-PtHangz2.opam +++ b/opam/tezos-protocol-011-PtHangz2.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-protocol-environment" + "tezos-base" ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-protocol-012-Psithaca-parameters.opam b/opam/tezos-protocol-012-Psithaca-parameters.opam deleted file mode 100644 index db41c578de30..000000000000 --- a/opam/tezos-protocol-012-Psithaca-parameters.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" { >= "2.9" & < "3.0" } - "tezos-base" - "tezos-protocol-environment" - "tezos-protocol-012-Psithaca" -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos/Protocol: parameters" diff --git a/opam/tezos-protocol-012-Psithaca-tests.opam b/opam/tezos-protocol-012-Psithaca-tests.opam index 0c36df6edeaf..7f87528759e8 100644 --- a/opam/tezos-protocol-012-Psithaca-tests.opam +++ b/opam/tezos-protocol-012-Psithaca-tests.opam @@ -14,7 +14,6 @@ depends: [ "tezos-protocol-012-Psithaca" {with-test} "tezos-012-Psithaca-test-helpers" {with-test} "tezos-base-test-helpers" {with-test} - "tezos-protocol-012-Psithaca-parameters" {with-test} "tezos-protocol-plugin-012-Psithaca" {with-test} "tezos-client-base" {with-test} "tezos-client-012-Psithaca" {with-test} diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index 56e1d07f3cfe..0c1125dcd55e 100644 --- a/opam/tezos-protocol-012-Psithaca.opam +++ b/opam/tezos-protocol-012-Psithaca.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-protocol-environment" + "tezos-base" ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-protocol-013-PtJakart-parameters.opam b/opam/tezos-protocol-013-PtJakart-parameters.opam deleted file mode 100644 index 197ee0dd081e..000000000000 --- a/opam/tezos-protocol-013-PtJakart-parameters.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" { >= "2.9" & < "3.0" } - "tezos-base" - "tezos-protocol-environment" - "tezos-protocol-013-PtJakart" -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos/Protocol: parameters" diff --git a/opam/tezos-protocol-013-PtJakart-tests.opam b/opam/tezos-protocol-013-PtJakart-tests.opam index 08dfea544c15..5d54023e0c59 100644 --- a/opam/tezos-protocol-013-PtJakart-tests.opam +++ b/opam/tezos-protocol-013-PtJakart-tests.opam @@ -14,7 +14,6 @@ depends: [ "tezos-protocol-013-PtJakart" {with-test} "tezos-013-PtJakart-test-helpers" {with-test} "tezos-base-test-helpers" {with-test} - "tezos-protocol-013-PtJakart-parameters" {with-test} "tezos-protocol-plugin-013-PtJakart" {with-test} "tezos-client-013-PtJakart" {with-test} "tezos-benchmark" {with-test} diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index 56e1d07f3cfe..0c1125dcd55e 100644 --- a/opam/tezos-protocol-013-PtJakart.opam +++ b/opam/tezos-protocol-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-protocol-environment" + "tezos-base" ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-protocol-alpha-parameters.opam b/opam/tezos-protocol-alpha-parameters.opam deleted file mode 100644 index b405a5278508..000000000000 --- a/opam/tezos-protocol-alpha-parameters.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" { >= "2.9" & < "3.0" } - "tezos-base" - "tezos-protocol-environment" - "tezos-protocol-alpha" -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos/Protocol: parameters" diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 276216d25a0d..3f74b1c215bc 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -14,7 +14,6 @@ depends: [ "tezos-protocol-alpha" {with-test} "tezos-alpha-test-helpers" {with-test} "tezos-base-test-helpers" {with-test} - "tezos-protocol-alpha-parameters" {with-test} "tezos-protocol-plugin-alpha" {with-test} "tezos-client-alpha" {with-test} "tezos-benchmark" {with-test} diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam index 56e1d07f3cfe..0c1125dcd55e 100644 --- a/opam/tezos-protocol-alpha.opam +++ b/opam/tezos-protocol-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "2.9" & < "3.0" } "tezos-protocol-environment" + "tezos-base" ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-protocol-plugin-012-Psithaca-tests.opam b/opam/tezos-protocol-plugin-012-Psithaca-tests.opam index 0f3f60972566..205b703b3723 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca-tests.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca-tests.opam @@ -18,7 +18,6 @@ depends: [ "tezos-micheline" {with-test} "tezos-protocol-plugin-012-Psithaca" {with-test} "tezos-protocol-012-Psithaca" {with-test} - "tezos-protocol-012-Psithaca-parameters" {with-test} "tezos-012-Psithaca-test-helpers" {with-test} ] build: [ diff --git a/opam/tezos-protocol-plugin-013-PtJakart-tests.opam b/opam/tezos-protocol-plugin-013-PtJakart-tests.opam index 951219685351..e5aa8eeac81d 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart-tests.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart-tests.opam @@ -18,7 +18,6 @@ depends: [ "tezos-micheline" {with-test} "tezos-protocol-plugin-013-PtJakart" {with-test} "tezos-protocol-013-PtJakart" {with-test} - "tezos-protocol-013-PtJakart-parameters" {with-test} "tezos-013-PtJakart-test-helpers" {with-test} ] build: [ diff --git a/opam/tezos-protocol-plugin-alpha-tests.opam b/opam/tezos-protocol-plugin-alpha-tests.opam index 95e68f6672a8..91f495cf02d9 100644 --- a/opam/tezos-protocol-plugin-alpha-tests.opam +++ b/opam/tezos-protocol-plugin-alpha-tests.opam @@ -18,7 +18,6 @@ depends: [ "tezos-micheline" {with-test} "tezos-protocol-plugin-alpha" {with-test} "tezos-protocol-alpha" {with-test} - "tezos-protocol-alpha-parameters" {with-test} "tezos-alpha-test-helpers" {with-test} ] build: [ diff --git a/opam/tezos-sc-rollup-013-PtJakart.opam b/opam/tezos-sc-rollup-013-PtJakart.opam index ed66986dfc5b..55b58df615b6 100644 --- a/opam/tezos-sc-rollup-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-013-PtJakart.opam @@ -13,7 +13,6 @@ depends: [ "tezos-base" "tezos-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" - "tezos-protocol-013-PtJakart-parameters" "tezos-rpc" ] build: [ diff --git a/opam/tezos-sc-rollup-alpha.opam b/opam/tezos-sc-rollup-alpha.opam index 103ed5c131e6..e64aa62932fe 100644 --- a/opam/tezos-sc-rollup-alpha.opam +++ b/opam/tezos-sc-rollup-alpha.opam @@ -13,7 +13,6 @@ depends: [ "tezos-base" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" - "tezos-protocol-alpha-parameters" "tezos-rpc" ] build: [ diff --git a/opam/tezos-sc-rollup-node-013-PtJakart.opam b/opam/tezos-sc-rollup-node-013-PtJakart.opam index dc9b11eba52a..c37a4b1b5865 100644 --- a/opam/tezos-sc-rollup-node-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-node-013-PtJakart.opam @@ -18,7 +18,6 @@ depends: [ "tezos-context" "tezos-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" - "tezos-protocol-013-PtJakart-parameters" "tezos-rpc" "tezos-rpc-http" "tezos-rpc-http-server" diff --git a/opam/tezos-sc-rollup-node-alpha.opam b/opam/tezos-sc-rollup-node-alpha.opam index 9af532962c16..212e176d3ed9 100644 --- a/opam/tezos-sc-rollup-node-alpha.opam +++ b/opam/tezos-sc-rollup-node-alpha.opam @@ -18,7 +18,6 @@ depends: [ "tezos-context" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" - "tezos-protocol-alpha-parameters" "tezos-rpc" "tezos-rpc-http" "tezos-rpc-http-server" diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index 56b8eeac2142..6dd6390f1342 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -28,7 +28,7 @@ depends: [ "tezos-embedded-protocol-demo-noops" {with-test} "tezos-embedded-protocol-genesis" {with-test} "tezos-embedded-protocol-alpha" {with-test} - "tezos-protocol-alpha-parameters" {with-test} + "tezos-protocol-alpha" {with-test} "tezos-protocol-plugin-alpha" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-test-helpers" {with-test} diff --git a/src/lib_store/test/dune b/src/lib_store/test/dune index 7fb27687c70e..5de2aeb780a6 100644 --- a/src/lib_store/test/dune +++ b/src/lib_store/test/dune @@ -12,7 +12,7 @@ tezos-embedded-protocol-demo-noops tezos-embedded-protocol-genesis tezos-embedded-protocol-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-protocol-plugin-alpha alcotest-lwt tezos-test-helpers diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune index aae11d7ebf92..70c19ffa30a1 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/dune +++ b/src/proto_008_PtEdo2Zk/lib_client/dune @@ -14,7 +14,7 @@ tezos-proxy tezos-signer-backends tezos-protocol-plugin-008-PtEdo2Zk - tezos-protocol-008-PtEdo2Zk-parameters + tezos-protocol-008-PtEdo2Zk.parameters tezos-rpc) (library_flags (:standard -linkall)) (flags diff --git a/src/proto_008_PtEdo2Zk/lib_parameters/dune b/src/proto_008_PtEdo2Zk/lib_parameters/dune index db6cf3ae47a8..6357f166b3cf 100644 --- a/src/proto_008_PtEdo2Zk/lib_parameters/dune +++ b/src/proto_008_PtEdo2Zk/lib_parameters/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_008_PtEdo2Zk_parameters) - (public_name tezos-protocol-008-PtEdo2Zk-parameters) + (public_name tezos-protocol-008-PtEdo2Zk.parameters) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -20,7 +20,7 @@ (name gen) (libraries tezos-base - tezos-protocol-008-PtEdo2Zk-parameters) + tezos-protocol-008-PtEdo2Zk.parameters) (link_flags (:standard -linkall)) (flags (:standard @@ -44,6 +44,6 @@ (action (run %{deps} --mainnet))) (install - (package tezos-protocol-008-PtEdo2Zk-parameters) + (package tezos-protocol-008-PtEdo2Zk) (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index 28710254afdf..718d17d2b359 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -14,7 +14,7 @@ tezos-proxy tezos-signer-backends tezos-protocol-plugin-009-PsFLoren - tezos-protocol-009-PsFLoren-parameters + tezos-protocol-009-PsFLoren.parameters tezos-rpc) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_inline_test)) diff --git a/src/proto_009_PsFLoren/lib_parameters/dune b/src/proto_009_PsFLoren/lib_parameters/dune index a52b2f43ac10..06ca41f693fa 100644 --- a/src/proto_009_PsFLoren/lib_parameters/dune +++ b/src/proto_009_PsFLoren/lib_parameters/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_009_PsFLoren_parameters) - (public_name tezos-protocol-009-PsFLoren-parameters) + (public_name tezos-protocol-009-PsFLoren.parameters) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -20,7 +20,7 @@ (name gen) (libraries tezos-base - tezos-protocol-009-PsFLoren-parameters) + tezos-protocol-009-PsFLoren.parameters) (link_flags (:standard -linkall)) (flags (:standard @@ -44,6 +44,6 @@ (action (run %{deps} --mainnet))) (install - (package tezos-protocol-009-PsFLoren-parameters) + (package tezos-protocol-009-PsFLoren) (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index d272e2a61c01..417fd646ca1a 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -14,7 +14,7 @@ tezos-proxy tezos-signer-backends tezos-protocol-plugin-010-PtGRANAD - tezos-protocol-010-PtGRANAD-parameters + tezos-protocol-010-PtGRANAD.parameters tezos-rpc) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_inline_test)) diff --git a/src/proto_010_PtGRANAD/lib_parameters/dune b/src/proto_010_PtGRANAD/lib_parameters/dune index 3b644f8a1007..6499d98228da 100644 --- a/src/proto_010_PtGRANAD/lib_parameters/dune +++ b/src/proto_010_PtGRANAD/lib_parameters/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_010_PtGRANAD_parameters) - (public_name tezos-protocol-010-PtGRANAD-parameters) + (public_name tezos-protocol-010-PtGRANAD.parameters) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -20,7 +20,7 @@ (name gen) (libraries tezos-base - tezos-protocol-010-PtGRANAD-parameters) + tezos-protocol-010-PtGRANAD.parameters) (link_flags (:standard -linkall)) (flags (:standard @@ -44,6 +44,6 @@ (action (run %{deps} --mainnet))) (install - (package tezos-protocol-010-PtGRANAD-parameters) + (package tezos-protocol-010-PtGRANAD) (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index 9bf73efb9d4e..c3e232ad405e 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -14,7 +14,7 @@ tezos-proxy tezos-signer-backends tezos-protocol-plugin-011-PtHangz2 - tezos-protocol-011-PtHangz2-parameters + tezos-protocol-011-PtHangz2.parameters tezos-rpc) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_inline_test)) diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune index f2e83dc1daa4..5155a595ff7c 100644 --- a/src/proto_011_PtHangz2/lib_parameters/dune +++ b/src/proto_011_PtHangz2/lib_parameters/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_011_PtHangz2_parameters) - (public_name tezos-protocol-011-PtHangz2-parameters) + (public_name tezos-protocol-011-PtHangz2.parameters) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -20,7 +20,7 @@ (name gen) (libraries tezos-base - tezos-protocol-011-PtHangz2-parameters) + tezos-protocol-011-PtHangz2.parameters) (link_flags (:standard -linkall)) (flags (:standard @@ -44,6 +44,6 @@ (action (run %{deps} --mainnet))) (install - (package tezos-protocol-011-PtHangz2-parameters) + (package tezos-protocol-011-PtHangz2) (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) diff --git a/src/proto_012_Psithaca/lib_benchmark/dune b/src/proto_012_Psithaca/lib_benchmark/dune index c3b23d44c6c2..21429caa9f49 100644 --- a/src/proto_012_Psithaca/lib_benchmark/dune +++ b/src/proto_012_Psithaca/lib_benchmark/dune @@ -15,7 +15,7 @@ tezos-benchmark-type-inference-012-Psithaca tezos-protocol-012-Psithaca tezos-crypto - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters hashcons tezos-012-Psithaca-test-helpers prbnmcn-stats) diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/dune b/src/proto_012_Psithaca/lib_benchmarks_proto/dune index 66515e9b74f4..0ab1d38d63e9 100644 --- a/src/proto_012_Psithaca/lib_benchmarks_proto/dune +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/dune @@ -10,7 +10,7 @@ tezos-stdlib tezos-base tezos-error-monad - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-benchmark tezos-benchmark-012-Psithaca tezos-benchmark-type-inference-012-Psithaca diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index bbed6c354422..113816a99bcb 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -14,7 +14,7 @@ tezos-proxy tezos-signer-backends tezos-protocol-plugin-012-Psithaca - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-rpc) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_inline_test)) diff --git a/src/proto_012_Psithaca/lib_delegate/test/dune b/src/proto_012_Psithaca/lib_delegate/test/dune index ee64b1adc556..e0cbcb2bc179 100644 --- a/src/proto_012_Psithaca/lib_delegate/test/dune +++ b/src/proto_012_Psithaca/lib_delegate/test/dune @@ -12,7 +12,7 @@ tezos-base-test-helpers tezos-baking-012-Psithaca.mockup-simulator tezos-baking-012-Psithaca - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-crypto alcotest-lwt) (flags diff --git a/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune index 2291de94c18f..fed71f518bd4 100644 --- a/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_012_Psithaca/lib_delegate/test/mockup_simulator/dune @@ -12,7 +12,7 @@ tezos-baking-012-Psithaca tezos-stdlib-unix tezos-client-base-unix - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-mockup tezos-mockup-proxy tezos-mockup-commands) diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune index 23f4b1b1b517..eb1ec036d201 100644 --- a/src/proto_012_Psithaca/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_012_Psithaca_parameters) - (public_name tezos-protocol-012-Psithaca-parameters) + (public_name tezos-protocol-012-Psithaca.parameters) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -20,7 +20,7 @@ (name gen) (libraries tezos-base - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-protocol-012-Psithaca) (link_flags (:standard -linkall)) (flags @@ -46,6 +46,6 @@ (action (run %{deps} --mainnet))) (install - (package tezos-protocol-012-Psithaca-parameters) + (package tezos-protocol-012-Psithaca) (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) diff --git a/src/proto_012_Psithaca/lib_plugin/test/dune b/src/proto_012_Psithaca/lib_plugin/test/dune index 663386ea03f6..945c46cb6c57 100644 --- a/src/proto_012_Psithaca/lib_plugin/test/dune +++ b/src/proto_012_Psithaca/lib_plugin/test/dune @@ -14,7 +14,7 @@ tezos-protocol-plugin-012-Psithaca tezos-protocol-012-Psithaca.environment tezos-protocol-012-Psithaca - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-012-Psithaca-test-helpers) (flags (:standard diff --git a/src/proto_012_Psithaca/lib_protocol/test/helpers/dune b/src/proto_012_Psithaca/lib_protocol/test/helpers/dune index 0bc1a37a9709..dcdf7b735eac 100644 --- a/src/proto_012_Psithaca/lib_protocol/test/helpers/dune +++ b/src/proto_012_Psithaca/lib_protocol/test/helpers/dune @@ -14,7 +14,7 @@ tezos-stdlib-unix tezos-protocol-012-Psithaca tezos-client-012-Psithaca - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-protocol-environment tezos-protocol-plugin-012-Psithaca tezos-protocol-012-Psithaca.environment diff --git a/src/proto_012_Psithaca/lib_protocol/test/integration/consensus/dune b/src/proto_012_Psithaca/lib_protocol/test/integration/consensus/dune index d5639927cba2..74e4e0b4b140 100644 --- a/src/proto_012_Psithaca/lib_protocol/test/integration/consensus/dune +++ b/src/proto_012_Psithaca/lib_protocol/test/integration/consensus/dune @@ -9,7 +9,7 @@ tezos-protocol-012-Psithaca tezos-012-Psithaca-test-helpers tezos-base-test-helpers - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-protocol-plugin-012-Psithaca) (flags (:standard diff --git a/src/proto_012_Psithaca/lib_protocol/test/integration/dune b/src/proto_012_Psithaca/lib_protocol/test/integration/dune index cdd6b00157a6..a0c7891083e7 100644 --- a/src/proto_012_Psithaca/lib_protocol/test/integration/dune +++ b/src/proto_012_Psithaca/lib_protocol/test/integration/dune @@ -9,7 +9,7 @@ tezos-client-012-Psithaca tezos-client-base tezos-protocol-012-Psithaca - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-012-Psithaca-test-helpers tezos-base-test-helpers) (flags diff --git a/src/proto_012_Psithaca/lib_protocol/test/unit/dune b/src/proto_012_Psithaca/lib_protocol/test/unit/dune index 046788f4e630..6ba7f80bdc96 100644 --- a/src/proto_012_Psithaca/lib_protocol/test/unit/dune +++ b/src/proto_012_Psithaca/lib_protocol/test/unit/dune @@ -9,7 +9,7 @@ tezos-micheline tezos-client-012-Psithaca tezos-client-base - tezos-protocol-012-Psithaca-parameters + tezos-protocol-012-Psithaca.parameters tezos-protocol-environment tezos-stdlib-unix tezos-protocol-012-Psithaca diff --git a/src/proto_013_PtJakart/bin_sc_rollup_node/dune b/src/proto_013_PtJakart/bin_sc_rollup_node/dune index 955c99a2de2e..9baf3f7d25f2 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_node/dune @@ -19,7 +19,7 @@ tezos-context.helpers tezos-protocol-013-PtJakart tezos-protocol-plugin-013-PtJakart - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-rpc tezos-rpc-http tezos-rpc-http-server diff --git a/src/proto_013_PtJakart/lib_benchmark/dune b/src/proto_013_PtJakart/lib_benchmark/dune index 6fb517a6a4d8..40099aaadfec 100644 --- a/src/proto_013_PtJakart/lib_benchmark/dune +++ b/src/proto_013_PtJakart/lib_benchmark/dune @@ -14,7 +14,7 @@ tezos-benchmark-type-inference-013-PtJakart tezos-protocol-013-PtJakart tezos-crypto - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters hashcons tezos-013-PtJakart-test-helpers prbnmcn-stats) diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/dune b/src/proto_013_PtJakart/lib_benchmarks_proto/dune index 1b4351a3d904..8f9ebf315b4c 100644 --- a/src/proto_013_PtJakart/lib_benchmarks_proto/dune +++ b/src/proto_013_PtJakart/lib_benchmarks_proto/dune @@ -10,7 +10,7 @@ tezos-stdlib tezos-base tezos-error-monad - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-benchmark tezos-benchmark-013-PtJakart tezos-benchmark-type-inference-013-PtJakart diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index fdd03744b25c..3bd636b7459b 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -14,7 +14,7 @@ tezos-proxy tezos-signer-backends tezos-protocol-plugin-013-PtJakart - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-rpc) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_inline_test)) diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune index 354264443dcf..87ae06491a87 100644 --- a/src/proto_013_PtJakart/lib_client_commands/dune +++ b/src/proto_013_PtJakart/lib_client_commands/dune @@ -8,7 +8,7 @@ (libraries tezos-base tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-stdlib-unix tezos-protocol-environment tezos-shell-services @@ -45,7 +45,7 @@ (libraries tezos-base tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-protocol-environment tezos-shell-services tezos-client-base diff --git a/src/proto_013_PtJakart/lib_delegate/test/dune b/src/proto_013_PtJakart/lib_delegate/test/dune index fcad781d4327..b42353ef9ada 100644 --- a/src/proto_013_PtJakart/lib_delegate/test/dune +++ b/src/proto_013_PtJakart/lib_delegate/test/dune @@ -12,7 +12,7 @@ tezos-base-test-helpers tezos-baking-013-PtJakart.mockup-simulator tezos-baking-013-PtJakart - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-crypto alcotest-lwt) (flags diff --git a/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune b/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune index f452f1abff72..eee2708e0e88 100644 --- a/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_013_PtJakart/lib_delegate/test/mockup_simulator/dune @@ -12,7 +12,7 @@ tezos-baking-013-PtJakart tezos-stdlib-unix tezos-client-base-unix - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-mockup tezos-mockup-proxy tezos-mockup-commands diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune index 358bcb06225c..4a72ab04af24 100644 --- a/src/proto_013_PtJakart/lib_parameters/dune +++ b/src/proto_013_PtJakart/lib_parameters/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_013_PtJakart_parameters) - (public_name tezos-protocol-013-PtJakart-parameters) + (public_name tezos-protocol-013-PtJakart.parameters) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -20,7 +20,7 @@ (name gen) (libraries tezos-base - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-protocol-013-PtJakart) (link_flags (:standard -linkall)) (flags @@ -46,6 +46,6 @@ (action (run %{deps} --mainnet))) (install - (package tezos-protocol-013-PtJakart-parameters) + (package tezos-protocol-013-PtJakart) (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) diff --git a/src/proto_013_PtJakart/lib_plugin/test/dune b/src/proto_013_PtJakart/lib_plugin/test/dune index a46009640bbd..568c3dc82549 100644 --- a/src/proto_013_PtJakart/lib_plugin/test/dune +++ b/src/proto_013_PtJakart/lib_plugin/test/dune @@ -15,7 +15,7 @@ tezos-protocol-plugin-013-PtJakart tezos-protocol-013-PtJakart.environment tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-013-PtJakart-test-helpers) (flags (:standard diff --git a/src/proto_013_PtJakart/lib_protocol/test/helpers/dune b/src/proto_013_PtJakart/lib_protocol/test/helpers/dune index 46811b28fc8b..205d1eee1149 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/helpers/dune +++ b/src/proto_013_PtJakart/lib_protocol/test/helpers/dune @@ -14,7 +14,7 @@ tezos-stdlib-unix tezos-protocol-013-PtJakart tezos-client-013-PtJakart - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-protocol-environment tezos-protocol-plugin-013-PtJakart tezos-protocol-013-PtJakart.environment diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/consensus/dune b/src/proto_013_PtJakart/lib_protocol/test/integration/consensus/dune index d38a5fd03f41..0ffea3660cfb 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/integration/consensus/dune +++ b/src/proto_013_PtJakart/lib_protocol/test/integration/consensus/dune @@ -9,7 +9,7 @@ tezos-protocol-013-PtJakart tezos-013-PtJakart-test-helpers tezos-base-test-helpers - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-protocol-plugin-013-PtJakart) (flags (:standard diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/dune b/src/proto_013_PtJakart/lib_protocol/test/integration/dune index d945e5a6f161..5f045a93b2a3 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/integration/dune +++ b/src/proto_013_PtJakart/lib_protocol/test/integration/dune @@ -8,7 +8,7 @@ tezos-base tezos-client-013-PtJakart tezos-protocol-013-PtJakart - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-013-PtJakart-test-helpers tezos-base-test-helpers) (flags diff --git a/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/dune b/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/dune index e6d9a3ccfe3d..1c4c8ab64298 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/dune +++ b/src/proto_013_PtJakart/lib_protocol/test/integration/michelson/dune @@ -14,7 +14,7 @@ tezos-micheline tezos-benchmark-013-PtJakart tezos-benchmark-type-inference-013-PtJakart - tezos-protocol-013-PtJakart-parameters) + tezos-protocol-013-PtJakart.parameters) (flags (:standard -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/lib_protocol/test/unit/dune b/src/proto_013_PtJakart/lib_protocol/test/unit/dune index a1d6af2718f3..4aece4b6124e 100644 --- a/src/proto_013_PtJakart/lib_protocol/test/unit/dune +++ b/src/proto_013_PtJakart/lib_protocol/test/unit/dune @@ -9,7 +9,7 @@ tezos-micheline tezos-client-013-PtJakart tezos-client-base - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-protocol-environment tezos-stdlib-unix tezos-protocol-013-PtJakart diff --git a/src/proto_013_PtJakart/lib_sc_rollup/dune b/src/proto_013_PtJakart/lib_sc_rollup/dune index e3f7046242e1..7067bf15af87 100644 --- a/src/proto_013_PtJakart/lib_sc_rollup/dune +++ b/src/proto_013_PtJakart/lib_sc_rollup/dune @@ -9,7 +9,7 @@ tezos-base tezos-protocol-013-PtJakart tezos-protocol-plugin-013-PtJakart - tezos-protocol-013-PtJakart-parameters + tezos-protocol-013-PtJakart.parameters tezos-rpc) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_inline_test)) diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 9c76ba42e6b6..e94958a04861 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -19,7 +19,7 @@ tezos-context.helpers tezos-protocol-alpha tezos-protocol-plugin-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-rpc tezos-rpc-http tezos-rpc-http-server diff --git a/src/proto_alpha/lib_benchmark/dune b/src/proto_alpha/lib_benchmark/dune index 423b5cf065d2..5e10d5f230da 100644 --- a/src/proto_alpha/lib_benchmark/dune +++ b/src/proto_alpha/lib_benchmark/dune @@ -14,7 +14,7 @@ tezos-benchmark-type-inference-alpha tezos-protocol-alpha tezos-crypto - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters hashcons tezos-alpha-test-helpers prbnmcn-stats) diff --git a/src/proto_alpha/lib_benchmarks_proto/dune b/src/proto_alpha/lib_benchmarks_proto/dune index 96216119e2ec..266e68abdeaf 100644 --- a/src/proto_alpha/lib_benchmarks_proto/dune +++ b/src/proto_alpha/lib_benchmarks_proto/dune @@ -10,7 +10,7 @@ tezos-stdlib tezos-base tezos-error-monad - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-benchmark tezos-benchmark-alpha tezos-benchmark-type-inference-alpha diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index 4b747ec447f2..845fb5d80c0a 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -14,7 +14,7 @@ tezos-proxy tezos-signer-backends tezos-protocol-plugin-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-rpc) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_inline_test)) diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index 889faa3a9832..b03a570c3786 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -8,7 +8,7 @@ (libraries tezos-base tezos-protocol-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-stdlib-unix tezos-protocol-environment tezos-shell-services @@ -45,7 +45,7 @@ (libraries tezos-base tezos-protocol-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-protocol-environment tezos-shell-services tezos-client-base diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune index 109eb5e2f602..5f2c9f0e5367 100644 --- a/src/proto_alpha/lib_delegate/test/dune +++ b/src/proto_alpha/lib_delegate/test/dune @@ -12,7 +12,7 @@ tezos-base-test-helpers tezos-baking-alpha.mockup-simulator tezos-baking-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-crypto alcotest-lwt) (flags diff --git a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune index 84cb43dbbd14..bfbc06555a9c 100644 --- a/src/proto_alpha/lib_delegate/test/mockup_simulator/dune +++ b/src/proto_alpha/lib_delegate/test/mockup_simulator/dune @@ -12,7 +12,7 @@ tezos-baking-alpha tezos-stdlib-unix tezos-client-base-unix - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-mockup tezos-mockup-proxy tezos-mockup-commands diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index 29d5215a0cd5..1590cf7ccb84 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -3,7 +3,7 @@ (library (name tezos_protocol_alpha_parameters) - (public_name tezos-protocol-alpha-parameters) + (public_name tezos-protocol-alpha.parameters) (instrumentation (backend bisect_ppx)) (libraries tezos-base @@ -19,7 +19,7 @@ (name gen) (libraries tezos-base - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-protocol-alpha) (link_flags (:standard -linkall)) (flags @@ -45,6 +45,6 @@ (action (run %{deps} --mainnet))) (install - (package tezos-protocol-alpha-parameters) + (package tezos-protocol-alpha) (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune index 6fc2e714b381..d053bae5bd8f 100644 --- a/src/proto_alpha/lib_plugin/test/dune +++ b/src/proto_alpha/lib_plugin/test/dune @@ -15,7 +15,7 @@ tezos-protocol-plugin-alpha tezos-protocol-alpha.environment tezos-protocol-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-alpha-test-helpers) (flags (:standard diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index 0d158c65e6e8..f62f78e2a1ec 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -14,7 +14,7 @@ tezos-stdlib-unix tezos-protocol-alpha tezos-client-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-protocol-environment tezos-protocol-plugin-alpha tezos-protocol-alpha.environment diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/dune b/src/proto_alpha/lib_protocol/test/integration/consensus/dune index e225cf6d83b3..c6580ada3ad0 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune @@ -9,7 +9,7 @@ tezos-protocol-alpha tezos-alpha-test-helpers tezos-base-test-helpers - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-protocol-plugin-alpha) (flags (:standard diff --git a/src/proto_alpha/lib_protocol/test/integration/dune b/src/proto_alpha/lib_protocol/test/integration/dune index 6990c33db76a..eaa2642a40ae 100644 --- a/src/proto_alpha/lib_protocol/test/integration/dune +++ b/src/proto_alpha/lib_protocol/test/integration/dune @@ -8,7 +8,7 @@ tezos-base tezos-client-alpha tezos-protocol-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-alpha-test-helpers tezos-base-test-helpers) (flags diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/dune b/src/proto_alpha/lib_protocol/test/integration/michelson/dune index fad51c13f559..1f0a1209b046 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune @@ -14,7 +14,7 @@ tezos-micheline tezos-benchmark-alpha tezos-benchmark-type-inference-alpha - tezos-protocol-alpha-parameters) + tezos-protocol-alpha.parameters) (flags (:standard -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 6d1449fd8cf3..9f34b042ee77 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -9,7 +9,7 @@ tezos-micheline tezos-client-alpha tezos-client-base - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-protocol-environment tezos-stdlib-unix tezos-protocol-alpha diff --git a/src/proto_alpha/lib_sc_rollup/dune b/src/proto_alpha/lib_sc_rollup/dune index a680588fc8d6..8eaf39c7e09a 100644 --- a/src/proto_alpha/lib_sc_rollup/dune +++ b/src/proto_alpha/lib_sc_rollup/dune @@ -9,7 +9,7 @@ tezos-base tezos-protocol-alpha tezos-protocol-plugin-alpha - tezos-protocol-alpha-parameters + tezos-protocol-alpha.parameters tezos-rpc) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_inline_test)) -- GitLab