diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 3fbadea4c06d96d098d7154446ddf0c72b1846b7..ff06bf5af69898a9be6e8cc63ecd31bcef6c26d4 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -650,6 +650,10 @@ 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. # Ignoring unreleased package tezos-dac-node-lib-test. diff --git a/dune-project b/dune-project index 88619fa0f3ad4a3eaf77a725263042be8e361ce4..c43247c8455f4e1ca08b01e4d2136bacb7b0e14e 100644 --- a/dune-project +++ b/dune-project @@ -86,6 +86,8 @@ (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)) (package (name tezos-dal-016-PtMumbai)) diff --git a/manifest/main.ml b/manifest/main.ml index 22be5f98ba739727413e7213a27f9d7e0fc3972a..53a4fd28c197743b07f86d4d41e2417dcbae91bd 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3353,6 +3353,31 @@ 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_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" @@ -3364,11 +3389,12 @@ 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_; octez_rpc_http_server; + octez_dac_lib |> open_; + octez_dac_client_lib |> open_; ] let _octez_dac_node_lib_tests = @@ -5446,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" @@ -5456,7 +5482,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_; @@ -5472,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: @@ -5483,6 +5509,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-alpha.opam b/opam/tezos-dac-alpha.opam index 45a93126106e740c401c0428a3bc0df0e006cef6..c620542e0a5c05922539b0f43d43946199b55c26 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-client-lib.opam b/opam/tezos-dac-client-lib.opam new file mode 100644 index 0000000000000000000000000000000000000000..7594af17670dcd3214c1941c0b53ff905204153e --- /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-lib.opam b/opam/tezos-dac-lib.opam new file mode 100644 index 0000000000000000000000000000000000000000..9a4ccb39569a067763410c54d38f6766610c6878 --- /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 cb3fe1f6e0e15827b7d5b75f02878be16ff0b0bf..0aa7c1050df06963c6f6e0b8327b2aeee4d20fb5 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -12,11 +12,12 @@ depends: [ "ocaml" { >= "4.14" } "tezos-base" "tezos-client-base" - "tezos-protocol-updater" "tezos-client-base-unix" "tezos-stdlib-unix" "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/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/dune b/src/lib_dac/dune new file mode 100644 index 0000000000000000000000000000000000000000..4ec71d5ff881b401122243287efd11885c3a3cad --- /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/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/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 0000000000000000000000000000000000000000..284f7239312b004449645b6478542b1ace53fa91 --- /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 608df6acda314db54adfdf5b5a06c1450eee1bd5..aeeadad47f6c08d5f0b35cf223a5fafc429355d8 100644 --- a/src/lib_dac_node/dune +++ b/src/lib_dac_node/dune @@ -9,16 +9,18 @@ tezos-base tezos-base.unix tezos-client-base - tezos-protocol-updater tezos-client-base-unix tezos-stdlib-unix tezos_layer2_store - tezos-rpc-http-server) + tezos-rpc-http-server + tezos-dac-lib + tezos-dac-client-lib) (flags (: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)) + -open Tezos_layer2_store + -open Tezos_dac_lib + -open Tezos_dac_client_lib)) 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 93% rename from src/proto_alpha/lib_dac/dune rename to src/proto_alpha/lib_dac_plugin/dune index d95b4442321617ec350fe591280630f714689126..dee875addab82210b75fca5f2baeb450eefd5954 100644 --- a/src/proto_alpha/lib_dac/dune +++ b/src/proto_alpha/lib_dac_plugin/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)) diff --git a/src/proto_alpha/lib_dac/test/dune b/src/proto_alpha/lib_dac_plugin/test/dune similarity index 89% rename from src/proto_alpha/lib_dac/test/dune rename to src/proto_alpha/lib_dac_plugin/test/dune index 0ba77c90c6a8d781f3c250c61a400725ad65195a..3b4e454d6e252d7f9a05c0750534bbab7d23bc45 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 @@ -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)) @@ -32,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 7614ead806fa14f190d318908ea0d06b78bb8787..b9a6196454f559f88bc802617229055dfb8598de 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 20a414457447a8b37241fb60bee3d6a143db2bf1..cc9fbb867d56c838920b476401a43dbc75101cb5 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 d96e3d36e3871a9073fd4f53c51e29eed03c72a2..88a669a41fee3c2a4311eea8264ec6b627265aa4 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