From 4ad1af12afc22f168c1168e2c4187138d76b7a3f Mon Sep 17 00:00:00 2001 From: Mykola Dzham Date: Thu, 7 Dec 2023 09:38:54 +0000 Subject: [PATCH] chore(IDX-3017): Move rcgen to the workspace to keep the same version --- Cargo.lock | 43 +++++-------------- Cargo.toml | 1 + .../certificate_issuer/Cargo.toml | 2 +- rs/boundary_node/ic_boundary/Cargo.toml | 2 +- rs/crypto/internal/crypto_lib/tls/Cargo.toml | 2 +- .../crypto_service_provider/Cargo.toml | 2 +- rs/rust_canisters/canister_test/Cargo.toml | 2 +- rs/tests/Cargo.toml | 2 +- 8 files changed, 17 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81745bb14d0..f63887e5d61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -802,17 +802,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "backoff" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe17f59a06fe8b87a6fc8bf53bb70b3aba76d7685f432487a68cd5552853625" -dependencies = [ - "getrandom 0.2.8", - "instant", - "rand 0.8.5", -] - [[package]] name = "backoff" version = "0.4.0" @@ -1658,7 +1647,7 @@ dependencies = [ name = "canister-test" version = "0.9.0" dependencies = [ - "backoff 0.3.0", + "backoff", "candid", "cargo_metadata", "dfn_candid", @@ -1781,7 +1770,7 @@ dependencies = [ "opentelemetry-prometheus 0.13.0", "pem 1.1.1", "prometheus", - "rcgen 0.10.0", + "rcgen", "reqwest", "serde", "serde_cbor", @@ -4833,7 +4822,7 @@ version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "263d5c7b295ba69eac0692e6f6b35a01ca323889d10612c0f8c8fd223b0bfec5" dependencies = [ - "backoff 0.4.0", + "backoff", "cached 0.46.1", "candid", "ed25519-consensus", @@ -5124,7 +5113,7 @@ dependencies = [ "prometheus", "rand 0.8.5", "rayon", - "rcgen 0.10.0", + "rcgen", "regex", "reqwest", "rustls", @@ -5304,7 +5293,7 @@ name = "ic-canister-client" version = "0.9.0" dependencies = [ "async-trait", - "backoff 0.4.0", + "backoff", "futures-util", "hex", "hyper 0.14.26", @@ -5925,7 +5914,7 @@ name = "ic-consensus-manager" version = "0.1.0" dependencies = [ "axum", - "backoff 0.4.0", + "backoff", "bytes", "crossbeam-channel", "futures", @@ -6440,7 +6429,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "rcgen 0.10.0", + "rcgen", "rsa", "serde", "serde_bytes", @@ -6669,7 +6658,7 @@ dependencies = [ "ic-types", "rand 0.8.5", "rand_chacha 0.3.1", - "rcgen 0.11.1", + "rcgen", "serde", "serde_cbor", "time 0.3.22", @@ -11658,7 +11647,7 @@ dependencies = [ name = "ic-workload-generator" version = "0.9.0" dependencies = [ - "backoff 0.4.0", + "backoff", "byte-unit", "candid", "chrono", @@ -15450,18 +15439,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem 1.1.1", - "ring", - "time 0.3.22", - "yasna", -] - [[package]] name = "rcgen" version = "0.11.1" @@ -17700,7 +17677,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "rcgen 0.10.0", + "rcgen", "regex", "registry-canister", "reqwest", diff --git a/Cargo.toml b/Cargo.toml index 889c4859697..1b0239f19f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -478,6 +478,7 @@ prometheus-http-query = { version = "0.6.6", default_features = false, features ] } prost = "0.12.3" prost-build = "0.12.3" +rcgen = { version = "0.11.1", features = ["zeroize"] } reqwest = { version = "0.11.22", default-features = false, features = [ "blocking", "json", diff --git a/rs/boundary_node/certificate_issuance/certificate_issuer/Cargo.toml b/rs/boundary_node/certificate_issuance/certificate_issuer/Cargo.toml index 4fd1808e2b2..51d818fe1c0 100644 --- a/rs/boundary_node/certificate_issuance/certificate_issuer/Cargo.toml +++ b/rs/boundary_node/certificate_issuance/certificate_issuer/Cargo.toml @@ -30,7 +30,7 @@ opentelemetry = { version = "0.20", features = ["metrics"] } opentelemetry-prometheus = "0.13.0" pem = "1.1.0" prometheus = { workspace = true } -rcgen = "0.10.0" +rcgen = { workspace = true } reqwest = { workspace = true } serde = { workspace = true } serde_cbor = { workspace = true } diff --git a/rs/boundary_node/ic_boundary/Cargo.toml b/rs/boundary_node/ic_boundary/Cargo.toml index 5917a3f607f..9e24a0bacfd 100644 --- a/rs/boundary_node/ic_boundary/Cargo.toml +++ b/rs/boundary_node/ic_boundary/Cargo.toml @@ -55,7 +55,7 @@ moka = { version = "0.12", features = ["future"] } prometheus = { workspace = true } rand = "0.8.4" rayon = "1.5.3" -rcgen = "0.10.0" +rcgen = { workspace = true } regex = "1.3.9" # same feature as in bazel reqwest = { workspace = true } diff --git a/rs/crypto/internal/crypto_lib/tls/Cargo.toml b/rs/crypto/internal/crypto_lib/tls/Cargo.toml index 74e0cf54391..9248f00d261 100644 --- a/rs/crypto/internal/crypto_lib/tls/Cargo.toml +++ b/rs/crypto/internal/crypto_lib/tls/Cargo.toml @@ -11,7 +11,7 @@ ic-crypto-internal-basic-sig-ed25519 = { path = "../basic_sig/ed25519" } ic-crypto-secrets-containers = { path = "../../../secrets_containers" } ic-types = { path = "../../../../types/types" } rand = "0.8" -rcgen = { version = "0.11.1", features = ["zeroize"] } +rcgen = { workspace = true } serde = { workspace = true } time = "0.3.20" zeroize = { version = "1.4.3", features = ["zeroize_derive"] } diff --git a/rs/crypto/internal/crypto_service_provider/Cargo.toml b/rs/crypto/internal/crypto_service_provider/Cargo.toml index fb72f238c8a..68919dbec0b 100644 --- a/rs/crypto/internal/crypto_service_provider/Cargo.toml +++ b/rs/crypto/internal/crypto_service_provider/Cargo.toml @@ -44,7 +44,7 @@ prost = { workspace = true } rand = "0.8" rand_chacha = "0.3" rayon = "1.8" -rcgen = "0.10.0" +rcgen = { workspace = true } serde = { workspace = true } serde_bytes = { workspace = true } serde_cbor = { workspace = true } diff --git a/rs/rust_canisters/canister_test/Cargo.toml b/rs/rust_canisters/canister_test/Cargo.toml index 98a473e397a..65a7e441ba1 100644 --- a/rs/rust_canisters/canister_test/Cargo.toml +++ b/rs/rust_canisters/canister_test/Cargo.toml @@ -7,7 +7,7 @@ description.workspace = true documentation.workspace = true [dependencies] -backoff = "0.3.0" +backoff = { workspace = true } candid = { workspace = true } cargo_metadata = "0.14.2" dfn_candid={path="../dfn_candid"} diff --git a/rs/tests/Cargo.toml b/rs/tests/Cargo.toml index e0972492610..1ee6c9c5e78 100644 --- a/rs/tests/Cargo.toml +++ b/rs/tests/Cargo.toml @@ -131,7 +131,7 @@ quickcheck = "1.0.3" rand = "0.8" rand_chacha = "0.3" rayon = "1" -rcgen = "0.10.0" +rcgen = { workspace = true } regex = "1.5.0" registry-canister = { path = "../registry/canister" } reqwest = { workspace = true }