From 668d778108c9a35c92af61f5169283d25a1544f8 Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Thu, 2 Sep 2021 17:03:17 +0200 Subject: [PATCH] Build: manifest-generated lib_crypto, lib_error_monad, lib_rpc, lib_hacl_glue --- src/lib_base/tezos-base.opam | 1 + src/lib_crypto/dune | 39 ++-- src/lib_crypto/test/dune | 210 ++---------------- .../js/alcotest-glue-js.opam | 14 +- src/lib_crypto/test/lib_alcotest_glue/js/dune | 8 +- .../unix/alcotest-glue-unix.opam | 14 +- .../test/lib_alcotest_glue/unix/dune | 3 +- .../virtual/alcotest-glue.opam | 10 +- .../test/lib_alcotest_glue/virtual/dune | 9 +- src/lib_crypto/tezos-crypto.opam | 23 +- src/lib_error_monad/dune | 18 +- src/lib_error_monad/test/dune | 9 +- src/lib_error_monad/tezos-error-monad.opam | 4 +- src/lib_hacl_glue/js/hacl-star-raw-empty.opam | 7 +- src/lib_hacl_glue/js/src/dune | 31 +-- src/lib_hacl_glue/js/test/dune | 19 +- src/lib_hacl_glue/js/tezos-hacl-glue-js.opam | 13 +- src/lib_hacl_glue/unix/dune | 9 +- .../unix/tezos-hacl-glue-unix.opam | 10 +- src/lib_hacl_glue/virtual/dune | 7 +- .../virtual/tezos-hacl-glue.opam | 7 +- src/lib_rpc/dune | 10 +- src/lib_rpc/tezos-rpc.opam | 4 +- 23 files changed, 150 insertions(+), 329 deletions(-) diff --git a/src/lib_base/tezos-base.opam b/src/lib_base/tezos-base.opam index eb7e34abbf5b..a88906a00128 100644 --- a/src/lib_base/tezos-base.opam +++ b/src/lib_base/tezos-base.opam @@ -16,6 +16,7 @@ depends: [ "tezos-event-logging" "tezos-micheline" "tezos-rpc" + "tezos-clic" "ptime" { >= "0.8.4" } "ezjsonm" { >= "0.5.0" } "ipaddr" {>= "5.0.0" & < "6.0.0"} diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune index 94256ee9be78..dc5d9f813503 100644 --- a/src/lib_crypto/dune +++ b/src/lib_crypto/dune @@ -1,21 +1,24 @@ (library (name tezos_crypto) - (instrumentation (backend bisect_ppx)) (public_name tezos-crypto) - (flags (:standard -open Tezos_stdlib - -open Data_encoding - -open Tezos_error_monad - -open Tezos_error_monad.TzLwtreslib - -open Tezos_rpc)) - (libraries data-encoding - tezos-lwt-result-stdlib - lwt - ; NOTE: tezos-*-glue are virtual packages - ; either the unix or js implementation must be installed - tezos-hacl-glue - secp256k1-internal - tezos-error-monad - tezos-rpc - tezos-stdlib - ringo - zarith)) + (instrumentation (backend bisect_ppx)) + (libraries + data-encoding + tezos-lwt-result-stdlib + lwt + ; NOTE: tezos_*_glue are virtual packages; + ; either the unix or js implementation must be installed + tezos-hacl-glue + secp256k1-internal + tezos-error-monad + tezos-rpc + tezos-stdlib + ringo + zarith) + (flags + (:standard + -open Tezos_stdlib + -open Data_encoding + -open Tezos_error_monad + -open Tezos_error_monad.TzLwtreslib + -open Tezos_rpc))) diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune index e01225e5e423..48fc2a131c7e 100644 --- a/src/lib_crypto/test/dune +++ b/src/lib_crypto/test/dune @@ -1,190 +1,24 @@ - -(library - (name key_encoding_vectors_lib) - (modules key_encoding_vectors) -) - -(library - (name roundtrips_lib) - (modules roundtrips) - (libraries alcotest-glue) -) - -(library - (name test_crypto_tests) - (modules) - (libraries key_encoding_vectors_lib - roundtrips_lib - tezos-crypto - tezos-stdlib - alcotest-glue - zarith - ) - ) - -(library - (name test_crypto_box) - (modules test_crypto_box) - (libraries test_crypto_tests) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_base58) - (modules test_base58) - (libraries test_crypto_tests) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_blake2b) - (modules test_blake2b) - (libraries test_crypto_tests roundtrips_lib) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_deterministic_nonce) - (modules test_deterministic_nonce) - (libraries test_crypto_tests roundtrips_lib) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_ed25519) - (modules test_ed25519) - (libraries test_crypto_tests roundtrips_lib) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Key_encoding_vectors_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_hacl) - (modules test_hacl vectors_p256) - (libraries test_crypto_tests roundtrips_lib) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Key_encoding_vectors_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_merkle) - (modules test_merkle) - (libraries test_crypto_tests roundtrips_lib) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Key_encoding_vectors_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_p256) - (modules test_p256) - (libraries test_crypto_tests roundtrips_lib) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Key_encoding_vectors_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_pvss) - (modules test_pvss) - (libraries test_crypto_tests roundtrips_lib) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Key_encoding_vectors_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_signature) - (modules test_signature) - (libraries test_crypto_tests roundtrips_lib) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Key_encoding_vectors_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_timelock) - (modules test_timelock) - (libraries test_crypto_tests roundtrips_lib) - (flags (:standard -open Tezos_stdlib - -open Roundtrips_lib - -open Key_encoding_vectors_lib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding)) - ) - -(library - (name test_context_hash) - (modules test_context_hash) - (libraries test_crypto_tests) - (flags (:standard -open Tezos_stdlib - -open Tezos_crypto)) - ) - (tests - (names test_run - test_prop_signature_pk - test_prop_signature - test_prop_hacl_hash - ) - (modules test_run test_prop_signature_pk test_prop_signature test_prop_hacl_hash) - (libraries test_crypto_box - test_base58 - test_blake2b - test_deterministic_nonce - test_ed25519 - test_hacl - test_merkle - test_p256 - test_pvss - test_signature - test_timelock - test_context_hash - tezos-hacl-glue-unix - data-encoding - alcotest-glue-unix - alcotest-lwt - qcheck-alcotest - tezos-test-helpers) + (names + test_run + test_prop_signature_pk + test_prop_signature + test_prop_hacl_hash) (package tezos-crypto) - (flags (:standard -open Tezos_stdlib - -open Tezos_crypto - -open Tezos_error_monad.TzLwtreslib - -open Data_encoding))) + (libraries + tezos-crypto + tezos-stdlib + alcotest-glue + zarith + tezos-hacl-glue-unix + data-encoding + alcotest-glue-unix + alcotest-lwt + qcheck-alcotest + tezos-test-helpers) + (flags + (:standard + -open Tezos_stdlib + -open Tezos_crypto + -open Tezos_error_monad.TzLwtreslib + -open Data_encoding))) diff --git a/src/lib_crypto/test/lib_alcotest_glue/js/alcotest-glue-js.opam b/src/lib_crypto/test/lib_alcotest_glue/js/alcotest-glue-js.opam index 99c8536890f1..f844b4ac0143 100644 --- a/src/lib_crypto/test/lib_alcotest_glue/js/alcotest-glue-js.opam +++ b/src/lib_crypto/test/lib_alcotest_glue/js/alcotest-glue-js.opam @@ -1,15 +1,19 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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" { >= "1.11" } - "fmt" - "js_of_ocaml" + "dune" { >= "2.0" } + "js_of_ocaml-ppx" "alcotest-glue" + "js_of_ocaml" + "fmt" +] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -build: [["dune" "build" "-p" name "-j" jobs]] synopsis: "Tezos: thin layer of glue around alcotest (js implementation)" diff --git a/src/lib_crypto/test/lib_alcotest_glue/js/dune b/src/lib_crypto/test/lib_alcotest_glue/js/dune index badec1110125..9f25f7c2d563 100644 --- a/src/lib_crypto/test/lib_alcotest_glue/js/dune +++ b/src/lib_crypto/test/lib_alcotest_glue/js/dune @@ -2,9 +2,5 @@ (name alcotest_glue_js) (public_name alcotest-glue-js) (implements alcotest-glue) - (preprocess (pps js_of_ocaml-ppx)) - (libraries - js_of_ocaml - js_of_ocaml-compiler - fmt) -) + (libraries js_of_ocaml js_of_ocaml-compiler fmt) + (preprocess (pps js_of_ocaml-ppx))) diff --git a/src/lib_crypto/test/lib_alcotest_glue/unix/alcotest-glue-unix.opam b/src/lib_crypto/test/lib_alcotest_glue/unix/alcotest-glue-unix.opam index 1f8920ce3ddc..fd130ef5fbfc 100644 --- a/src/lib_crypto/test/lib_alcotest_glue/unix/alcotest-glue-unix.opam +++ b/src/lib_crypto/test/lib_alcotest_glue/unix/alcotest-glue-unix.opam @@ -1,15 +1,17 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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" { >= "1.11" } - "fmt" - "alcotest" + "dune" { >= "2.0" } "alcotest-glue" + "alcotest" { >= "1.1.0" } ] -build: [["dune" "build" "-p" name "-j" jobs]] -synopsis: "Tezos: thin layer of glue around alcotest ( unix implementation )" +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Tezos: thin layer of glue around alcotest (unix implementation)" diff --git a/src/lib_crypto/test/lib_alcotest_glue/unix/dune b/src/lib_crypto/test/lib_alcotest_glue/unix/dune index 8c9eb147ae4c..20cdc1f50700 100644 --- a/src/lib_crypto/test/lib_alcotest_glue/unix/dune +++ b/src/lib_crypto/test/lib_alcotest_glue/unix/dune @@ -2,5 +2,4 @@ (name alcotest_glue_unix) (public_name alcotest-glue-unix) (implements alcotest-glue) - (libraries alcotest) -) + (libraries alcotest)) diff --git a/src/lib_crypto/test/lib_alcotest_glue/virtual/alcotest-glue.opam b/src/lib_crypto/test/lib_alcotest_glue/virtual/alcotest-glue.opam index df35c2019996..7148885e7e05 100644 --- a/src/lib_crypto/test/lib_alcotest_glue/virtual/alcotest-glue.opam +++ b/src/lib_crypto/test/lib_alcotest_glue/virtual/alcotest-glue.opam @@ -1,13 +1,17 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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" { >= "1.11" } + "dune" { >= "2.0" } "fmt" + "re" { >= "1.7.2" } +] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -build: [["dune" "build" "-p" name "-j" jobs]] synopsis: "Tezos: thin layer of glue around alcotest" diff --git a/src/lib_crypto/test/lib_alcotest_glue/virtual/dune b/src/lib_crypto/test/lib_alcotest_glue/virtual/dune index ceaf7546cb67..24e0fdadd842 100644 --- a/src/lib_crypto/test/lib_alcotest_glue/virtual/dune +++ b/src/lib_crypto/test/lib_alcotest_glue/virtual/dune @@ -1,6 +1,5 @@ (library - (name alcotest_glue) - (public_name alcotest-glue) - (virtual_modules alcotest_glue) - (libraries fmt re) -) + (name alcotest_glue) + (public_name alcotest-glue) + (libraries fmt re) + (virtual_modules alcotest_glue)) diff --git a/src/lib_crypto/tezos-crypto.opam b/src/lib_crypto/tezos-crypto.opam index bfaf295d3e97..999045c28cc7 100644 --- a/src/lib_crypto/tezos-crypto.opam +++ b/src/lib_crypto/tezos-crypto.opam @@ -1,29 +1,28 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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.0" } - "tezos-stdlib" "data-encoding" { >= "0.4" & < "0.5" } - "tezos-error-monad" "tezos-lwt-result-stdlib" - "tezos-rpc" - "tezos-clic" - "lwt" + "lwt" { >= "5.4.0" } "tezos-hacl-glue" - "tezos-hacl-glue-unix" {with-test} - "zarith" "secp256k1-internal" + "tezos-error-monad" + "tezos-rpc" + "tezos-stdlib" "ringo" { = "0.5" } - "qcheck-alcotest" { with-test } - "tezos-test-helpers" { with-test } + "zarith" { < "1.12" } + "alcotest-glue" {with-test} + "tezos-hacl-glue-unix" {with-test} + "alcotest-glue-unix" {with-test} "alcotest-lwt" { with-test & >= "1.1.0" } - "alcotest-glue" { with-test } - "alcotest-glue-unix" { with-test } + "qcheck-alcotest" {with-test} + "tezos-test-helpers" {with-test} ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune index ddef5447343e..f56969a92c0a 100644 --- a/src/lib_error_monad/dune +++ b/src/lib_error_monad/dune @@ -1,13 +1,11 @@ (library (name tezos_error_monad) - (instrumentation (backend bisect_ppx)) (public_name tezos-error-monad) - (flags (:standard -open Tezos_stdlib - -open Data_encoding - )) - (libraries tezos-stdlib - data-encoding - lwt-canceler - lwt - tezos-lwt-result-stdlib - )) + (instrumentation (backend bisect_ppx)) + (libraries + tezos-stdlib + data-encoding + lwt-canceler + lwt + tezos-lwt-result-stdlib) + (flags (:standard -open Tezos_stdlib -open Data_encoding))) diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune index 703cf3b95592..08a1bdb50403 100644 --- a/src/lib_error_monad/test/dune +++ b/src/lib_error_monad/test/dune @@ -1,8 +1,5 @@ -(tests - (names test_registration) - (libraries tezos-error-monad - data-encoding - lwt.unix - alcotest-lwt) +(test + (name test_registration) (package tezos-error-monad) + (libraries tezos-error-monad data-encoding lwt.unix alcotest-lwt) (flags (:standard -open Tezos_error_monad))) diff --git a/src/lib_error_monad/tezos-error-monad.opam b/src/lib_error_monad/tezos-error-monad.opam index 5cf303bd3bd1..0ee6a4e5408a 100644 --- a/src/lib_error_monad/tezos-error-monad.opam +++ b/src/lib_error_monad/tezos-error-monad.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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" @@ -10,8 +10,8 @@ depends: [ "ocaml" { >= "4.07" } "tezos-stdlib" "data-encoding" { >= "0.4" & < "0.5" } - "lwt" "lwt-canceler" { >= "0.3" & < "0.4" } + "lwt" { >= "5.4.0" } "tezos-lwt-result-stdlib" "alcotest-lwt" { with-test & >= "1.1.0" } ] diff --git a/src/lib_hacl_glue/js/hacl-star-raw-empty.opam b/src/lib_hacl_glue/js/hacl-star-raw-empty.opam index 79d14dd45f21..cfb99223e792 100644 --- a/src/lib_hacl_glue/js/hacl-star-raw-empty.opam +++ b/src/lib_hacl_glue/js/hacl-star-raw-empty.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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" @@ -8,5 +8,8 @@ license: "MIT" depends: [ "dune" { >= "2.0" } ] -build: [["dune" "build" "-p" name "-j" jobs]] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] synopsis: "Tezos: thin layer of glue around hacl-star (javascript version)" diff --git a/src/lib_hacl_glue/js/src/dune b/src/lib_hacl_glue/js/src/dune index f9992b997000..8f465e519cda 100644 --- a/src/lib_hacl_glue/js/src/dune +++ b/src/lib_hacl_glue/js/src/dune @@ -1,27 +1,16 @@ (library - (name tezos_hacl_glue_js) + (name hacl_star_raw_empty) + (public_name hacl-star-raw-empty) (instrumentation (backend bisect_ppx)) - (public_name tezos-hacl-glue-js) - (modules hacl) - (implements tezos-hacl-glue) - (libraries hacl-star-raw-empty) -) + (modules) + (foreign_stubs (language c) (names hacl_star))) (library - (name hacl_star_raw_empty) + (name tezos_hacl_glue_js) + (public_name tezos-hacl-glue-js) + (implements tezos-hacl-glue) (instrumentation (backend bisect_ppx)) - (public_name hacl-star-raw-empty) - (modules) - (foreign_stubs - (language c) - (names hacl_star)) -) + (libraries hacl-star-raw-empty) + (modules hacl)) -(install - (section lib) - (package tezos-hacl-glue-js) - (files - ; stubs for the js code that's based on externals - hacl_stubs.js - ) -) +(install (section lib) (package tezos-hacl-glue-js) (files hacl_stubs.js)) diff --git a/src/lib_hacl_glue/js/test/dune b/src/lib_hacl_glue/js/test/dune index ab0705b634a2..067a43f6f2d4 100644 --- a/src/lib_hacl_glue/js/test/dune +++ b/src/lib_hacl_glue/js/test/dune @@ -1,27 +1,20 @@ (executable (name test) (modes js) - (preprocess (pps js_of_ocaml-ppx)) - (js_of_ocaml - (javascript_files hacl_stubs.js) - ) (libraries tezos-hacl-glue-js zarith_stubs_js js_of_ocaml-compiler js_of_ocaml) -) + (preprocess (pps js_of_ocaml-ppx)) + (js_of_ocaml (javascript_files hacl_stubs.js))) (rule - (targets hacl_stubs.js) - (action (copy %{lib:tezos-hacl-glue-js:hacl_stubs.js} hacl_stubs.js)) -) + (targets hacl_stubs.js) + (action (copy %{lib:tezos-hacl-glue-js:hacl_stubs.js} hacl_stubs.js))) (rule (alias runtest_js) (package tezos-hacl-glue-js) - (deps - ../.yarnrc - test.bc.js - test.sh) - (action (system "./test.sh"))) + (deps ../.yarnrc test.bc.js test.sh) + (action (system ./test.sh))) diff --git a/src/lib_hacl_glue/js/tezos-hacl-glue-js.opam b/src/lib_hacl_glue/js/tezos-hacl-glue-js.opam index a8e4d4eb122d..afa9c065f5e7 100644 --- a/src/lib_hacl_glue/js/tezos-hacl-glue-js.opam +++ b/src/lib_hacl_glue/js/tezos-hacl-glue-js.opam @@ -1,17 +1,20 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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.0" } - "js_of_ocaml" - "zarith_stubs_js" "tezos-hacl-glue" "hacl-star-raw-empty" - "js_of_ocaml-ppx" { with-test } + "js_of_ocaml" + "zarith_stubs_js" + "js_of_ocaml-ppx" {with-test} +] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -build: [["dune" "build" "-p" name "-j" jobs]] synopsis: "Tezos: thin layer of glue around hacl-star (javascript version)" diff --git a/src/lib_hacl_glue/unix/dune b/src/lib_hacl_glue/unix/dune index af5a3cffa7c4..1a213f8b6067 100644 --- a/src/lib_hacl_glue/unix/dune +++ b/src/lib_hacl_glue/unix/dune @@ -1,11 +1,6 @@ (library (name tezos_hacl_glue_unix) - (instrumentation (backend bisect_ppx)) (public_name tezos-hacl-glue-unix) (implements tezos-hacl-glue) - (libraries - hacl-star - hacl-star-raw - ) - (modules hacl) -) + (instrumentation (backend bisect_ppx)) + (libraries hacl-star hacl-star-raw)) diff --git a/src/lib_hacl_glue/unix/tezos-hacl-glue-unix.opam b/src/lib_hacl_glue/unix/tezos-hacl-glue-unix.opam index a4be46ac2b8b..8d102f5bbba6 100644 --- a/src/lib_hacl_glue/unix/tezos-hacl-glue-unix.opam +++ b/src/lib_hacl_glue/unix/tezos-hacl-glue-unix.opam @@ -1,17 +1,21 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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.0" } - "hacl-star" { >= "0.4.0" & < "0.5" } "tezos-hacl-glue" + "hacl-star" { >= "0.4.0" & < "0.5" } + "hacl-star-raw" ] conflicts: [ "hacl_x25519" ] -build: [["dune" "build" "-p" name "-j" jobs]] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] synopsis: "Tezos: thin layer of glue around hacl-star (unix implementation)" diff --git a/src/lib_hacl_glue/virtual/dune b/src/lib_hacl_glue/virtual/dune index 50b39d314a3f..acf6cbe6103a 100644 --- a/src/lib_hacl_glue/virtual/dune +++ b/src/lib_hacl_glue/virtual/dune @@ -1,6 +1,5 @@ (library - (name tezos_hacl_glue) + (name tezos_hacl_glue) + (public_name tezos-hacl-glue) (instrumentation (backend bisect_ppx)) - (public_name tezos-hacl-glue) - (virtual_modules hacl) -) + (virtual_modules hacl)) diff --git a/src/lib_hacl_glue/virtual/tezos-hacl-glue.opam b/src/lib_hacl_glue/virtual/tezos-hacl-glue.opam index 9ec32542d522..1a5d8eb58aaf 100644 --- a/src/lib_hacl_glue/virtual/tezos-hacl-glue.opam +++ b/src/lib_hacl_glue/virtual/tezos-hacl-glue.opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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" @@ -8,5 +8,8 @@ license: "MIT" depends: [ "dune" { >= "2.0" } ] -build: [["dune" "build" "-p" name "-j" jobs]] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] synopsis: "Tezos: thin layer of glue around hacl-star (virtual package)" diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune index b5d866ed31fe..b17cf5622184 100644 --- a/src/lib_rpc/dune +++ b/src/lib_rpc/dune @@ -1,10 +1,6 @@ (library (name tezos_rpc) - (instrumentation (backend bisect_ppx)) (public_name tezos-rpc) - (libraries data-encoding - tezos-error-monad - resto - resto-directory) - (flags (:standard -open Data_encoding - -open Tezos_error_monad))) + (instrumentation (backend bisect_ppx)) + (libraries data-encoding tezos-error-monad resto resto-directory) + (flags (:standard -open Data_encoding -open Tezos_error_monad))) diff --git a/src/lib_rpc/tezos-rpc.opam b/src/lib_rpc/tezos-rpc.opam index 77dd87b549a5..d6363b0621af 100644 --- a/src/lib_rpc/tezos-rpc.opam +++ b/src/lib_rpc/tezos-rpc.opam @@ -1,14 +1,14 @@ opam-version: "2.0" maintainer: "contact@tezos.com" -authors: [ "Tezos devteam" ] +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.0" } - "tezos-error-monad" "data-encoding" { >= "0.4" & < "0.5" } + "tezos-error-monad" "resto" { >= "0.6" & < "0.7" } "resto-directory" { >= "0.6" & < "0.7" } ] -- GitLab