Client refactor: Rename stdlib-lwt into stdlib-unix

.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:01:tezos-data-encoding:
-  <<: *opam_definition
-  variables:
-    package: ocplib-resto
-
-opam:02: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:03:blake2:
-  <<: *opam_definition
-  variables:
-    package: tezos-error-monad
-
-opam:05:blake2:
   <<: *opam_definition
   variables:
     package: blake2
 
-opam:06:tezos-rpc:
+opam:04:tweetnacl:
-  <<: *opam_definition
-  variables:
-    package: tezos-rpc
-
-opam:07:tezos-stdlib-lwt:
-  <<: *opam_definition
-  variables:
-    package: tezos-stdlib-lwt
-
-opam:08: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:12:irmin-leveldb:
-  <<: *opam_definition
-  variables:
-    package: tezos-base
-
-opam:13: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:

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

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"

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))))
 

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"

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)

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))))
 

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 ]

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

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" }
 ]

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))))
 

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: [

src/lib_stdlib_unix/jbuild

@@ -1,8 +1,8 @@
 (jbuild_version 1)
 
 (library
- ((name tezos_stdlib_lwt)
+ ((name tezos_stdlib_unix)
-  (public_name tezos-stdlib-lwt)
+  (public_name tezos-stdlib-unix)
   (flags (:standard -w -9-30
                     -open Tezos_base__TzPervasives
                     -safe-string))

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-base"
-  "tezos-data-encoding"
-  "tezos-error-monad"
   "lwt" { >= "3.0.0" }
   "ipaddr"
 ]

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))))