From 7a512af09418da3121fffcbbc06043fd468882da Mon Sep 17 00:00:00 2001 From: Franz-Stefan Preiss Date: Thu, 25 Jan 2024 23:30:37 +0000 Subject: [PATCH] build(crypto): CRP-2375 remove unused dependencies in crypto code --- Cargo.lock | 48 ------------------- rs/crypto/BUILD.bazel | 2 - rs/crypto/Cargo.toml | 2 - .../threshold_sig/tecdsa/BUILD.bazel | 1 - .../threshold_sig/tecdsa/Cargo.toml | 1 - .../crypto_service_provider/BUILD.bazel | 3 -- .../crypto_service_provider/Cargo.toml | 3 -- rs/crypto/internal/csp_test_utils/BUILD.bazel | 6 --- rs/crypto/internal/csp_test_utils/Cargo.toml | 6 --- rs/crypto/internal/test_vectors/BUILD.bazel | 1 - rs/crypto/internal/test_vectors/Cargo.toml | 1 - rs/crypto/node_key_generation/BUILD.bazel | 1 - rs/crypto/node_key_generation/Cargo.toml | 1 - .../tls_cert_validation/BUILD.bazel | 2 - .../tls_cert_validation/Cargo.toml | 2 - rs/crypto/prng/BUILD.bazel | 1 - rs/crypto/prng/Cargo.toml | 1 - rs/crypto/standalone-sig-verifier/BUILD.bazel | 1 - rs/crypto/standalone-sig-verifier/Cargo.toml | 1 - rs/crypto/temp_crypto/temp_vault/BUILD.bazel | 2 - rs/crypto/temp_crypto/temp_vault/Cargo.toml | 2 - rs/crypto/test_utils/BUILD.bazel | 12 ----- rs/crypto/test_utils/Cargo.toml | 10 ---- .../test_utils/canister_sigs/BUILD.bazel | 9 ---- rs/crypto/test_utils/canister_sigs/Cargo.toml | 9 ---- .../canister_threshold_sigs/BUILD.bazel | 3 -- .../canister_threshold_sigs/Cargo.toml | 3 -- .../test_utils/local_csp_vault/BUILD.bazel | 1 - .../test_utils/local_csp_vault/Cargo.toml | 5 +- rs/crypto/test_utils/metrics/BUILD.bazel | 6 +-- rs/crypto/test_utils/metrics/Cargo.toml | 3 -- rs/crypto/test_utils/ni-dkg/BUILD.bazel | 1 - rs/crypto/test_utils/ni-dkg/Cargo.toml | 1 - rs/crypto/utils/ni_dkg/BUILD.bazel | 1 - rs/crypto/utils/ni_dkg/Cargo.toml | 1 - 35 files changed, 3 insertions(+), 150 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 918e672ab4f..a387346316f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6167,7 +6167,6 @@ dependencies = [ "ic-crypto-internal-basic-sig-ecdsa-secp256k1", "ic-crypto-internal-basic-sig-ecdsa-secp256r1", "ic-crypto-internal-basic-sig-ed25519", - "ic-crypto-internal-basic-sig-iccsa", "ic-crypto-internal-basic-sig-rsa-pkcs1", "ic-crypto-internal-csp", "ic-crypto-internal-csp-proptest-utils", @@ -6229,7 +6228,6 @@ dependencies = [ "rand_chacha 0.3.1", "rsa", "serde", - "serde_bytes", "sha2 0.10.8", "simple_asn1", "slog", @@ -6519,7 +6517,6 @@ name = "ic-crypto-internal-csp" version = "0.9.0" dependencies = [ "assert_matches", - "async-trait", "base64 0.13.1", "bincode", "bytes", @@ -6576,12 +6573,10 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "rcgen", "rsa", "serde", "serde_bytes", "serde_cbor", - "simple_asn1", "slog", "slog-async", "strum 0.25.0", @@ -6634,17 +6629,11 @@ version = "0.9.0" dependencies = [ "ic-crypto-internal-basic-sig-ed25519", "ic-crypto-internal-csp", - "ic-crypto-internal-logmon", "ic-crypto-internal-multi-sig-bls12381", "ic-crypto-internal-test-vectors", - "ic-crypto-internal-types", - "ic-logger", "ic-protobuf", "ic-types", - "rand 0.8.5", - "rand_chacha 0.3.1", "serde", - "serde_bytes", "serde_cbor", "tempfile", "tokio", @@ -6716,7 +6705,6 @@ dependencies = [ name = "ic-crypto-internal-test-vectors" version = "0.9.0" dependencies = [ - "base64 0.13.1", "hex", "strum 0.25.0", "strum_macros 0.25.3", @@ -6782,7 +6770,6 @@ dependencies = [ "p256", "paste 1.0.14", "rand 0.8.5", - "rand_chacha 0.3.1", "serde", "serde_bytes", "serde_cbor", @@ -6852,7 +6839,6 @@ dependencies = [ "ic-crypto-tls-interfaces", "ic-crypto-utils-basic-sig", "ic-interfaces", - "ic-interfaces-registry", "ic-logger", "ic-metrics", "ic-protobuf", @@ -6892,7 +6878,6 @@ name = "ic-crypto-prng" version = "0.1.0" dependencies = [ "ic-crypto-sha2", - "ic-interfaces", "ic-types", "ic-types-test-utils", "rand 0.8.5", @@ -6942,7 +6927,6 @@ dependencies = [ "ic-crypto-internal-basic-sig-iccsa", "ic-crypto-internal-basic-sig-rsa-pkcs1", "ic-crypto-internal-test-vectors", - "ic-crypto-internal-types", "ic-crypto-sha2", "ic-crypto-test-utils-canister-sigs", "ic-crypto-test-utils-reproducible-rng", @@ -7002,8 +6986,6 @@ name = "ic-crypto-temp-crypto-vault" version = "0.9.0" dependencies = [ "ic-crypto-internal-csp", - "ic-crypto-internal-logmon", - "ic-logger", "tempfile", "tokio", ] @@ -7014,22 +6996,12 @@ version = "0.9.0" dependencies = [ "ed25519-consensus", "ic-crypto-internal-csp-test-utils", - "ic-crypto-internal-types", - "ic-crypto-tls-interfaces", - "ic-interfaces", "ic-interfaces-registry", - "ic-protobuf", "ic-registry-client-fake", - "ic-registry-client-helpers", - "ic-registry-keys", "ic-registry-proto-data-provider", "ic-types", - "ic-types-test-utils", "rand 0.8.5", "rand_chacha 0.3.1", - "serde", - "strum_macros 0.25.3", - "tokio", ] [[package]] @@ -7039,31 +7011,19 @@ dependencies = [ "ic-certification-test-utils", "ic-crypto-internal-basic-sig-iccsa", "ic-crypto-internal-basic-sig-iccsa-test-utils", - "ic-crypto-internal-types", "ic-crypto-temp-crypto", "ic-crypto-test-utils", - "ic-interfaces-registry", - "ic-protobuf", - "ic-registry-client-fake", - "ic-registry-keys", - "ic-registry-proto-data-provider", "ic-types", - "ic-types-test-utils", "rand 0.8.5", "rand_chacha 0.3.1", - "serde", - "serde_cbor", ] [[package]] name = "ic-crypto-test-utils-canister-threshold-sigs" version = "0.9.0" dependencies = [ - "assert_matches", - "ic-crypto-internal-csp", "ic-crypto-internal-threshold-sig-ecdsa", "ic-crypto-temp-crypto", - "ic-crypto-test-utils-reproducible-rng", "ic-interfaces", "ic-logger", "ic-protobuf", @@ -7125,7 +7085,6 @@ dependencies = [ "ic-protobuf", "ic-types", "mockall", - "serde_bytes", ] [[package]] @@ -7135,9 +7094,6 @@ dependencies = [ "ic-crypto-internal-logmon", "ic-metrics", "ic-test-utilities-metrics", - "prometheus", - "strum 0.25.0", - "strum_macros 0.25.3", ] [[package]] @@ -7160,7 +7116,6 @@ version = "0.9.0" dependencies = [ "hex", "ic-crypto-internal-bls12-381-type", - "ic-crypto-internal-csp", "ic-crypto-internal-types", "ic-crypto-temp-crypto", "ic-crypto-test-utils", @@ -7225,9 +7180,7 @@ dependencies = [ "assert_matches", "curve25519-dalek", "hex", - "ic-base-types", "ic-crypto-internal-basic-sig-ed25519", - "ic-crypto-internal-types", "ic-crypto-test-utils-keys", "ic-crypto-test-utils-reproducible-rng", "ic-crypto-test-utils-tls", @@ -7330,7 +7283,6 @@ dependencies = [ "ic-protobuf", "ic-types", "ic-types-test-utils", - "serde_cbor", ] [[package]] diff --git a/rs/crypto/BUILD.bazel b/rs/crypto/BUILD.bazel index 818e048f6db..b08be20b4f4 100644 --- a/rs/crypto/BUILD.bazel +++ b/rs/crypto/BUILD.bazel @@ -7,7 +7,6 @@ DEPENDENCIES = [ "//rs/config", "//rs/crypto/interfaces/sig_verification", "//rs/crypto/internal/crypto_lib/basic_sig/ed25519", - "//rs/crypto/internal/crypto_lib/basic_sig/iccsa", "//rs/crypto/internal/crypto_lib/seed", "//rs/crypto/internal/crypto_lib/threshold_sig/bls12_381", "//rs/crypto/internal/crypto_lib/threshold_sig/tecdsa", @@ -38,7 +37,6 @@ DEPENDENCIES = [ "@crate_index//:hex", "@crate_index//:parking_lot", "@crate_index//:serde", - "@crate_index//:serde_bytes", "@crate_index//:slog", "@crate_index//:strum", "@crate_index//:tempfile", diff --git a/rs/crypto/Cargo.toml b/rs/crypto/Cargo.toml index ca1fc9838d9..5b4d0a354f6 100644 --- a/rs/crypto/Cargo.toml +++ b/rs/crypto/Cargo.toml @@ -25,7 +25,6 @@ ic-crypto-internal-logmon = { path = "internal/logmon" } ic-crypto-internal-seed = { path = "internal/crypto_lib/seed" } ic-crypto-internal-threshold-sig-bls12381 = { path = "internal/crypto_lib/threshold_sig/bls12_381" } ic-crypto-internal-threshold-sig-ecdsa = { path = "internal/crypto_lib/threshold_sig/tecdsa" } -ic-crypto-internal-basic-sig-iccsa = { path = "internal/crypto_lib/basic_sig/iccsa" } ic-crypto-internal-types = { path = "internal/crypto_lib/types" } ic-crypto-standalone-sig-verifier = { path = "standalone-sig-verifier" } ic-crypto-tls-cert-validation = { path = "node_key_validation/tls_cert_validation" } @@ -45,7 +44,6 @@ ic-registry-proto-data-provider = { path = "../registry/proto_data_provider" } ic-types = { path = "../types/types" } parking_lot = "0.12.1" serde = { workspace = true } -serde_bytes = { workspace = true } slog = { workspace = true } strum = { workspace = true } strum_macros = { workspace = true } diff --git a/rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/BUILD.bazel b/rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/BUILD.bazel index b51b726e9a6..48a69f60890 100644 --- a/rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/BUILD.bazel +++ b/rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/BUILD.bazel @@ -18,7 +18,6 @@ DEPENDENCIES = [ "@crate_index//:lazy_static", "@crate_index//:p256", "@crate_index//:rand", - "@crate_index//:rand_chacha", "@crate_index//:serde", "@crate_index//:serde_bytes", "@crate_index//:serde_cbor", diff --git a/rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/Cargo.toml b/rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/Cargo.toml index d9b3d942c6a..03410d44c83 100644 --- a/rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/Cargo.toml +++ b/rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/Cargo.toml @@ -20,7 +20,6 @@ k256 = { workspace = true } p256 = { workspace = true } zeroize = { version = "1.4.3", features = ["zeroize_derive"] } rand = "0.8" -rand_chacha = "0.3" hex = "0.4" hex-literal = "0.4.1" paste = "1.0.0" diff --git a/rs/crypto/internal/crypto_service_provider/BUILD.bazel b/rs/crypto/internal/crypto_service_provider/BUILD.bazel index e47999a1f45..38c2808b382 100644 --- a/rs/crypto/internal/crypto_service_provider/BUILD.bazel +++ b/rs/crypto/internal/crypto_service_provider/BUILD.bazel @@ -45,11 +45,9 @@ DEPENDENCIES = [ "@crate_index//:rand", "@crate_index//:rand_chacha", "@crate_index//:rayon", - "@crate_index//:rcgen", "@crate_index//:serde", "@crate_index//:serde_bytes", "@crate_index//:serde_cbor", - "@crate_index//:simple_asn1", "@crate_index//:slog", "@crate_index//:strum", "@crate_index//:stubborn-io", @@ -89,7 +87,6 @@ DEV_DEPENDENCIES = [ ] MACRO_DEPENDENCIES = [ - "@crate_index//:async-trait", "@crate_index//:strum_macros", "@crate_index//:educe", ] diff --git a/rs/crypto/internal/crypto_service_provider/Cargo.toml b/rs/crypto/internal/crypto_service_provider/Cargo.toml index c1f1e4a40b6..e29c604a015 100644 --- a/rs/crypto/internal/crypto_service_provider/Cargo.toml +++ b/rs/crypto/internal/crypto_service_provider/Cargo.toml @@ -7,7 +7,6 @@ edition.workspace = true documentation.workspace = true [dependencies] -async-trait = "0.1.41" base64 = { workspace = true } bincode = "1.2" bytes = { workspace = true } @@ -44,11 +43,9 @@ prost = { workspace = true } rand = "0.8" rand_chacha = "0.3" rayon = "1.8" -rcgen = { workspace = true } serde = { workspace = true } serde_bytes = { workspace = true } serde_cbor = { workspace = true } -simple_asn1 = { workspace = true } slog = { workspace = true } stubborn-io = "0.3.2" strum = { workspace = true } diff --git a/rs/crypto/internal/csp_test_utils/BUILD.bazel b/rs/crypto/internal/csp_test_utils/BUILD.bazel index b0217fffa4f..0868ee0db8d 100644 --- a/rs/crypto/internal/csp_test_utils/BUILD.bazel +++ b/rs/crypto/internal/csp_test_utils/BUILD.bazel @@ -10,17 +10,11 @@ rust_library( deps = [ "//rs/crypto/internal/crypto_lib/basic_sig/ed25519", "//rs/crypto/internal/crypto_lib/multi_sig/bls12_381", - "//rs/crypto/internal/crypto_lib/types", "//rs/crypto/internal/crypto_service_provider", - "//rs/crypto/internal/logmon", "//rs/crypto/internal/test_vectors", - "//rs/monitoring/logger", "//rs/protobuf", "//rs/types/types", - "@crate_index//:rand", - "@crate_index//:rand_chacha", "@crate_index//:serde", - "@crate_index//:serde_bytes", "@crate_index//:serde_cbor", "@crate_index//:tempfile", "@crate_index//:tokio", diff --git a/rs/crypto/internal/csp_test_utils/Cargo.toml b/rs/crypto/internal/csp_test_utils/Cargo.toml index a4b54f02c47..9eb7517eac0 100644 --- a/rs/crypto/internal/csp_test_utils/Cargo.toml +++ b/rs/crypto/internal/csp_test_utils/Cargo.toml @@ -10,18 +10,12 @@ documentation.workspace = true ic-crypto-internal-basic-sig-ed25519 = { path = "../crypto_lib/basic_sig/ed25519" } ic-crypto-internal-multi-sig-bls12381 = { path = "../crypto_lib/multi_sig/bls12_381" } ic-crypto-internal-csp = { path = "../crypto_service_provider" } -ic-crypto-internal-logmon = { path = "../logmon" } ic-crypto-internal-test-vectors = { path = "../test_vectors" } -ic-crypto-internal-types = { path = "../crypto_lib/types" } -ic-logger = { path = "../../../monitoring/logger" } ic-protobuf = { path = "../../../protobuf" } ic-types = { path = "../../../types/types" } # Would like to get rid of this but as long as the CSP depends on ic-types we can't really. serde = { workspace = true } -serde_bytes = { workspace = true } # No other ic-dependencies are allowed. -rand = "0.8" -rand_chacha = "0.3" serde_cbor = { workspace = true } tempfile = "3.1.0" tokio = { workspace = true } diff --git a/rs/crypto/internal/test_vectors/BUILD.bazel b/rs/crypto/internal/test_vectors/BUILD.bazel index be40be603ff..278dff97aa2 100644 --- a/rs/crypto/internal/test_vectors/BUILD.bazel +++ b/rs/crypto/internal/test_vectors/BUILD.bazel @@ -10,7 +10,6 @@ rust_library( version = "0.9.0", visibility = ["//rs/crypto:__subpackages__"], deps = [ - "@crate_index//:base64", "@crate_index//:hex", "@crate_index//:strum", ], diff --git a/rs/crypto/internal/test_vectors/Cargo.toml b/rs/crypto/internal/test_vectors/Cargo.toml index b0395ad8f5a..0e41345f3b1 100644 --- a/rs/crypto/internal/test_vectors/Cargo.toml +++ b/rs/crypto/internal/test_vectors/Cargo.toml @@ -10,7 +10,6 @@ documentation.workspace = true [dependencies] # NO ic-* dependencies are allowed here -base64 = { workspace = true } hex = "0.4.2" strum = { workspace = true } strum_macros = { workspace = true } diff --git a/rs/crypto/node_key_generation/BUILD.bazel b/rs/crypto/node_key_generation/BUILD.bazel index 50b1f56cbfa..390a9c99019 100644 --- a/rs/crypto/node_key_generation/BUILD.bazel +++ b/rs/crypto/node_key_generation/BUILD.bazel @@ -12,7 +12,6 @@ DEPENDENCIES = [ "//rs/crypto/tls_interfaces", "//rs/crypto/utils/basic_sig", "//rs/interfaces", - "//rs/interfaces/registry", "//rs/protobuf", "//rs/types/types", "@crate_index//:tokio", diff --git a/rs/crypto/node_key_generation/Cargo.toml b/rs/crypto/node_key_generation/Cargo.toml index ac0d473b599..90fd19fe55f 100644 --- a/rs/crypto/node_key_generation/Cargo.toml +++ b/rs/crypto/node_key_generation/Cargo.toml @@ -13,7 +13,6 @@ ic-crypto-node-key-validation = { path = "../node_key_validation"} ic-crypto-tls-interfaces = { path = "../tls_interfaces" } ic-crypto-utils-basic-sig = { path = "../utils/basic_sig" } ic-interfaces = { path = "../../interfaces" } -ic-interfaces-registry = { path = "../../interfaces/registry" } ic-protobuf = { path = "../../protobuf" } ic-types = { path = "../../types/types" } tokio = { workspace = true } diff --git a/rs/crypto/node_key_validation/tls_cert_validation/BUILD.bazel b/rs/crypto/node_key_validation/tls_cert_validation/BUILD.bazel index 9ea9873224a..6055213dc47 100644 --- a/rs/crypto/node_key_validation/tls_cert_validation/BUILD.bazel +++ b/rs/crypto/node_key_validation/tls_cert_validation/BUILD.bazel @@ -8,9 +8,7 @@ package(default_visibility = ["//visibility:public"]) ######################################################## DEPENDENCIES = [ "//rs/crypto/internal/crypto_lib/basic_sig/ed25519", - "//rs/crypto/internal/crypto_lib/types", "//rs/protobuf", - "//rs/types/base_types", "//rs/types/types", "@crate_index//:hex", "@crate_index//:serde", diff --git a/rs/crypto/node_key_validation/tls_cert_validation/Cargo.toml b/rs/crypto/node_key_validation/tls_cert_validation/Cargo.toml index aafa1f16aaf..48eb959260a 100644 --- a/rs/crypto/node_key_validation/tls_cert_validation/Cargo.toml +++ b/rs/crypto/node_key_validation/tls_cert_validation/Cargo.toml @@ -12,9 +12,7 @@ documentation.workspace = true # use dependencies that can be compiled to WebAssembly. ######################################################## hex = "0.4.2" -ic-base-types = { path = "../../../types/base_types" } ic-crypto-internal-basic-sig-ed25519 = { path = "../../internal/crypto_lib/basic_sig/ed25519" } -ic-crypto-internal-types = { path = "../../internal/crypto_lib/types" } ic-crypto-test-utils-reproducible-rng = { path = "../../test_utils/reproducible_rng" } ic-protobuf = { path = "../../../protobuf" } ic-types = { path = "../../../types/types" } diff --git a/rs/crypto/prng/BUILD.bazel b/rs/crypto/prng/BUILD.bazel index 611b1109d9c..a642406ec90 100644 --- a/rs/crypto/prng/BUILD.bazel +++ b/rs/crypto/prng/BUILD.bazel @@ -9,7 +9,6 @@ filegroup( DEPENDENCIES = [ "//rs/crypto/sha2", - "//rs/interfaces", "//rs/types/types", "@crate_index//:rand", "@crate_index//:rand_chacha", diff --git a/rs/crypto/prng/Cargo.toml b/rs/crypto/prng/Cargo.toml index 49d440e2bff..5ffd010a397 100644 --- a/rs/crypto/prng/Cargo.toml +++ b/rs/crypto/prng/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] ic-crypto-sha2 = { path = "../sha2" } -ic-interfaces = { path = "../../interfaces" } ic-types = { path = "../../types/types" } rand = "0.8" rand_chacha = "0.3" diff --git a/rs/crypto/standalone-sig-verifier/BUILD.bazel b/rs/crypto/standalone-sig-verifier/BUILD.bazel index 97770342a25..82db691c53b 100644 --- a/rs/crypto/standalone-sig-verifier/BUILD.bazel +++ b/rs/crypto/standalone-sig-verifier/BUILD.bazel @@ -11,7 +11,6 @@ DEPENDENCIES = [ "//rs/crypto/internal/crypto_lib/basic_sig/ed25519", "//rs/crypto/internal/crypto_lib/basic_sig/iccsa", "//rs/crypto/internal/crypto_lib/basic_sig/rsa_pkcs1", - "//rs/crypto/internal/crypto_lib/types", "//rs/crypto/sha2", "//rs/types/types", ] diff --git a/rs/crypto/standalone-sig-verifier/Cargo.toml b/rs/crypto/standalone-sig-verifier/Cargo.toml index 5f8f2832fa5..a14d31bcca2 100644 --- a/rs/crypto/standalone-sig-verifier/Cargo.toml +++ b/rs/crypto/standalone-sig-verifier/Cargo.toml @@ -15,7 +15,6 @@ ic-crypto-internal-basic-sig-ecdsa-secp256r1 = { path = "../internal/crypto_lib/ ic-crypto-internal-basic-sig-ed25519 = { path = "../internal/crypto_lib/basic_sig/ed25519" } ic-crypto-internal-basic-sig-iccsa = { path = "../internal/crypto_lib/basic_sig/iccsa" } ic-crypto-internal-basic-sig-rsa-pkcs1 = { path = "../internal/crypto_lib/basic_sig/rsa_pkcs1" } -ic-crypto-internal-types = { path = "../internal/crypto_lib/types" } ic-crypto-sha2 = { path = "../sha2" } ic-types = { path = "../../types/types" } diff --git a/rs/crypto/temp_crypto/temp_vault/BUILD.bazel b/rs/crypto/temp_crypto/temp_vault/BUILD.bazel index 80a81cbd4f8..6b10129320a 100644 --- a/rs/crypto/temp_crypto/temp_vault/BUILD.bazel +++ b/rs/crypto/temp_crypto/temp_vault/BUILD.bazel @@ -4,8 +4,6 @@ package(default_visibility = ["//visibility:public"]) DEPENDENCIES = [ "//rs/crypto/internal/crypto_service_provider", - "//rs/crypto/internal/logmon", - "//rs/monitoring/logger", "@crate_index//:tempfile", "@crate_index//:tokio", ] diff --git a/rs/crypto/temp_crypto/temp_vault/Cargo.toml b/rs/crypto/temp_crypto/temp_vault/Cargo.toml index 1eb391781f8..a37573fb8de 100644 --- a/rs/crypto/temp_crypto/temp_vault/Cargo.toml +++ b/rs/crypto/temp_crypto/temp_vault/Cargo.toml @@ -8,7 +8,5 @@ documentation.workspace = true [dependencies] ic-crypto-internal-csp = { path = "../../internal/crypto_service_provider" } -ic-crypto-internal-logmon = { path = "../../internal/logmon" } -ic-logger = { path = "../../../monitoring/logger" } tempfile = "3.1.0" tokio = { workspace = true } diff --git a/rs/crypto/test_utils/BUILD.bazel b/rs/crypto/test_utils/BUILD.bazel index 268d5cf4fc9..512383ede4b 100644 --- a/rs/crypto/test_utils/BUILD.bazel +++ b/rs/crypto/test_utils/BUILD.bazel @@ -4,9 +4,6 @@ rust_library( name = "test_utils", srcs = glob(["src/**"]), crate_name = "ic_crypto_test_utils", - proc_macro_deps = [ - "@crate_index//:strum_macros", - ], version = "0.9.0", visibility = [ "//rs/canister_client:__subpackages__", @@ -16,22 +13,13 @@ rust_library( "//rs/validator/http_request_test_utils:__subpackages__", ], deps = [ - "//rs/crypto/internal/crypto_lib/types", "//rs/crypto/internal/csp_test_utils", - "//rs/crypto/tls_interfaces", - "//rs/interfaces", "//rs/interfaces/registry", - "//rs/protobuf", "//rs/registry/fake", - "//rs/registry/helpers", - "//rs/registry/keys", "//rs/registry/proto_data_provider", "//rs/types/types", - "//rs/types/types_test_utils", "@crate_index//:ed25519-consensus", "@crate_index//:rand", "@crate_index//:rand_chacha", - "@crate_index//:serde", - "@crate_index//:tokio", ], ) diff --git a/rs/crypto/test_utils/Cargo.toml b/rs/crypto/test_utils/Cargo.toml index 6dc9b298f63..27530e0a7bb 100644 --- a/rs/crypto/test_utils/Cargo.toml +++ b/rs/crypto/test_utils/Cargo.toml @@ -8,20 +8,10 @@ documentation.workspace = true [dependencies] ic-crypto-internal-csp-test-utils = { path = "../internal/csp_test_utils" } -ic-crypto-internal-types = { path = "../internal/crypto_lib/types" } -ic-crypto-tls-interfaces = { path = "../tls_interfaces" } -ic-interfaces = { path = "../../interfaces" } ic-interfaces-registry = { path = "../../interfaces/registry" } -ic-protobuf = { path = "../../protobuf" } ic-registry-client-fake = { path = "../../registry/fake" } -ic-registry-client-helpers = { path = "../../registry/helpers" } -ic-registry-keys = { path = "../../registry/keys" } ic-registry-proto-data-provider = { path = "../../registry/proto_data_provider" } ic-types = { path = "../../types/types" } -ic-types-test-utils = { path = "../../types/types_test_utils" } ed25519-consensus = "2.0.1" rand = "0.8" rand_chacha = "0.3" -serde = { workspace = true } -strum_macros = { workspace = true } -tokio = { workspace = true } diff --git a/rs/crypto/test_utils/canister_sigs/BUILD.bazel b/rs/crypto/test_utils/canister_sigs/BUILD.bazel index 88de6de70a6..f8283409cae 100644 --- a/rs/crypto/test_utils/canister_sigs/BUILD.bazel +++ b/rs/crypto/test_utils/canister_sigs/BUILD.bazel @@ -11,19 +11,10 @@ rust_library( "//rs/certification/test-utils", "//rs/crypto/internal/crypto_lib/basic_sig/iccsa", "//rs/crypto/internal/crypto_lib/basic_sig/iccsa/test_utils", - "//rs/crypto/internal/crypto_lib/types", "//rs/crypto/temp_crypto", "//rs/crypto/test_utils", - "//rs/interfaces/registry", - "//rs/protobuf", - "//rs/registry/fake", - "//rs/registry/keys", - "//rs/registry/proto_data_provider", "//rs/types/types", - "//rs/types/types_test_utils", "@crate_index//:rand", "@crate_index//:rand_chacha", - "@crate_index//:serde", - "@crate_index//:serde_cbor", ], ) diff --git a/rs/crypto/test_utils/canister_sigs/Cargo.toml b/rs/crypto/test_utils/canister_sigs/Cargo.toml index 45bd4637336..23fc23673f2 100644 --- a/rs/crypto/test_utils/canister_sigs/Cargo.toml +++ b/rs/crypto/test_utils/canister_sigs/Cargo.toml @@ -10,17 +10,8 @@ documentation.workspace = true ic-certification-test-utils = { path = "../../../certification/test-utils" } ic-crypto-internal-basic-sig-iccsa = { path = "../../internal/crypto_lib/basic_sig/iccsa" } ic-crypto-internal-basic-sig-iccsa-test-utils = { path = "../../internal/crypto_lib/basic_sig/iccsa/test_utils" } -ic-crypto-internal-types = { path= "../../../crypto/internal/crypto_lib/types" } ic-crypto-temp-crypto = { path = "../../temp_crypto" } ic-crypto-test-utils = { path = ".." } -ic-interfaces-registry = { path = "../../../interfaces/registry" } -ic-protobuf = { path = "../../../protobuf" } -ic-registry-client-fake = { path = "../../../registry/fake" } -ic-registry-keys = { path = "../../../registry/keys" } -ic-registry-proto-data-provider = { path = "../../../registry/proto_data_provider" } ic-types = { path = "../../../types/types" } -ic-types-test-utils = { path = "../../../types/types_test_utils" } rand = "0.8.3" rand_chacha = "0.3" -serde = { workspace = true } -serde_cbor = { workspace = true } diff --git a/rs/crypto/test_utils/canister_threshold_sigs/BUILD.bazel b/rs/crypto/test_utils/canister_threshold_sigs/BUILD.bazel index 374733c250c..0e2f652fcec 100644 --- a/rs/crypto/test_utils/canister_threshold_sigs/BUILD.bazel +++ b/rs/crypto/test_utils/canister_threshold_sigs/BUILD.bazel @@ -9,9 +9,7 @@ rust_library( version = "0.9.0", deps = [ "//rs/crypto/internal/crypto_lib/threshold_sig/tecdsa", - "//rs/crypto/internal/crypto_service_provider", "//rs/crypto/temp_crypto", - "//rs/crypto/test_utils/reproducible_rng", "//rs/interfaces", "//rs/monitoring/logger", "//rs/protobuf", @@ -20,7 +18,6 @@ rust_library( "//rs/registry/proto_data_provider", "//rs/test_utilities/in_memory_logger", "//rs/types/types", - "@crate_index//:assert_matches", "@crate_index//:rand", "@crate_index//:rand_chacha", ], diff --git a/rs/crypto/test_utils/canister_threshold_sigs/Cargo.toml b/rs/crypto/test_utils/canister_threshold_sigs/Cargo.toml index 8009a28942b..14e4a94599c 100644 --- a/rs/crypto/test_utils/canister_threshold_sigs/Cargo.toml +++ b/rs/crypto/test_utils/canister_threshold_sigs/Cargo.toml @@ -7,10 +7,8 @@ description.workspace = true documentation.workspace = true [dependencies] -ic-crypto-internal-csp = { path = "../../internal/crypto_service_provider" } ic-crypto-internal-threshold-sig-ecdsa = { path = "../../internal/crypto_lib/threshold_sig/tecdsa" } ic-crypto-temp-crypto = { path = "../../temp_crypto" } -ic-crypto-test-utils-reproducible-rng = { path = "../../test_utils/reproducible_rng" } ic-interfaces = { path = "../../../interfaces" } ic-logger = { path = "../../../monitoring/logger" } ic-protobuf = { path = "../../../protobuf" } @@ -19,6 +17,5 @@ ic-registry-keys = { path = "../../../registry/keys" } ic-registry-proto-data-provider = { path = "../../../registry/proto_data_provider" } ic-test-utilities-in-memory-logger = { path = "../../../test_utilities/in_memory_logger" } ic-types = { path = "../../../types/types" } -assert_matches = "1.5.0" rand = "0.8" rand_chacha = "0.3" diff --git a/rs/crypto/test_utils/local_csp_vault/BUILD.bazel b/rs/crypto/test_utils/local_csp_vault/BUILD.bazel index 1b2476565a8..3549324535a 100644 --- a/rs/crypto/test_utils/local_csp_vault/BUILD.bazel +++ b/rs/crypto/test_utils/local_csp_vault/BUILD.bazel @@ -13,7 +13,6 @@ DEPENDENCIES = [ "//rs/protobuf", "//rs/types/types", "@crate_index//:mockall", - "@crate_index//:serde_bytes", ] MACRO_DEPENDENCIES = [] diff --git a/rs/crypto/test_utils/local_csp_vault/Cargo.toml b/rs/crypto/test_utils/local_csp_vault/Cargo.toml index bde3a8212a1..70484d64f8f 100644 --- a/rs/crypto/test_utils/local_csp_vault/Cargo.toml +++ b/rs/crypto/test_utils/local_csp_vault/Cargo.toml @@ -7,14 +7,13 @@ edition.workspace = true documentation.workspace = true [dependencies] -ic-crypto-internal-csp = { path = "../../internal/crypto_service_provider"} +ic-crypto-internal-csp = { path = "../../internal/crypto_service_provider" } ic-crypto-internal-seed = { path = "../../internal/crypto_lib/seed" } ic-crypto-internal-threshold-sig-bls12381 = { path = "../../internal/crypto_lib/threshold_sig/bls12_381" } ic-crypto-internal-threshold-sig-ecdsa = { path = "../../internal/crypto_lib/threshold_sig/tecdsa" } ic-crypto-internal-types = { path = "../../internal/crypto_lib/types" } -ic-crypto-node-key-validation = {path = "../../node_key_validation" } +ic-crypto-node-key-validation = { path = "../../node_key_validation" } ic-crypto-tls-interfaces = { path = "../../tls_interfaces" } ic-protobuf = { path = "../../../protobuf" } ic-types = { path = "../../../types/types" } mockall = { workspace = true } -serde_bytes = { workspace = true } \ No newline at end of file diff --git a/rs/crypto/test_utils/metrics/BUILD.bazel b/rs/crypto/test_utils/metrics/BUILD.bazel index 065302f8e89..142a73b5740 100644 --- a/rs/crypto/test_utils/metrics/BUILD.bazel +++ b/rs/crypto/test_utils/metrics/BUILD.bazel @@ -6,13 +6,9 @@ DEPENDENCIES = [ "//rs/crypto/internal/logmon", "//rs/monitoring/metrics", "//rs/test_utilities/metrics", - "@crate_index//:prometheus", - "@crate_index//:strum", ] -MACRO_DEPENDENCIES = [ - "@crate_index//:strum_macros", -] +MACRO_DEPENDENCIES = [] DEV_DEPENDENCIES = [] diff --git a/rs/crypto/test_utils/metrics/Cargo.toml b/rs/crypto/test_utils/metrics/Cargo.toml index 3fa1f6074a1..a4a7f65021a 100644 --- a/rs/crypto/test_utils/metrics/Cargo.toml +++ b/rs/crypto/test_utils/metrics/Cargo.toml @@ -10,6 +10,3 @@ documentation.workspace = true ic-crypto-internal-logmon = { path = "../../internal/logmon" } ic-metrics = { path = "../../../monitoring/metrics" } ic-test-utilities-metrics = { path = "../../../test_utilities/metrics" } -prometheus = { workspace = true } -strum = { workspace = true } -strum_macros = { workspace = true } diff --git a/rs/crypto/test_utils/ni-dkg/BUILD.bazel b/rs/crypto/test_utils/ni-dkg/BUILD.bazel index a2d8d21d056..f10c99a3798 100644 --- a/rs/crypto/test_utils/ni-dkg/BUILD.bazel +++ b/rs/crypto/test_utils/ni-dkg/BUILD.bazel @@ -5,7 +5,6 @@ package(default_visibility = ["//visibility:public"]) DEPENDENCIES = [ "//rs/crypto/internal/crypto_lib/bls12_381/type", "//rs/crypto/internal/crypto_lib/types", - "//rs/crypto/internal/crypto_service_provider", "//rs/crypto/temp_crypto", "//rs/crypto/test_utils/reproducible_rng", "//rs/interfaces", diff --git a/rs/crypto/test_utils/ni-dkg/Cargo.toml b/rs/crypto/test_utils/ni-dkg/Cargo.toml index 45e6f6e90d0..23c19596e12 100644 --- a/rs/crypto/test_utils/ni-dkg/Cargo.toml +++ b/rs/crypto/test_utils/ni-dkg/Cargo.toml @@ -12,7 +12,6 @@ documentation.workspace = true hex = "0.4.2" ic-crypto-internal-bls12-381-type = { path = "../../internal/crypto_lib/bls12_381/type" } ic-crypto-internal-types = { path = "../../internal/crypto_lib/types" } -ic-crypto-internal-csp = { path = "../../internal/crypto_service_provider" } ic-crypto-temp-crypto = { path = "../../temp_crypto" } ic-crypto-test-utils-reproducible-rng = { path = "../../test_utils/reproducible_rng" } ic-interfaces = { path = "../../../interfaces" } diff --git a/rs/crypto/utils/ni_dkg/BUILD.bazel b/rs/crypto/utils/ni_dkg/BUILD.bazel index ae9655e2b24..6588535ccea 100644 --- a/rs/crypto/utils/ni_dkg/BUILD.bazel +++ b/rs/crypto/utils/ni_dkg/BUILD.bazel @@ -6,7 +6,6 @@ DEPENDENCIES = [ "//rs/crypto/internal/crypto_lib/types", "//rs/protobuf", "//rs/types/types", - "@crate_index//:serde_cbor", ] DEV_DEPENDENCIES = [ diff --git a/rs/crypto/utils/ni_dkg/Cargo.toml b/rs/crypto/utils/ni_dkg/Cargo.toml index 2683cc7467c..1af515acc97 100644 --- a/rs/crypto/utils/ni_dkg/Cargo.toml +++ b/rs/crypto/utils/ni_dkg/Cargo.toml @@ -9,7 +9,6 @@ edition = "2021" ic-crypto-internal-types = { path = "../../internal/crypto_lib/types" } ic-protobuf = { path = "../../../protobuf" } ic-types = { path = "../../../types/types" } -serde_cbor = "0.11.1" [dev-dependencies] ic-base-types = { path = "../../../types/base_types" }