diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f35b473e9..0a2a3c11a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,10 +103,10 @@ test:stdlib: script: - jbuilder build @src/lib_stdlib/runtest -test:stdlib_lwt: +test:stdlib_unix: <<: *test_definition script: - - jbuilder build @src/lib_stdlib_lwt/runtest + - jbuilder build @src/lib_stdlib_unix/runtest test:data_encoding: <<: *test_definition @@ -211,76 +211,76 @@ opam:00:tezos-stdlib: variables: package: tezos-stdlib -opam:01:ocplib-resto: - <<: *opam_definition - variables: - package: ocplib-resto - -opam:02:tezos-data-encoding: +opam:01:tezos-data-encoding: <<: *opam_definition variables: package: tezos-data-encoding -opam:03:ocplib-resto-directory: +opam:02:ocplib-resto: <<: *opam_definition variables: - package: ocplib-resto-directory + package: ocplib-resto -opam:04:tezos-error-monad: - <<: *opam_definition - variables: - package: tezos-error-monad - -opam:05:blake2: +opam:03:blake2: <<: *opam_definition variables: package: blake2 -opam:06:tezos-rpc: - <<: *opam_definition - variables: - package: tezos-rpc - -opam:07:tezos-stdlib-lwt: - <<: *opam_definition - variables: - package: tezos-stdlib-lwt - -opam:08:tweetnacl: +opam:04:tweetnacl: <<: *opam_definition variables: package: tweetnacl -opam:09:tezos-crypto: +opam:05:tezos-error-monad: + <<: *opam_definition + variables: + package: tezos-error-monad + +opam:06:ocplib-resto-directory: + <<: *opam_definition + variables: + package: ocplib-resto-directory + +opam:07:tezos-crypto: <<: *opam_definition variables: package: tezos-crypto -opam:10:tezos-micheline: +opam:08:tezos-micheline: <<: *opam_definition variables: package: tezos-micheline +opam:09:tezos-rpc: + <<: *opam_definition + variables: + package: tezos-rpc + +opam:10:tezos-base: + <<: *opam_definition + variables: + package: tezos-base + opam:11:ocplib-resto-cohttp: <<: *opam_definition variables: package: ocplib-resto-cohttp -opam:12:tezos-base: - <<: *opam_definition - variables: - package: tezos-base - -opam:13:irmin-leveldb: +opam:12:irmin-leveldb: <<: *opam_definition variables: package: irmin-leveldb -opam:14:tezos-protocol-environment-sigs: +opam:13:tezos-protocol-environment-sigs: <<: *opam_definition variables: package: tezos-protocol-environment-sigs +opam:14:tezos-stdlib-unix: + <<: *opam_definition + variables: + package: tezos-stdlib-unix + opam:15:tezos-rpc-http: <<: *opam_definition variables: diff --git a/src/bin_node/jbuild b/src/bin_node/jbuild index 49d2398b7..cf032ffbc 100644 --- a/src/bin_node/jbuild +++ b/src/bin_node/jbuild @@ -4,7 +4,7 @@ ((name main) (public_name tezos-node) (libraries (tezos-base - tezos-stdlib-lwt + tezos-stdlib-unix tezos-shell-services tezos-rpc-http tezos-p2p @@ -18,7 +18,7 @@ (flags (:standard -w -9+27-30-32-40@8 -safe-string -open Tezos_base__TzPervasives - -open Tezos_stdlib_lwt + -open Tezos_stdlib_unix -open Tezos_shell_services -open Tezos_rpc_http -open Tezos_p2p diff --git a/src/lib_base/tezos-base.opam b/src/lib_base/tezos-base.opam index 8419b799a..bdccfdc07 100644 --- a/src/lib_base/tezos-base.opam +++ b/src/lib_base/tezos-base.opam @@ -10,7 +10,6 @@ depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta17" } "tezos-stdlib" - "tezos-stdlib-lwt" "tezos-crypto" "tezos-data-encoding" "tezos-error-monad" diff --git a/src/lib_client_base/jbuild b/src/lib_client_base/jbuild index 67789c50d..77a9105c9 100644 --- a/src/lib_client_base/jbuild +++ b/src/lib_client_base/jbuild @@ -4,14 +4,14 @@ ((name tezos_client_base) (public_name tezos-client-base) (libraries (tezos-base - tezos-stdlib-lwt + tezos-stdlib-unix tezos-shell-services tezos-rpc-http)) (library_flags (:standard -linkall)) (flags (:standard -w -9+27-30-32-40@8 -safe-string -open Tezos_base__TzPervasives - -open Tezos_stdlib_lwt + -open Tezos_stdlib_unix -open Tezos_rpc_http -open Tezos_shell_services)))) diff --git a/src/lib_client_base/tezos-client-base.opam b/src/lib_client_base/tezos-client-base.opam index 2330dfa1d..aabd1d32e 100644 --- a/src/lib_client_base/tezos-client-base.opam +++ b/src/lib_client_base/tezos-client-base.opam @@ -10,6 +10,7 @@ depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta17" } "tezos-base" + "tezos-stdlib-unix" "tezos-shell-services" "tezos-storage" "tezos-rpc-http" diff --git a/src/lib_p2p/jbuild b/src/lib_p2p/jbuild index 8ed098575..7a82c5564 100644 --- a/src/lib_p2p/jbuild +++ b/src/lib_p2p/jbuild @@ -4,11 +4,11 @@ ((name tezos_p2p) (public_name tezos-p2p) (libraries (tezos-base - tezos-stdlib-lwt)) + tezos-stdlib-unix)) (flags (:standard -w -9+27-30-32-40@8 -safe-string -open Tezos_base__TzPervasives - -open Tezos_stdlib_lwt)))) + -open Tezos_stdlib_unix)))) (alias ((name runtest_indent) diff --git a/src/lib_p2p/test/jbuild b/src/lib_p2p/test/jbuild index a65a95ab6..fc41df4ab 100644 --- a/src/lib_p2p/test/jbuild +++ b/src/lib_p2p/test/jbuild @@ -5,14 +5,14 @@ test_p2p_pool test_p2p_io_scheduler)) (libraries (tezos-base - tezos-stdlib-lwt + tezos-stdlib-unix tezos-p2p tezos-test-helpers)) (flags (:standard -w -9-32 -linkall -safe-string -open Tezos_base__TzPervasives - -open Tezos_stdlib_lwt + -open Tezos_stdlib_unix -open Tezos_test_helpers -open Tezos_p2p)))) diff --git a/src/lib_p2p/tezos-p2p.opam b/src/lib_p2p/tezos-p2p.opam index 333a9ceed..21a156f7f 100644 --- a/src/lib_p2p/tezos-p2p.opam +++ b/src/lib_p2p/tezos-p2p.opam @@ -11,6 +11,7 @@ depends: [ "jbuilder" { build & >= "1.0+beta17" } "tezos-test-helpers" { test } "tezos-base" + "tezos-stdlib-unix" ] build: [ [ "jbuilder" "build" "-p" name "-j" jobs ] diff --git a/src/lib_protocol_compiler/jbuild b/src/lib_protocol_compiler/jbuild index 0983ec233..5cb529c50 100644 --- a/src/lib_protocol_compiler/jbuild +++ b/src/lib_protocol_compiler/jbuild @@ -25,7 +25,7 @@ (public_name tezos-protocol-compiler) (libraries (tezos-base tezos-protocol-environment-sigs - tezos-stdlib-lwt + tezos-stdlib-unix compiler-libs lwt.unix ocplib-endian @@ -34,7 +34,7 @@ (flags (:standard -w -9+27-30-32-40@8 -safe-string -open Tezos_base__TzPervasives - -open Tezos_stdlib_lwt)) + -open Tezos_stdlib_unix)) (modules (Embedded_cmis Packer Compiler)))) (library @@ -82,10 +82,10 @@ (public_name tezos-embedded-protocol-packer) (modes (native)) (libraries (tezos-base - tezos-stdlib-lwt)) + tezos-stdlib-unix)) (flags (:standard -linkall -open Tezos_base__TzPervasives - -open Tezos_stdlib_lwt)) + -open Tezos_stdlib_unix)) (modules (Main_embedded_packer)))) (install diff --git a/src/lib_protocol_compiler/tezos-protocol-compiler.opam b/src/lib_protocol_compiler/tezos-protocol-compiler.opam index c7d2a762f..eccc78a64 100644 --- a/src/lib_protocol_compiler/tezos-protocol-compiler.opam +++ b/src/lib_protocol_compiler/tezos-protocol-compiler.opam @@ -12,7 +12,7 @@ depends: [ "base-unix" "tezos-base" "tezos-protocol-environment-sigs" - "lwt" + "tezos-stdlib-unix" "ocplib-endian" "ocp-ocamlres" { >= "0.4" } ] diff --git a/src/lib_protocol_updater/jbuild b/src/lib_protocol_updater/jbuild index 04d728614..d3e05019b 100644 --- a/src/lib_protocol_updater/jbuild +++ b/src/lib_protocol_updater/jbuild @@ -4,7 +4,7 @@ ((name tezos_protocol_updater) (public_name tezos-protocol-updater) (libraries (tezos-base - tezos-stdlib-lwt + tezos-stdlib-unix tezos-micheline tezos-protocol-compiler.registerer tezos-protocol-compiler.native @@ -13,7 +13,7 @@ (flags (:standard -w -9+27-30-32-40@8 -safe-string -open Tezos_base__TzPervasives - -open Tezos_stdlib_lwt + -open Tezos_stdlib_unix -open Tezos_micheline -open Tezos_storage)))) diff --git a/src/lib_protocol_updater/tezos-protocol-updater.opam b/src/lib_protocol_updater/tezos-protocol-updater.opam index 0a38ec1c3..39f799e2d 100644 --- a/src/lib_protocol_updater/tezos-protocol-updater.opam +++ b/src/lib_protocol_updater/tezos-protocol-updater.opam @@ -12,6 +12,7 @@ depends: [ "tezos-base" "tezos-micheline" "tezos-protocol-compiler" + "tezos-stdlib-unix" "tezos-storage" ] build: [ diff --git a/src/lib_stdlib_lwt/jbuild b/src/lib_stdlib_unix/jbuild similarity index 85% rename from src/lib_stdlib_lwt/jbuild rename to src/lib_stdlib_unix/jbuild index 6ff6b933e..4c45fdf15 100644 --- a/src/lib_stdlib_lwt/jbuild +++ b/src/lib_stdlib_unix/jbuild @@ -1,8 +1,8 @@ (jbuild_version 1) (library - ((name tezos_stdlib_lwt) - (public_name tezos-stdlib-lwt) + ((name tezos_stdlib_unix) + (public_name tezos-stdlib-unix) (flags (:standard -w -9-30 -open Tezos_base__TzPervasives -safe-string)) diff --git a/src/lib_stdlib_lwt/logging_unix.ml b/src/lib_stdlib_unix/logging_unix.ml similarity index 100% rename from src/lib_stdlib_lwt/logging_unix.ml rename to src/lib_stdlib_unix/logging_unix.ml diff --git a/src/lib_stdlib_lwt/logging_unix.mli b/src/lib_stdlib_unix/logging_unix.mli similarity index 100% rename from src/lib_stdlib_lwt/logging_unix.mli rename to src/lib_stdlib_unix/logging_unix.mli diff --git a/src/lib_stdlib_lwt/lwt_lock_file.ml b/src/lib_stdlib_unix/lwt_lock_file.ml similarity index 100% rename from src/lib_stdlib_lwt/lwt_lock_file.ml rename to src/lib_stdlib_unix/lwt_lock_file.ml diff --git a/src/lib_stdlib_lwt/lwt_lock_file.mli b/src/lib_stdlib_unix/lwt_lock_file.mli similarity index 100% rename from src/lib_stdlib_lwt/lwt_lock_file.mli rename to src/lib_stdlib_unix/lwt_lock_file.mli diff --git a/src/lib_stdlib_lwt/lwt_utils_unix.ml b/src/lib_stdlib_unix/lwt_utils_unix.ml similarity index 100% rename from src/lib_stdlib_lwt/lwt_utils_unix.ml rename to src/lib_stdlib_unix/lwt_utils_unix.ml diff --git a/src/lib_stdlib_lwt/lwt_utils_unix.mli b/src/lib_stdlib_unix/lwt_utils_unix.mli similarity index 100% rename from src/lib_stdlib_lwt/lwt_utils_unix.mli rename to src/lib_stdlib_unix/lwt_utils_unix.mli diff --git a/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam b/src/lib_stdlib_unix/tezos-stdlib-unix.opam similarity index 89% rename from src/lib_stdlib_lwt/tezos-stdlib-lwt.opam rename to src/lib_stdlib_unix/tezos-stdlib-unix.opam index 911ac0610..35ebab0e5 100644 --- a/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam +++ b/src/lib_stdlib_unix/tezos-stdlib-unix.opam @@ -10,9 +10,7 @@ depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta17" } "tezos-test-helpers" { test } - "tezos-stdlib" - "tezos-data-encoding" - "tezos-error-monad" + "tezos-base" "lwt" { >= "3.0.0" } "ipaddr" ] diff --git a/src/proto_alpha/lib_protocol/test/helpers/jbuild b/src/proto_alpha/lib_protocol/test/helpers/jbuild index eac0b2a1a..45036b843 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/jbuild +++ b/src/proto_alpha/lib_protocol/test/helpers/jbuild @@ -4,13 +4,13 @@ ((name tezos_proto_alpha_isolate_helpers) (libraries (tezos-test-helpers tezos-base - tezos-stdlib-lwt + tezos-stdlib-unix tezos-protocol-environment-client tezos-protocol-alpha)) (wrapped false) (flags (:standard -w -9-32 -safe-string -open Tezos_base__TzPervasives - -open Tezos_stdlib_lwt + -open Tezos_stdlib_unix -open Tezos_test_helpers -open Tezos_protocol_environment_client))))