From 093ecec19351e66416c207d66061c7cebd82c3e2 Mon Sep 17 00:00:00 2001 From: Ryan Tan Date: Mon, 13 Mar 2023 14:29:53 +0000 Subject: [PATCH 1/4] Dac: init lib_dac --- .gitlab/ci/jobs/packaging/opam_package.yml | 2 ++ dune-project | 1 + manifest/main.ml | 12 +++++++++++- opam/tezos-dac-alpha.opam | 3 ++- opam/tezos-dac-lib.opam | 21 +++++++++++++++++++++ opam/tezos-dac-node-lib.opam | 1 + src/lib_dac/dune | 14 ++++++++++++++ src/lib_dac_node/dune | 6 ++++-- src/proto_alpha/lib_dac/dune | 4 ++-- 9 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 opam/tezos-dac-lib.opam create mode 100644 src/lib_dac/dune diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 3fbadea4c06d..213ac5a2adbc 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -650,6 +650,8 @@ opam:tezos-crypto-dal: # Ignoring unreleased package tezos-dac-alpha. +# Ignoring unreleased package tezos-dac-lib. + # Ignoring unreleased package tezos-dac-node-lib. # Ignoring unreleased package tezos-dac-node-lib-test. diff --git a/dune-project b/dune-project index 88619fa0f3ad..8c6c55d37952 100644 --- a/dune-project +++ b/dune-project @@ -86,6 +86,7 @@ (package (name tezos-crypto)) (package (name tezos-crypto-dal)) (package (name tezos-dac-alpha)) +(package (name tezos-dac-lib)) (package (name tezos-dac-node-lib)(allow_empty)) (package (name tezos-dac-node-lib-test)(allow_empty)) (package (name tezos-dal-016-PtMumbai)) diff --git a/manifest/main.ml b/manifest/main.ml index 22be5f98ba73..1a08d4ed8e21 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3353,6 +3353,15 @@ let octez_dal_node_lib = octez_crypto_dal |> open_; ] +let octez_dac_lib = + public_lib + "tezos-dac-lib" + ~path:"src/lib_dac" + ~opam:"tezos-dac-lib" + ~synopsis:"Tezos: `tezos-dac` library" + ~deps: + [octez_base |> open_ ~m:"TzPervasives"; octez_protocol_updater |> open_] + let octez_dac_node_lib = private_lib "tezos_dac_node_lib" @@ -3369,6 +3378,7 @@ let octez_dac_node_lib = octez_stdlib_unix |> open_; octez_layer2_store |> open_; octez_rpc_http_server; + octez_dac_lib |> open_; ] let _octez_dac_node_lib_tests = @@ -5456,7 +5466,7 @@ module Protocol = Protocol |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; octez_protocol_compiler_registerer |> open_; octez_stdlib_unix |> open_; - octez_dac_node_lib |> open_; + octez_dac_lib |> open_; client |> if_some |> open_; embedded |> open_; main |> open_; diff --git a/opam/tezos-dac-alpha.opam b/opam/tezos-dac-alpha.opam index 45a93126106e..c620542e0a5c 100644 --- a/opam/tezos-dac-alpha.opam +++ b/opam/tezos-dac-alpha.opam @@ -14,13 +14,14 @@ depends: [ "tezos-base" "octez-protocol-compiler" "tezos-stdlib-unix" - "tezos-dac-node-lib" + "tezos-dac-lib" "tezos-client-alpha" "tezos-embedded-protocol-alpha" "tezos-protocol-alpha" "tezt" { with-test & >= "3.0.0" } "tezos-base-test-helpers" {with-test} "tezos-alpha-test-helpers" {with-test} + "tezos-dac-node-lib" {with-test} "octez-alcotezt" {with-test} ] build: [ diff --git a/opam/tezos-dac-lib.opam b/opam/tezos-dac-lib.opam new file mode 100644 index 000000000000..9a4ccb39569a --- /dev/null +++ b/opam/tezos-dac-lib.opam @@ -0,0 +1,21 @@ +# 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" } + "tezos-base" + "tezos-protocol-updater" +] +build: [ + ["rm" "-r" "vendors"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Tezos: `tezos-dac` library" diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam index cb3fe1f6e0e1..505f957cb06a 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -17,6 +17,7 @@ depends: [ "tezos-stdlib-unix" "tezos-layer2-store" "tezos-rpc-http-server" + "tezos-dac-lib" ] build: [ ["rm" "-r" "vendors"] diff --git a/src/lib_dac/dune b/src/lib_dac/dune new file mode 100644 index 000000000000..4ec71d5ff881 --- /dev/null +++ b/src/lib_dac/dune @@ -0,0 +1,14 @@ +; This file was automatically generated, do not edit. +; Edit file manifest/main.ml instead. + +(library + (name tezos_dac_lib) + (public_name tezos-dac-lib) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-protocol-updater) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_protocol_updater)) diff --git a/src/lib_dac_node/dune b/src/lib_dac_node/dune index 608df6acda31..02ba07e3de6e 100644 --- a/src/lib_dac_node/dune +++ b/src/lib_dac_node/dune @@ -13,7 +13,8 @@ tezos-client-base-unix tezos-stdlib-unix tezos_layer2_store - tezos-rpc-http-server) + tezos-rpc-http-server + tezos-dac-lib) (flags (:standard) -open Tezos_base.TzPervasives @@ -21,4 +22,5 @@ -open Tezos_protocol_updater -open Tezos_client_base_unix -open Tezos_stdlib_unix - -open Tezos_layer2_store)) + -open Tezos_layer2_store + -open Tezos_dac_lib)) diff --git a/src/proto_alpha/lib_dac/dune b/src/proto_alpha/lib_dac/dune index d95b44423216..dee875addab8 100644 --- a/src/proto_alpha/lib_dac/dune +++ b/src/proto_alpha/lib_dac/dune @@ -9,7 +9,7 @@ tezos-base octez-protocol-compiler.registerer tezos-stdlib-unix - tezos_dac_node_lib + tezos-dac-lib tezos-client-alpha tezos-embedded-protocol-alpha tezos-protocol-alpha) @@ -22,7 +22,7 @@ -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_protocol_registerer -open Tezos_stdlib_unix - -open Tezos_dac_node_lib + -open Tezos_dac_lib -open Tezos_client_alpha -open Tezos_embedded_protocol_alpha -open Tezos_protocol_alpha)) -- GitLab From daae37cfe08cfdbbffd671ca394d9cb2c360696b Mon Sep 17 00:00:00 2001 From: Ryan Tan Date: Mon, 13 Mar 2023 14:35:05 +0000 Subject: [PATCH 2/4] Dac: move RPC services to lib_dac --- manifest/main.ml | 2 +- opam/tezos-dac-node-lib.opam | 1 - src/{lib_dac_node => lib_dac}/RPC_services.ml | 0 src/{lib_dac_node => lib_dac}/certificate_repr.ml | 0 src/{lib_dac_node => lib_dac}/dac_plugin.ml | 0 src/{lib_dac_node => lib_dac}/dac_plugin.mli | 0 src/{lib_dac_node => lib_dac}/pagination_scheme.ml | 0 src/{lib_dac_node => lib_dac}/pagination_scheme.mli | 0 src/{lib_dac_node => lib_dac}/signature_repr.ml | 0 src/lib_dac_node/dune | 2 -- src/proto_alpha/lib_dac/test/dune | 2 ++ 11 files changed, 3 insertions(+), 4 deletions(-) rename src/{lib_dac_node => lib_dac}/RPC_services.ml (100%) rename src/{lib_dac_node => lib_dac}/certificate_repr.ml (100%) rename src/{lib_dac_node => lib_dac}/dac_plugin.ml (100%) rename src/{lib_dac_node => lib_dac}/dac_plugin.mli (100%) rename src/{lib_dac_node => lib_dac}/pagination_scheme.ml (100%) rename src/{lib_dac_node => lib_dac}/pagination_scheme.mli (100%) rename src/{lib_dac_node => lib_dac}/signature_repr.ml (100%) diff --git a/manifest/main.ml b/manifest/main.ml index 1a08d4ed8e21..645ea5ecc8d6 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3373,7 +3373,6 @@ let octez_dac_node_lib = octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; octez_client_base |> open_; - octez_protocol_updater |> open_; octez_client_base_unix |> open_; octez_stdlib_unix |> open_; octez_layer2_store |> open_; @@ -5493,6 +5492,7 @@ module Protocol = Protocol main |> open_; octez_base_test_helpers |> open_; test_helpers |> if_some |> open_; + octez_dac_lib |> open_; octez_dac_node_lib |> open_; alcotezt; ] diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam index 505f957cb06a..f991f78122d3 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "tezos-base" "tezos-client-base" - "tezos-protocol-updater" "tezos-client-base-unix" "tezos-stdlib-unix" "tezos-layer2-store" diff --git a/src/lib_dac_node/RPC_services.ml b/src/lib_dac/RPC_services.ml similarity index 100% rename from src/lib_dac_node/RPC_services.ml rename to src/lib_dac/RPC_services.ml diff --git a/src/lib_dac_node/certificate_repr.ml b/src/lib_dac/certificate_repr.ml similarity index 100% rename from src/lib_dac_node/certificate_repr.ml rename to src/lib_dac/certificate_repr.ml diff --git a/src/lib_dac_node/dac_plugin.ml b/src/lib_dac/dac_plugin.ml similarity index 100% rename from src/lib_dac_node/dac_plugin.ml rename to src/lib_dac/dac_plugin.ml diff --git a/src/lib_dac_node/dac_plugin.mli b/src/lib_dac/dac_plugin.mli similarity index 100% rename from src/lib_dac_node/dac_plugin.mli rename to src/lib_dac/dac_plugin.mli diff --git a/src/lib_dac_node/pagination_scheme.ml b/src/lib_dac/pagination_scheme.ml similarity index 100% rename from src/lib_dac_node/pagination_scheme.ml rename to src/lib_dac/pagination_scheme.ml diff --git a/src/lib_dac_node/pagination_scheme.mli b/src/lib_dac/pagination_scheme.mli similarity index 100% rename from src/lib_dac_node/pagination_scheme.mli rename to src/lib_dac/pagination_scheme.mli diff --git a/src/lib_dac_node/signature_repr.ml b/src/lib_dac/signature_repr.ml similarity index 100% rename from src/lib_dac_node/signature_repr.ml rename to src/lib_dac/signature_repr.ml diff --git a/src/lib_dac_node/dune b/src/lib_dac_node/dune index 02ba07e3de6e..69c91463365d 100644 --- a/src/lib_dac_node/dune +++ b/src/lib_dac_node/dune @@ -9,7 +9,6 @@ tezos-base tezos-base.unix tezos-client-base - tezos-protocol-updater tezos-client-base-unix tezos-stdlib-unix tezos_layer2_store @@ -19,7 +18,6 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_client_base - -open Tezos_protocol_updater -open Tezos_client_base_unix -open Tezos_stdlib_unix -open Tezos_layer2_store diff --git a/src/proto_alpha/lib_dac/test/dune b/src/proto_alpha/lib_dac/test/dune index 0ba77c90c6a8..075160c9c69c 100644 --- a/src/proto_alpha/lib_dac/test/dune +++ b/src/proto_alpha/lib_dac/test/dune @@ -11,6 +11,7 @@ tezos-protocol-alpha tezos-base-test-helpers tezos-alpha-test-helpers + tezos-dac-lib tezos_dac_node_lib octez-alcotezt) (library_flags (:standard -linkall)) @@ -24,6 +25,7 @@ -open Tezos_protocol_alpha -open Tezos_base_test_helpers -open Tezos_alpha_test_helpers + -open Tezos_dac_lib -open Tezos_dac_node_lib -open Octez_alcotezt) (modules test_dac_pages_encoding test_dac_plugin_registration test_helpers)) -- GitLab From 3f1c7f117f5a79389efd95551ed5bd72513757df Mon Sep 17 00:00:00 2001 From: Ryan Tan Date: Mon, 13 Mar 2023 14:59:20 +0000 Subject: [PATCH 3/4] Dac: move Dac_node_client to lib_dac_client --- .gitlab/ci/jobs/packaging/opam_package.yml | 2 ++ dune-project | 1 + manifest/main.ml | 17 +++++++++++++ opam/tezos-dac-client-lib.opam | 24 +++++++++++++++++++ opam/tezos-dac-node-lib.opam | 1 + .../dac_node_client.ml | 0 .../dac_node_client.mli | 0 src/lib_dac_client/dune | 21 ++++++++++++++++ src/lib_dac_node/dune | 6 +++-- 9 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 opam/tezos-dac-client-lib.opam rename src/{lib_dac_node => lib_dac_client}/dac_node_client.ml (100%) rename src/{lib_dac_node => lib_dac_client}/dac_node_client.mli (100%) create mode 100644 src/lib_dac_client/dune diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 213ac5a2adbc..ff06bf5af698 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -650,6 +650,8 @@ opam:tezos-crypto-dal: # Ignoring unreleased package tezos-dac-alpha. +# Ignoring unreleased package tezos-dac-client-lib. + # Ignoring unreleased package tezos-dac-lib. # Ignoring unreleased package tezos-dac-node-lib. diff --git a/dune-project b/dune-project index 8c6c55d37952..c43247c8455f 100644 --- a/dune-project +++ b/dune-project @@ -86,6 +86,7 @@ (package (name tezos-crypto)) (package (name tezos-crypto-dal)) (package (name tezos-dac-alpha)) +(package (name tezos-dac-client-lib)) (package (name tezos-dac-lib)) (package (name tezos-dac-node-lib)(allow_empty)) (package (name tezos-dac-node-lib-test)(allow_empty)) diff --git a/manifest/main.ml b/manifest/main.ml index 645ea5ecc8d6..1f5295aed5b2 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3362,6 +3362,22 @@ let octez_dac_lib = ~deps: [octez_base |> open_ ~m:"TzPervasives"; octez_protocol_updater |> open_] +let octez_dac_client_lib = + public_lib + "tezos-dac-client-lib" + ~path:"src/lib_dac_client" + ~opam:"tezos-dac-client-lib" + ~synopsis:"Tezos: `tezos-dac-client` library" + ~deps: + [ + octez_base |> open_ ~m:"TzPervasives"; + octez_base_unix; + octez_client_base |> open_; + octez_client_base_unix |> open_; + octez_stdlib_unix |> open_; + octez_dac_lib |> open_; + ] + let octez_dac_node_lib = private_lib "tezos_dac_node_lib" @@ -3378,6 +3394,7 @@ let octez_dac_node_lib = octez_layer2_store |> open_; octez_rpc_http_server; octez_dac_lib |> open_; + octez_dac_client_lib |> open_; ] let _octez_dac_node_lib_tests = diff --git a/opam/tezos-dac-client-lib.opam b/opam/tezos-dac-client-lib.opam new file mode 100644 index 000000000000..7594af17670d --- /dev/null +++ b/opam/tezos-dac-client-lib.opam @@ -0,0 +1,24 @@ +# 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" } + "tezos-base" + "tezos-client-base" + "tezos-client-base-unix" + "tezos-stdlib-unix" + "tezos-dac-lib" +] +build: [ + ["rm" "-r" "vendors"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Tezos: `tezos-dac-client` library" diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam index f991f78122d3..0aa7c1050df0 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -17,6 +17,7 @@ depends: [ "tezos-layer2-store" "tezos-rpc-http-server" "tezos-dac-lib" + "tezos-dac-client-lib" ] build: [ ["rm" "-r" "vendors"] diff --git a/src/lib_dac_node/dac_node_client.ml b/src/lib_dac_client/dac_node_client.ml similarity index 100% rename from src/lib_dac_node/dac_node_client.ml rename to src/lib_dac_client/dac_node_client.ml diff --git a/src/lib_dac_node/dac_node_client.mli b/src/lib_dac_client/dac_node_client.mli similarity index 100% rename from src/lib_dac_node/dac_node_client.mli rename to src/lib_dac_client/dac_node_client.mli diff --git a/src/lib_dac_client/dune b/src/lib_dac_client/dune new file mode 100644 index 000000000000..284f7239312b --- /dev/null +++ b/src/lib_dac_client/dune @@ -0,0 +1,21 @@ +; This file was automatically generated, do not edit. +; Edit file manifest/main.ml instead. + +(library + (name tezos_dac_client_lib) + (public_name tezos-dac-client-lib) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-base + tezos-base.unix + tezos-client-base + tezos-client-base-unix + tezos-stdlib-unix + tezos-dac-lib) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_client_base + -open Tezos_client_base_unix + -open Tezos_stdlib_unix + -open Tezos_dac_lib)) diff --git a/src/lib_dac_node/dune b/src/lib_dac_node/dune index 69c91463365d..aeeadad47f6c 100644 --- a/src/lib_dac_node/dune +++ b/src/lib_dac_node/dune @@ -13,7 +13,8 @@ tezos-stdlib-unix tezos_layer2_store tezos-rpc-http-server - tezos-dac-lib) + tezos-dac-lib + tezos-dac-client-lib) (flags (:standard) -open Tezos_base.TzPervasives @@ -21,4 +22,5 @@ -open Tezos_client_base_unix -open Tezos_stdlib_unix -open Tezos_layer2_store - -open Tezos_dac_lib)) + -open Tezos_dac_lib + -open Tezos_dac_client_lib)) -- GitLab From 52dbc4ec736c697d947720fbb50df6bec734812f Mon Sep 17 00:00:00 2001 From: Ryan Tan Date: Tue, 14 Mar 2023 14:23:43 +0000 Subject: [PATCH 4/4] Dac: rename proto_alpha/lib_dac to proto_alpha/lib_dac_plugin --- manifest/main.ml | 4 ++-- .../{lib_dac => lib_dac_plugin}/dac_plugin_registration.ml | 0 src/proto_alpha/{lib_dac => lib_dac_plugin}/dune | 0 src/proto_alpha/{lib_dac => lib_dac_plugin}/test/dune | 4 ++-- .../test/test_dac_pages_encoding.ml | 2 +- .../test/test_dac_plugin_registration.ml | 2 +- .../{lib_dac => lib_dac_plugin}/test/test_helpers.ml | 0 tezt/tests/dune | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename src/proto_alpha/{lib_dac => lib_dac_plugin}/dac_plugin_registration.ml (100%) rename src/proto_alpha/{lib_dac => lib_dac_plugin}/dune (100%) rename src/proto_alpha/{lib_dac => lib_dac_plugin}/test/dune (92%) rename src/proto_alpha/{lib_dac => lib_dac_plugin}/test/test_dac_pages_encoding.ml (99%) rename src/proto_alpha/{lib_dac => lib_dac_plugin}/test/test_dac_plugin_registration.ml (98%) rename src/proto_alpha/{lib_dac => lib_dac_plugin}/test/test_helpers.ml (100%) diff --git a/manifest/main.ml b/manifest/main.ml index 1f5295aed5b2..53a4fd28c197 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -5472,7 +5472,7 @@ module Protocol = Protocol only_if (active && N.(number >= 017)) @@ fun () -> public_lib (sf "tezos-dac-%s" name_dash) - ~path:(path // "lib_dac") + ~path:(path // "lib_dac_plugin") ~synopsis: "Tezos/Protocol: protocol specific library for the Data availability \ Committee" @@ -5498,7 +5498,7 @@ module Protocol = Protocol "test_dac_plugin_registration"; "test_helpers"; ] - ~path:(path // "lib_dac/test") + ~path:(path // "lib_dac_plugin/test") ~with_macos_security_framework:true ~opam:(sf "tezos-dac-%s" name_dash) ~deps: diff --git a/src/proto_alpha/lib_dac/dac_plugin_registration.ml b/src/proto_alpha/lib_dac_plugin/dac_plugin_registration.ml similarity index 100% rename from src/proto_alpha/lib_dac/dac_plugin_registration.ml rename to src/proto_alpha/lib_dac_plugin/dac_plugin_registration.ml diff --git a/src/proto_alpha/lib_dac/dune b/src/proto_alpha/lib_dac_plugin/dune similarity index 100% rename from src/proto_alpha/lib_dac/dune rename to src/proto_alpha/lib_dac_plugin/dune diff --git a/src/proto_alpha/lib_dac/test/dune b/src/proto_alpha/lib_dac_plugin/test/dune similarity index 92% rename from src/proto_alpha/lib_dac/test/dune rename to src/proto_alpha/lib_dac_plugin/test/dune index 075160c9c69c..3b4e454d6e25 100644 --- a/src/proto_alpha/lib_dac/test/dune +++ b/src/proto_alpha/lib_dac_plugin/test/dune @@ -2,7 +2,7 @@ ; Edit file manifest/main.ml instead. (library - (name src_proto_alpha_lib_dac_test_tezt_lib) + (name src_proto_alpha_lib_dac_plugin_test_tezt_lib) (instrumentation (backend bisect_ppx)) (libraries tezt.core @@ -34,7 +34,7 @@ (name main) (instrumentation (backend bisect_ppx --bisect-sigterm)) (libraries - src_proto_alpha_lib_dac_test_tezt_lib + src_proto_alpha_lib_dac_plugin_test_tezt_lib tezt) (link_flags (:standard) diff --git a/src/proto_alpha/lib_dac/test/test_dac_pages_encoding.ml b/src/proto_alpha/lib_dac_plugin/test/test_dac_pages_encoding.ml similarity index 99% rename from src/proto_alpha/lib_dac/test/test_dac_pages_encoding.ml rename to src/proto_alpha/lib_dac_plugin/test/test_dac_pages_encoding.ml index 7614ead806fa..b9a6196454f5 100644 --- a/src/proto_alpha/lib_dac/test/test_dac_pages_encoding.ml +++ b/src/proto_alpha/lib_dac_plugin/test/test_dac_pages_encoding.ml @@ -26,7 +26,7 @@ (** Testing ------- Component: Dal_node Slot_frame_encoding - Invocation: dune exec src/proto_alpha/lib_dac/test/main.exe \ + Invocation: dune exec src/proto_alpha/lib_dac_plugin/test/main.exe \ -- test "^\[Unit\] Dac_pages_encoding.ml$" Subject: Tests for the SCORU storage module *) diff --git a/src/proto_alpha/lib_dac/test/test_dac_plugin_registration.ml b/src/proto_alpha/lib_dac_plugin/test/test_dac_plugin_registration.ml similarity index 98% rename from src/proto_alpha/lib_dac/test/test_dac_plugin_registration.ml rename to src/proto_alpha/lib_dac_plugin/test/test_dac_plugin_registration.ml index 20a414457447..cc9fbb867d56 100644 --- a/src/proto_alpha/lib_dac/test/test_dac_plugin_registration.ml +++ b/src/proto_alpha/lib_dac_plugin/test/test_dac_plugin_registration.ml @@ -26,7 +26,7 @@ (** Testing ------- Component: Lib_dac_node Dac_hash - Invocation: dune exec src/proto_alpha/lib_dac/test/main.exe \ + Invocation: dune exec src/proto_alpha/lib_dac_plugin/test/main.exe \ -- test "^\[Unit\] Dac_plugin_registration.ml$" Subject: Tests for the interoperability between Dac hash and given protocol hash diff --git a/src/proto_alpha/lib_dac/test/test_helpers.ml b/src/proto_alpha/lib_dac_plugin/test/test_helpers.ml similarity index 100% rename from src/proto_alpha/lib_dac/test/test_helpers.ml rename to src/proto_alpha/lib_dac_plugin/test/test_helpers.ml diff --git a/tezt/tests/dune b/tezt/tests/dune index d96e3d36e387..88a669a41fee 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -26,7 +26,7 @@ src_proto_alpha_lib_plugin_test_tezt_lib src_proto_alpha_lib_delegate_test_tezt_lib src_proto_alpha_lib_dal_test_tezt_lib - src_proto_alpha_lib_dac_test_tezt_lib + src_proto_alpha_lib_dac_plugin_test_tezt_lib src_proto_alpha_lib_client_test_tezt_lib src_proto_016_PtMumbai_lib_protocol_test_unit_tezt_lib src_proto_016_PtMumbai_lib_protocol_test_regression_tezt_lib -- GitLab