diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 995ab965b2d62a32d3d5cd35de131d5753411084..da395bbd4b153821605e41aec1ba7b7f61cb8ca3 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -1237,13 +1237,6 @@ opam:tezos-layer2-utils-018-Proxford: # Ignoring unreleased package tezos-lazy-containers-tests. -opam:tezos-lwt-result-stdlib: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-lwt-result-stdlib - # Ignoring unreleased package tezos-micheline-rewriting. opam:tezos-mockup: diff --git a/docs/developer/guidelines.rst b/docs/developer/guidelines.rst index 32d2d28fdb8b3559c6ba5c092ccec4576928a26c..7ec7752e4bac7db879907f8cf156b38e18e46d94 100644 --- a/docs/developer/guidelines.rst +++ b/docs/developer/guidelines.rst @@ -658,7 +658,7 @@ Lwtreslib provides additional combinators ``List.concat_map_s``, ``List.concat_map_e``, and ``List.concat_map_es`` to replace the non-vanilla compositions. -Check the :package-api:`online documentation `. +Check the :package-api:`online documentation `. Coding conventions ------------------ diff --git a/dune-project b/dune-project index b2ee2e58b2a9d4b292e0327965294bf2b5041b1a..f16e255a7997754781b8076fb499026bc8f51c86 100644 --- a/dune-project +++ b/dune-project @@ -152,7 +152,6 @@ (package (name tezos-layer2-utils-018-Proxford)) (package (name tezos-layer2-utils-alpha)) (package (name tezos-lazy-containers-tests)(allow_empty)) -(package (name tezos-lwt-result-stdlib)) (package (name tezos-micheline-rewriting)) (package (name tezos-mockup)) (package (name tezos-mockup-commands)) diff --git a/manifest/main.ml b/manifest/main.ml index a4e0ba208c9d695bf409d8b4aa12a18f96122d5f..b0de8eaf284a9a1357659f0c2e184fbc03f27682 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -409,7 +409,7 @@ let tezt_core_lib = let tezt_js_lib = external_sublib tezt_lib ~js_compatible:true "tezt.js" let tezt ~opam ~path ?js_compatible ?modes ?(deps = []) ?dep_globs - ?dep_globs_rec ?dep_files ?opam_with_test ?synopsis + ?dep_globs_rec ?dep_files ?opam_with_test ?dune_with_test ?synopsis ?(with_macos_security_framework = false) ?flags ?dune ?preprocess ?preprocessor_deps l = tezt_without_tezt_lib_dependency @@ -426,6 +426,7 @@ let tezt ~opam ~path ?js_compatible ?modes ?(deps = []) ?dep_globs ?dep_globs_rec ?dep_files ?opam_with_test + ?dune_with_test ?flags ?dune ?preprocess @@ -466,7 +467,8 @@ let registered_octez_libs : sub_lib_documentation_link list ref = ref [] let octez_lib ?internal_name ?js_of_ocaml ?inline_tests ?foreign_stubs ?documentation ?conflicts ?flags ?time_measurement_ppx ?deps ?dune ?modules ?linkall ?js_compatible ?bisect_ppx ?preprocess ?opam_only_deps ?cram - ?release_status ?ctypes ?c_library_flags ?synopsis:_ public_name ~path = + ?release_status ?ctypes ?c_library_flags ?opam_with_test ?synopsis:_ + public_name ~path = let name = let s = Option.value ~default:public_name internal_name in String.map @@ -492,7 +494,7 @@ let octez_lib ?internal_name ?js_of_ocaml ?inline_tests ?foreign_stubs ~internal_name:name ~opam:"octez-libs" ~synopsis:"Octez libs" - ~opam_with_test:Always + ?opam_with_test ?linkall ?js_compatible ?bisect_ppx @@ -525,7 +527,11 @@ let pp_octez_libs_index fmt registered_octez_libs = | Module registered -> Format.fprintf pp "- {{!module-%s}%s}" registered registered | Page registered -> - Format.fprintf pp "- {{!page-%s}%s}" registered registered + Format.fprintf + pp + "- {{!page-%s}%s}" + registered + (String.capitalize_ascii registered) in Format.fprintf fmt @@ -541,7 +547,9 @@ let pp_octez_libs_index fmt registered_octez_libs = | Page n1, Module n2 | Module n1, Page n2 | Module n1, Module n2 -> - String.compare n1 n2) + String.compare + (String.capitalize_ascii n1) + (String.capitalize_ascii n2)) registered_octez_libs let octez_test_helpers = @@ -636,43 +644,39 @@ let _octez_stdlib_test_unix = ] let octez_lwt_result_stdlib_bare_functor_outputs = - public_lib + octez_lib "tezos-lwt-result-stdlib.bare.functor-outputs" ~path:"src/lib_lwt_result_stdlib/bare/functor_outputs" ~internal_name:"bare_functor_outputs" ~js_compatible:true ~deps:[lwt] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_bare_sigs = - public_lib + octez_lib "tezos-lwt-result-stdlib.bare.sigs" ~path:"src/lib_lwt_result_stdlib/bare/sigs" ~internal_name:"bare_sigs" ~js_compatible:true ~deps:[seqes; lwt; octez_lwt_result_stdlib_bare_functor_outputs] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_bare_structs = - public_lib + octez_lib "tezos-lwt-result-stdlib.bare.structs" ~path:"src/lib_lwt_result_stdlib/bare/structs" ~internal_name:"bare_structs" ~js_compatible:true ~deps:[seqes; lwt; octez_lwt_result_stdlib_bare_sigs] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_traced_functor_outputs = - public_lib + octez_lib "tezos-lwt-result-stdlib.traced.functor-outputs" ~path:"src/lib_lwt_result_stdlib/traced/functor_outputs" ~internal_name:"traced_functor_outputs" ~js_compatible:true ~deps:[lwt; octez_lwt_result_stdlib_bare_sigs] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_traced_sigs = - public_lib + octez_lib "tezos-lwt-result-stdlib.traced.sigs" ~path:"src/lib_lwt_result_stdlib/traced/sigs" ~internal_name:"traced_sigs" @@ -684,10 +688,9 @@ let octez_lwt_result_stdlib_traced_sigs = octez_lwt_result_stdlib_bare_structs; octez_lwt_result_stdlib_traced_functor_outputs; ] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_traced_structs = - public_lib + octez_lib "tezos-lwt-result-stdlib.traced.structs" ~path:"src/lib_lwt_result_stdlib/traced/structs" ~internal_name:"traced_structs" @@ -698,15 +701,19 @@ let octez_lwt_result_stdlib_traced_structs = octez_lwt_result_stdlib_traced_sigs; octez_lwt_result_stdlib_bare_structs; ] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib = - public_lib + octez_lib "tezos-lwt-result-stdlib" ~path:"src/lib_lwt_result_stdlib" ~synopsis:"Tezos: error-aware stdlib replacement" ~js_compatible:true - ~documentation:[Dune.[S "package"; S "tezos-lwt-result-stdlib"]] + ~documentation: + Dune. + [ + [S "package"; S "octez-libs"]; + [S "mld_files"; S "tezos_lwt_result_stdlib"]; + ] ~deps: [ lwt; @@ -715,10 +722,9 @@ let octez_lwt_result_stdlib = octez_lwt_result_stdlib_traced_sigs; octez_lwt_result_stdlib_traced_structs; ] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_examples_traces = - public_lib + octez_lib "tezos-lwt-result-stdlib.examples.traces" ~path:"src/lib_lwt_result_stdlib/examples/traces" ~internal_name:"traces" @@ -728,7 +734,6 @@ let octez_lwt_result_stdlib_examples_traces = octez_lwt_result_stdlib_bare_structs; octez_lwt_result_stdlib_traced_sigs; ] - ~opam_with_test:Only_on_64_arch let _octez_lwt_result_stdlib_tests = tezt @@ -746,7 +751,7 @@ let _octez_lwt_result_stdlib_tests = "test_fuzzing_map_against_stdlib"; ] ~path:"src/lib_lwt_result_stdlib/test" - ~opam:"tezos-lwt-result-stdlib" + ~opam:"octez-libs" ~deps: [ octez_lwt_result_stdlib |> open_; @@ -756,7 +761,7 @@ let _octez_lwt_result_stdlib_tests = qcheck_alcotest; octez_test_helpers |> open_; ] - ~opam_with_test:Only_on_64_arch + ~dune_with_test:Only_on_64_arch let octez_error_monad = octez_lib diff --git a/manifest/manifest.ml b/manifest/manifest.ml index a61c54f4364eaba52caf0b9b71951b907c14198e..f5f0163f72e32011b2d008206a787d98a79f8035 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -89,6 +89,8 @@ module Dune = struct names : string list; } + let dand s1 s2 = S "and" :: s1 :: s2 + (* Test whether an s-expression is empty. *) let rec is_empty = function | E -> true @@ -1732,13 +1734,29 @@ module Target = struct | head :: tail -> Private_executable (head, tail) let test ?(alias = "runtest") ?dep_files ?dep_globs ?dep_globs_rec ?locks - ?enabled_if ?(lib_deps = []) = + ?enabled_if ?(dune_with_test = Always) ?(lib_deps = []) = (match (alias, enabled_if, locks) with | "", Some _, _ | "", _, Some _ -> invalid_arg "Target.tests: cannot specify enabled_if or locks without alias" | _ -> ()) ; - let runtest_alias = if alias = "" then None else Some alias in + (* Ensures that there is an alias in case there is test constraint *) + let runtest_alias = + if alias = "" then + match dune_with_test with Always -> None | _ -> Some "runtest" + else Some alias + in + let enabled_if = + match dune_with_test with + | Always -> enabled_if + | Only_on_64_arch -> ( + let enabled_if_dune_with_test = Dune.(S "%{arch_sixtyfour}") in + match enabled_if with + | Some enabled_if -> + Some Dune.(dand enabled_if_dune_with_test [enabled_if]) + | None -> Some enabled_if_dune_with_test) + | Never -> Some Dune.(S "false") + in internal ?dep_files ?dep_globs ?dep_globs_rec @@ fun test_name -> Test_executable {names = (test_name, []); runtest_alias; locks; enabled_if; lib_deps} @@ -1885,6 +1903,7 @@ type tezt_target = { modes : Dune.mode list option; synopsis : string option; opam_with_test : with_test option; + dune_with_test : with_test option; with_macos_security_framework : bool; flags : Flags.t option; dune : Dune.s_expr; @@ -1897,8 +1916,9 @@ let tezt_targets_by_path : tezt_target String_map.t ref = ref String_map.empty let tezt ~opam ~path ?js_compatible ?modes ?(lib_deps = []) ?(exe_deps = []) ?(js_deps = []) ?(dep_globs = []) ?(dep_globs_rec = []) ?(dep_files = []) - ?synopsis ?opam_with_test ?(with_macos_security_framework = false) ?flags - ?(dune = Dune.[]) ?(preprocess = []) ?(preprocessor_deps = []) modules = + ?synopsis ?opam_with_test ?dune_with_test + ?(with_macos_security_framework = false) ?flags ?(dune = Dune.[]) + ?(preprocess = []) ?(preprocessor_deps = []) modules = if String_map.mem path !tezt_targets_by_path then invalid_arg ("cannot call Manifest.tezt twice for the same directory: " ^ path) ; @@ -1934,6 +1954,7 @@ let tezt ~opam ~path ?js_compatible ?modes ?(lib_deps = []) ?(exe_deps = []) modes; synopsis; opam_with_test; + dune_with_test; with_macos_security_framework; flags; dune; @@ -1958,6 +1979,7 @@ let register_tezt_targets ~make_tezt_exe = modes; synopsis; opam_with_test; + dune_with_test; with_macos_security_framework; flags; tezt_local_test_lib; @@ -1995,6 +2017,7 @@ let register_tezt_targets ~make_tezt_exe = ~dep_files ~modules:[exe_name] ?opam_with_test + ?dune_with_test ~preprocess ~preprocessor_deps ?flags diff --git a/manifest/manifest.mli b/manifest/manifest.mli index 56c455f25ded4c8c650a9e4acf2952286d9baceb..761c44377c2c4a3f96e98a955f41eeefb3a3cda5 100644 --- a/manifest/manifest.mli +++ b/manifest/manifest.mli @@ -925,6 +925,15 @@ val private_exes : string list maker - [dep_globs_rec]: a list of files to add as dependencies using [(deps (glob_files_rec ...))] in the [dune] file. + - [dune_with_test]: Specifies a condition for the test to be run on the dune file. + If set to [Only_on_64_arch], [%{arch_sixtyfour}] is added to the [enabled_if] clause. + If set to [Always], nothing is added to the [enabled_if] clause. + If set to [Never], [false] is added to the [enabled_if] clause. + + - [enabled_if]: add a custom [enabled_if] clause. If both [dune_with_test] and + [enabled_if] are set, then logically, the resulting clause is the conjunction + of the two (i.e. [(and )]) + Since tests are private, they have no public name: the ['a] argument of [maker] is the internal name. *) val test : @@ -934,6 +943,7 @@ val test : ?dep_globs_rec:string list -> ?locks:string -> ?enabled_if:Dune.s_expr -> + ?dune_with_test:with_test -> ?lib_deps:target list -> string maker @@ -988,6 +998,7 @@ val tezt : ?dep_files:string list -> ?synopsis:string -> ?opam_with_test:with_test -> + ?dune_with_test:with_test -> ?with_macos_security_framework:bool -> ?flags:Flags.t -> ?dune:Dune.s_expr -> diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index 26f6a0a39e6fd5c4b69df186ab787949f9ba9b36..ee1e5de84ddb973922e4c06f968ae25db70fb2e8 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -16,9 +16,9 @@ depends: [ "zarith_stubs_js" "lwt" { >= "5.6.0" } "aches" { >= "1.0.0" } + "seqes" { >= "0.2" } "data-encoding" { >= "0.7.1" & < "1.0.0" } "lwt-canceler" { >= "0.3" & < "0.4" } - "tezos-lwt-result-stdlib" "hacl-star" { >= "0.7.1" & < "0.8" } "hacl-star-raw" "ctypes_stubs_js" diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam index 714fa6148f294e93764fd3ce3cc4ca6b6169e734..0dda5d27b955a0f611456b195f35e44fe09728c1 100644 --- a/opam/tezos-clic.opam +++ b/opam/tezos-clic.opam @@ -13,7 +13,6 @@ depends: [ "octez-libs" "lwt" { >= "5.6.0" } "re" { >= "1.9.0" } - "tezos-lwt-result-stdlib" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-lwt-result-stdlib.opam b/opam/tezos-lwt-result-stdlib.opam deleted file mode 100644 index de226728c41a8d8306109e3f6be24a38576ff3d3..0000000000000000000000000000000000000000 --- a/opam/tezos-lwt-result-stdlib.opam +++ /dev/null @@ -1,25 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "lwt" { >= "5.6.0" } - "seqes" { >= "0.2" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-test-helpers" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] { with-test & arch != "arm32" & arch != "x86_32" } -] -synopsis: "Tezos: error-aware stdlib replacement" diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam index 7ab209f8c466d674faec39c1ce3ddfe9f31d7224..f82432179e3ce1b085b9e41fbdde45edc278e7b4 100644 --- a/opam/tezos-protocol-environment.opam +++ b/opam/tezos-protocol-environment.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14.0" & < "4.15" } "octez-libs" - "tezos-lwt-result-stdlib" "tezos-scoru-wasm" "data-encoding" { >= "0.7.1" & < "1.0.0" } "bls12-381" diff --git a/opam/tezos-sapling.opam b/opam/tezos-sapling.opam index fae7a094177a1333dbe8dd2b9863a6f9cec96f99..9f4a253f6905c08dab378c494583de4b28e76609 100644 --- a/opam/tezos-sapling.opam +++ b/opam/tezos-sapling.opam @@ -19,7 +19,6 @@ depends: [ "octez-libs" "tezos-rust-libs" { = "1.6" } "tezos-sapling-parameters" { >= "1.1.0" } - "tezos-lwt-result-stdlib" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-scoru-wasm.opam b/opam/tezos-scoru-wasm.opam index 7394a1522898cc2af41486d22632a69b4b3df697..212fdba185a0e04e94af29bd6577efc59b21e8e5 100644 --- a/opam/tezos-scoru-wasm.opam +++ b/opam/tezos-scoru-wasm.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-webassembly-interpreter" - "tezos-lwt-result-stdlib" "data-encoding" { >= "0.7.1" & < "1.0.0" } ] build: [ diff --git a/opam/tezos-webassembly-interpreter.opam b/opam/tezos-webassembly-interpreter.opam index 0dfd13f883b450a334cf401e4aa9b57f0014eed4..7d387ab83f4b43c715c3ce05ad93fb77ab7fd1e2 100644 --- a/opam/tezos-webassembly-interpreter.opam +++ b/opam/tezos-webassembly-interpreter.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_deriving" - "tezos-lwt-result-stdlib" "octez-libs" "zarith" { >= "1.12" & < "1.13" } "tezt" { with-test & >= "3.1.1" } diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index 35aac0b6aebf3a687a6e3583e8c7920693e834a4..e397cdbe3a1f16d30d3722f501739682a3a64ded 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -4,6 +4,9 @@ This is a package containing some libraries used by the Octez project. It contains the following libraries: +- {{!module-Bare_functor_outputs}Bare_functor_outputs} +- {{!module-Bare_sigs}Bare_sigs} +- {{!module-Bare_structs}Bare_structs} - {{!module-Octez_bls12_381_polynomial}Octez_bls12_381_polynomial} - {{!module-Polynomial}Polynomial} - {{!module-Tezos_base}Tezos_base} @@ -26,6 +29,7 @@ It contains the following libraries: - {{!module-Tezos_event_logging_test_helpers}Tezos_event_logging_test_helpers} - {{!module-Tezos_hacl}Tezos_hacl} - {{!module-Tezos_lazy_containers}Tezos_lazy_containers} +- {{!page-tezos_lwt_result_stdlib}Tezos_lwt_result_stdlib} - {{!module-Tezos_micheline}Tezos_micheline} - {{!module-Tezos_p2p}Tezos_p2p} - {{!module-Tezos_p2p_services}Tezos_p2p_services} @@ -41,5 +45,9 @@ It contains the following libraries: - {{!module-Tezos_tree_encoding}Tezos_tree_encoding} - {{!module-Tezos_version}Tezos_version} - {{!module-Tezos_version_parser}Tezos_version_parser} +- {{!page-tezos_workers}Tezos_workers} - {{!module-Tezt_tezos}Tezt_tezos} -- {{!page-tezos_workers}tezos_workers} \ No newline at end of file +- {{!module-Traced_functor_outputs}Traced_functor_outputs} +- {{!module-Traced_sigs}Traced_sigs} +- {{!module-Traced_structs}Traced_structs} +- {{!module-Traces}Traces} \ No newline at end of file diff --git a/src/lib_clic/dune b/src/lib_clic/dune index 1a24ebea0565d739945517ecfa8c6efc3a5992b3..a5fb8c9a1d956eee1283e54ec4d1976152d8159b 100644 --- a/src/lib_clic/dune +++ b/src/lib_clic/dune @@ -10,7 +10,7 @@ lwt re octez-libs.tezos-error-monad - tezos-lwt-result-stdlib) + octez-libs.tezos-lwt-result-stdlib) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_clic/unix/dune b/src/lib_clic/unix/dune index 72974a49f862778c65617e31b70fe35378f69a39..031908b96c77bb11c9a089c095524072f4f4fa8e 100644 --- a/src/lib_clic/unix/dune +++ b/src/lib_clic/unix/dune @@ -10,7 +10,7 @@ tezos-clic octez-libs.tezos-stdlib-unix octez-libs.tezos-error-monad - tezos-lwt-result-stdlib) + octez-libs.tezos-lwt-result-stdlib) (flags (:standard) -open Tezos_stdlib diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune index 47777450266f6100f44a8a19c59325d501f56052..263602fed010bf79d9ac62c1c1878086f1e90d78 100644 --- a/src/lib_crypto/dune +++ b/src/lib_crypto/dune @@ -10,7 +10,7 @@ (libraries octez-libs.tezos-stdlib data-encoding - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib lwt octez-libs.tezos-hacl secp256k1-internal diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune index 55c6e26e1ebbe1ec5d5b3f51295e9c7d3f8e7e5a..25c0e1dc5ff3c901ab7ef7337f351ae91167751a 100644 --- a/src/lib_error_monad/dune +++ b/src/lib_error_monad/dune @@ -10,7 +10,7 @@ data-encoding lwt-canceler lwt - tezos-lwt-result-stdlib) + octez-libs.tezos-lwt-result-stdlib) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_event_logging/dune b/src/lib_event_logging/dune index a6a51551fa92dd563cd7249a7882d378a081e180..72eb70f0b244df51d40c93845d4432c7d849a31e 100644 --- a/src/lib_event_logging/dune +++ b/src/lib_event_logging/dune @@ -9,7 +9,7 @@ octez-libs.tezos-stdlib data-encoding octez-libs.tezos-error-monad - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib uri) (js_of_ocaml) (flags diff --git a/src/lib_event_logging/test_helpers/dune b/src/lib_event_logging/test_helpers/dune index 4e7c08bb3e8ca7e091ba8e6ed10ab394d7ab51e5..d1edc19bdf770002dd35883cb25af3801e687357 100644 --- a/src/lib_event_logging/test_helpers/dune +++ b/src/lib_event_logging/test_helpers/dune @@ -6,7 +6,7 @@ (public_name octez-libs.tezos-event-logging-test-helpers) (libraries octez-libs.tezos-stdlib - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib data-encoding octez-libs.tezos-error-monad octez-libs.tezos-event-logging diff --git a/src/lib_hacl/test/dune b/src/lib_hacl/test/dune index 2ca3980c1ef2e7cf042a63ddaac860d4241b249c..1d3da7d2134374711bddbdd5aef1782243bd4eb3 100644 --- a/src/lib_hacl/test/dune +++ b/src/lib_hacl/test/dune @@ -10,7 +10,7 @@ tezt.core octez-libs.tezos-stdlib octez-libs.tezos-error-monad - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib zarith zarith_stubs_js data-encoding diff --git a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune index 94cbb784456bfb07344439f5ce80b0cbb46f7a69..eca2e26415efbecfddba65e3c6990e78f260a932 100644 --- a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune @@ -3,7 +3,7 @@ (library (name bare_functor_outputs) - (public_name tezos-lwt-result-stdlib.bare.functor-outputs) + (public_name octez-libs.tezos-lwt-result-stdlib.bare.functor-outputs) (instrumentation (backend bisect_ppx)) (libraries lwt) diff --git a/src/lib_lwt_result_stdlib/bare/sigs/dune b/src/lib_lwt_result_stdlib/bare/sigs/dune index 4b2eb3666b10ec892990482bd5446b5a3bd5dbae..38a5e298ca6db1b31cf276eaa07b5044505df009 100644 --- a/src/lib_lwt_result_stdlib/bare/sigs/dune +++ b/src/lib_lwt_result_stdlib/bare/sigs/dune @@ -3,10 +3,10 @@ (library (name bare_sigs) - (public_name tezos-lwt-result-stdlib.bare.sigs) + (public_name octez-libs.tezos-lwt-result-stdlib.bare.sigs) (instrumentation (backend bisect_ppx)) (libraries seqes lwt - tezos-lwt-result-stdlib.bare.functor-outputs) + octez-libs.tezos-lwt-result-stdlib.bare.functor-outputs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/bare/structs/dune b/src/lib_lwt_result_stdlib/bare/structs/dune index ba667d43a85c80e49fbc12b7afa50b0c4d1850bf..711ccc12cb5a713a881b7bf9105b38f55533c59f 100644 --- a/src/lib_lwt_result_stdlib/bare/structs/dune +++ b/src/lib_lwt_result_stdlib/bare/structs/dune @@ -3,10 +3,10 @@ (library (name bare_structs) - (public_name tezos-lwt-result-stdlib.bare.structs) + (public_name octez-libs.tezos-lwt-result-stdlib.bare.structs) (instrumentation (backend bisect_ppx)) (libraries seqes lwt - tezos-lwt-result-stdlib.bare.sigs) + octez-libs.tezos-lwt-result-stdlib.bare.sigs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/dune b/src/lib_lwt_result_stdlib/dune index f78603486b82c7b25105c5c657563dda5c8986ba..d7891ab8aa918135fb9c38e492dbef611e434246 100644 --- a/src/lib_lwt_result_stdlib/dune +++ b/src/lib_lwt_result_stdlib/dune @@ -3,14 +3,14 @@ (library (name tezos_lwt_result_stdlib) - (public_name tezos-lwt-result-stdlib) + (public_name octez-libs.tezos-lwt-result-stdlib) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.bare.sigs - tezos-lwt-result-stdlib.bare.structs - tezos-lwt-result-stdlib.traced.sigs - tezos-lwt-result-stdlib.traced.structs) + octez-libs.tezos-lwt-result-stdlib.bare.sigs + octez-libs.tezos-lwt-result-stdlib.bare.structs + octez-libs.tezos-lwt-result-stdlib.traced.sigs + octez-libs.tezos-lwt-result-stdlib.traced.structs) (js_of_ocaml)) -(documentation (package tezos-lwt-result-stdlib)) +(documentation (package octez-libs) (mld_files tezos_lwt_result_stdlib)) diff --git a/src/lib_lwt_result_stdlib/examples/traces/dune b/src/lib_lwt_result_stdlib/examples/traces/dune index 6b61c718e119e5d5f87b2c6f75653c917cad049a..f77cf6ff11f9d662f5defb0039f12091e87f2da9 100644 --- a/src/lib_lwt_result_stdlib/examples/traces/dune +++ b/src/lib_lwt_result_stdlib/examples/traces/dune @@ -3,9 +3,9 @@ (library (name traces) - (public_name tezos-lwt-result-stdlib.examples.traces) + (public_name octez-libs.tezos-lwt-result-stdlib.examples.traces) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.bare.structs - tezos-lwt-result-stdlib.traced.sigs)) + octez-libs.tezos-lwt-result-stdlib.bare.structs + octez-libs.tezos-lwt-result-stdlib.traced.sigs)) diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune index 3ecf4d8d1376132169a8b8db5d4fb0c01c5177ff..59f2b489105c8d4a7264f6dd5b860520ada79270 100644 --- a/src/lib_lwt_result_stdlib/test/dune +++ b/src/lib_lwt_result_stdlib/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-lwt-result-stdlib - tezos-lwt-result-stdlib.examples.traces + octez-libs.tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib.examples.traces lwt.unix octez-alcotezt qcheck-alcotest @@ -43,8 +43,8 @@ (rule (alias runtest) - (package tezos-lwt-result-stdlib) - (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (package octez-libs) + (enabled_if (and %{arch_sixtyfour} (<> false %{env:RUNTEZTALIAS=true}))) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_lwt_result_stdlib/index.mld b/src/lib_lwt_result_stdlib/tezos_lwt_result_stdlib.mld similarity index 100% rename from src/lib_lwt_result_stdlib/index.mld rename to src/lib_lwt_result_stdlib/tezos_lwt_result_stdlib.mld diff --git a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune index b2d25e4f43e6528b209ff03429fc54102859fc82..d4fb0e8ba29e0bb30a78b7bf3ff326505a206448 100644 --- a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune @@ -3,9 +3,9 @@ (library (name traced_functor_outputs) - (public_name tezos-lwt-result-stdlib.traced.functor-outputs) + (public_name octez-libs.tezos-lwt-result-stdlib.traced.functor-outputs) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.bare.sigs) + octez-libs.tezos-lwt-result-stdlib.bare.sigs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/traced/sigs/dune b/src/lib_lwt_result_stdlib/traced/sigs/dune index 2ca0ef41c25d882b214e95e3db6dd8780d038298..9504b8d93b3a355ecce8182e253516f05a85371e 100644 --- a/src/lib_lwt_result_stdlib/traced/sigs/dune +++ b/src/lib_lwt_result_stdlib/traced/sigs/dune @@ -3,11 +3,11 @@ (library (name traced_sigs) - (public_name tezos-lwt-result-stdlib.traced.sigs) + (public_name octez-libs.tezos-lwt-result-stdlib.traced.sigs) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.bare.sigs - tezos-lwt-result-stdlib.bare.structs - tezos-lwt-result-stdlib.traced.functor-outputs) + octez-libs.tezos-lwt-result-stdlib.bare.sigs + octez-libs.tezos-lwt-result-stdlib.bare.structs + octez-libs.tezos-lwt-result-stdlib.traced.functor-outputs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/traced/structs/dune b/src/lib_lwt_result_stdlib/traced/structs/dune index 2e8ce184357b0cecf2d47fc702d8525354c93328..de70664091f6257c4443fe5e0f398b6fd75ab967 100644 --- a/src/lib_lwt_result_stdlib/traced/structs/dune +++ b/src/lib_lwt_result_stdlib/traced/structs/dune @@ -3,10 +3,10 @@ (library (name traced_structs) - (public_name tezos-lwt-result-stdlib.traced.structs) + (public_name octez-libs.tezos-lwt-result-stdlib.traced.structs) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.traced.sigs - tezos-lwt-result-stdlib.bare.structs) + octez-libs.tezos-lwt-result-stdlib.traced.sigs + octez-libs.tezos-lwt-result-stdlib.bare.structs) (js_of_ocaml)) diff --git a/src/lib_protocol_environment/structs/dune b/src/lib_protocol_environment/structs/dune index 89faa5889dcd0203808b1cdb418a4f73cf73cd7c..86086e65fad2a2d0aadbb0dd8e88086143e00d04 100644 --- a/src/lib_protocol_environment/structs/dune +++ b/src/lib_protocol_environment/structs/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-stdlib octez-libs.tezos-crypto - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib tezos-scoru-wasm data-encoding bls12-381 diff --git a/src/lib_sapling/dune b/src/lib_sapling/dune index 57e893d7b0121ca3b72d410211a0337207f9f331..4ae456eb0054ee0984d40dd03cf76a8e67558a43 100644 --- a/src/lib_sapling/dune +++ b/src/lib_sapling/dune @@ -16,7 +16,7 @@ octez-libs.tezos-stdlib octez-libs.tezos-crypto octez-libs.tezos-error-monad - tezos-lwt-result-stdlib) + octez-libs.tezos-lwt-result-stdlib) (js_of_ocaml (javascript_files runtime.js)) (flags (:standard) diff --git a/src/lib_scoru_wasm/dune b/src/lib_scoru_wasm/dune index 3567d4ac5af8959462f003e2659f502ad464b596..e8dd3b586f0c2a3fe2a0fbb3668f7b1112889631 100644 --- a/src/lib_scoru_wasm/dune +++ b/src/lib_scoru_wasm/dune @@ -12,7 +12,7 @@ tezos-webassembly-interpreter octez-libs.tezos-context.sigs octez-libs.tezos-context.memory - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib data-encoding) (flags (:standard) diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune index 49e72a48763380121aea717686eb83fe2beeac0c..ac9959436ad308b5d0193ea20c183f52234719f8 100644 --- a/src/lib_stdlib_unix/dune +++ b/src/lib_stdlib_unix/dune @@ -8,7 +8,7 @@ (libraries unix octez-libs.tezos-error-monad - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib octez-libs.tezos-event-logging octez-libs.tezos-stdlib data-encoding diff --git a/src/lib_tree_encoding/dune b/src/lib_tree_encoding/dune index 0378e2499a31250d8b1dedb1fdaf21f9cde37b05..8aa81d6d23193ddb3ef44f708da0bb7bcf947484 100644 --- a/src/lib_tree_encoding/dune +++ b/src/lib_tree_encoding/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-context.sigs - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib data-encoding) (flags (:standard) diff --git a/src/lib_webassembly/dune b/src/lib_webassembly/dune index cfa8f6c9a0aa84d2215bb306f1cb97aba5473670..84e48184623fdfd9b47f19654b62e8eaccc46341 100644 --- a/src/lib_webassembly/dune +++ b/src/lib_webassembly/dune @@ -6,7 +6,7 @@ (public_name tezos-webassembly-interpreter) (instrumentation (backend bisect_ppx)) (libraries - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib octez-libs.tezos-stdlib octez-libs.tezos-error-monad zarith diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index e7b63f67dba29197779aa0badd3f26896077823f..33970e6813f586cffe533861ebc1d7b572b866e1 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -3,7 +3,7 @@ (libraries tezt octez-libs.tezt-tezos tezt-performance-regression - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib tezos-alpha-test-helpers octez-libs.tezos-micheline tezos-openapi