From 7ddc07273a78a1f6177faec092ad16c1bd362c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Fran=C3=A7a?= Date: Tue, 12 Nov 2024 22:11:42 +0000 Subject: [PATCH] CI fix --- node/Cargo.lock | 23 ++++--------------- node/Cargo.toml | 2 +- .../network/src/gossip/tests/mod.rs | 3 +-- node/components/network/src/testonly.rs | 3 +-- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/node/Cargo.lock b/node/Cargo.lock index 92120e1e..9d9bb9fa 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -1955,19 +1955,6 @@ dependencies = [ "signature", ] -[[package]] -name = "k8s-openapi" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19501afb943ae5806548bc3ebd7f3374153ca057a38f480ef30adfde5ef09755" -dependencies = [ - "base64 0.22.1", - "chrono", - "serde", - "serde-value", - "serde_json", -] - [[package]] name = "k8s-openapi" version = "0.23.0" @@ -1996,7 +1983,7 @@ version = "0.96.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efffeb3df0bd4ef3e5d65044573499c0e4889b988070b08c50b25b1329289a1f" dependencies = [ - "k8s-openapi 0.23.0", + "k8s-openapi", "kube-client", "kube-core", "kube-derive", @@ -2024,7 +2011,7 @@ dependencies = [ "hyper-timeout", "hyper-util", "jsonpath-rust", - "k8s-openapi 0.23.0", + "k8s-openapi", "kube-core", "pem", "rustls", @@ -2051,7 +2038,7 @@ dependencies = [ "form_urlencoded", "http 1.1.0", "json-patch", - "k8s-openapi 0.23.0", + "k8s-openapi", "schemars", "serde", "serde-value", @@ -2088,7 +2075,7 @@ dependencies = [ "hashbrown 0.14.5", "json-patch", "jsonptr", - "k8s-openapi 0.23.0", + "k8s-openapi", "kube-client", "parking_lot", "pin-project", @@ -4452,7 +4439,7 @@ dependencies = [ "async-trait", "clap", "jsonrpsee", - "k8s-openapi 0.22.0", + "k8s-openapi", "kube", "prost", "rand", diff --git a/node/Cargo.toml b/node/Cargo.toml index a0aac2b2..5d058b24 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -73,7 +73,7 @@ hyper-util = { version = "0.1", features = ["full"] } im = "15.1.0" jsonrpsee = { version = "0.23.0", features = ["http-client", "server"] } k256 = { version = "0.13", features = ["ecdsa"] } -k8s-openapi = { version = "0.22.0", features = ["latest"] } +k8s-openapi = { version = "0.23.0", features = ["latest"] } kube = { version = "0.96.0", features = ["derive", "runtime"] } num-bigint = "0.4.4" num-traits = "0.2.18" diff --git a/node/components/network/src/gossip/tests/mod.rs b/node/components/network/src/gossip/tests/mod.rs index ff5d0b48..2e79162b 100644 --- a/node/components/network/src/gossip/tests/mod.rs +++ b/node/components/network/src/gossip/tests/mod.rs @@ -15,8 +15,7 @@ use tracing::Instrument as _; use zksync_concurrency::{ ctx, error::Wrap as _, - limiter, net, scope, - sync::{self, prunable_mpsc::SelectionFunctionResult}, + limiter, net, scope, sync, testonly::{abort_on_panic, set_timeout}, time, }; diff --git a/node/components/network/src/testonly.rs b/node/components/network/src/testonly.rs index 9fff6c27..48421f80 100644 --- a/node/components/network/src/testonly.rs +++ b/node/components/network/src/testonly.rs @@ -14,8 +14,7 @@ use std::{ }; use zksync_concurrency::{ ctx::{self, channel}, - io, limiter, net, scope, - sync::{self, prunable_mpsc::SelectionFunctionResult}, + io, limiter, net, scope, sync, }; use zksync_consensus_roles::{node, validator}; use zksync_consensus_storage::BlockStore;