diff --git a/scripts/ci/create_docker_image.minimal.sh b/scripts/ci/create_docker_image.minimal.sh index 575ef3663..05886077c 100755 --- a/scripts/ci/create_docker_image.minimal.sh +++ b/scripts/ci/create_docker_image.minimal.sh @@ -55,8 +55,7 @@ COPY keys /etc/apk/keys/ COPY leveldb-$leveldb_version-r0.apk . RUN apk --no-cache add \ - libssl1.0 libsodium libev gmp vim \ - leveldb-1.18-r0.apk && \ + libev gmp vim leveldb-1.18-r0.apk && \ rm leveldb-$leveldb_version-r0.apk COPY bin/* /usr/local/bin/ diff --git a/scripts/ci/create_docker_image.opam.sh b/scripts/ci/create_docker_image.opam.sh index 60eb49527..2d2ed304c 100755 --- a/scripts/ci/create_docker_image.opam.sh +++ b/scripts/ci/create_docker_image.opam.sh @@ -52,8 +52,8 @@ COPY leveldb-dev-$leveldb_version-r0.apk . RUN apk --no-cache add \ build-base bash perl xz m4 git curl tar rsync patch sudo jq \ - ncurses-dev gmp-dev libev-dev libressl-dev \ - pcre-dev zlib-dev libsodium-dev \ + ncurses-dev gmp-dev libev-dev \ + pcre-dev zlib-dev \ snappy snappy-dev \ leveldb-$leveldb_version-r0.apk \ leveldb-dev-$leveldb_version-r0.apk && \ diff --git a/src/bin_node/jbuild b/src/bin_node/jbuild index cf032ffbc..772f7c6ab 100644 --- a/src/bin_node/jbuild +++ b/src/bin_node/jbuild @@ -14,7 +14,7 @@ tezos-embedded-protocol-demo tezos-embedded-protocol-alpha cmdliner - ssl)) + tls)) (flags (:standard -w -9+27-30-32-40@8 -safe-string -open Tezos_base__TzPervasives diff --git a/src/bin_node/node_run_command.ml b/src/bin_node/node_run_command.ml index d0790957e..2334f7cba 100644 --- a/src/bin_node/node_run_command.ml +++ b/src/bin_node/node_run_command.ml @@ -188,13 +188,6 @@ let init_node ?sandbox (config : Node_config_file.t) = config.shell.prevalidator_limits config.shell.chain_validator_limits -let () = - let old_hook = !Lwt.async_exception_hook in - Lwt.async_exception_hook := function - | Ssl.Read_error _ -> () - | Ssl.Write_error _ -> () - | exn -> old_hook exn - let init_rpc (rpc_config: Node_config_file.rpc) node = match rpc_config.listen_addr with | None -> diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam index 5eb42510a..2427d582d 100644 --- a/src/bin_node/tezos-node.opam +++ b/src/bin_node/tezos-node.opam @@ -18,7 +18,7 @@ depends: [ "tezos-embedded-protocol-demo" "tezos-embedded-protocol-alpha" "cmdliner" - "ssl" + "tls" ] build: [ [ "jbuilder" "build" "-p" name "-j" jobs ]