Merge branch 'rumenov/transpeede' into 'master'

chore: remove unused deps

 

See merge request dfinity-lab/public/ic!14816

rs/p2p/peer_manager/BUILD.bazel

@@ -11,15 +11,15 @@ DEPENDENCIES = [
     "//rs/monitoring/logger",
     "//rs/monitoring/metrics",
     "//rs/registry/helpers",
-    "//rs/types/types",
+    "//rs/types/base_types",
     "@crate_index//:prometheus",
     "@crate_index//:slog",
     "@crate_index//:tokio",
 ]
 
 DEV_DEPENDENCIES = [
     "//rs/p2p/test_utils",
-    "//rs/test_utilities",
+    "//rs/types/types_test_utils",
     "//rs/test_utilities/logger",
 ]
 

rs/p2p/peer_manager/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 ic-interfaces = { path = "../../interfaces" }
 ic-interfaces-registry = { path = "../../interfaces/registry" }
-ic-types = { path = "../../types/types" }
+ic-base-types = { path = "../../types/base_types" }
 ic-logger = { path = "../../monitoring/logger" }
 ic-metrics = { path = "../../monitoring/metrics" }
 ic-registry-client-helpers = { path = "../../registry/helpers" }
@@ -19,5 +19,5 @@ tokio = { version = "1.32.0", features = ["full"] }
 
 [dev-dependencies]
 ic-p2p-test-utils = { path = "../test_utils" }
-ic-test-utilities = { path = "../../test_utilities" }
+ic-types-test-utils = { path = "../../types/types_test_utils" }
 ic-test-utilities-logger = { path = "../../test_utilities/logger" }

rs/p2p/peer_manager/src/lib.rs

@@ -17,12 +17,12 @@ use std::{
     time::Duration,
 };
 
+use ic_base_types::{NodeId, RegistryVersion, SubnetId};
 use ic_interfaces::consensus_pool::ConsensusPoolCache;
 use ic_interfaces_registry::RegistryClient;
 use ic_logger::{warn, ReplicaLogger};
 use ic_metrics::MetricsRegistry;
 use ic_registry_client_helpers::subnet::SubnetTransportRegistry;
-use ic_types::{NodeId, RegistryVersion, SubnetId};
 use metrics::PeerManagerMetrics;
 use tokio::{
     runtime::Handle,

rs/p2p/peer_manager/tests/test.rs

@@ -1,13 +1,13 @@
 use std::sync::atomic::Ordering;
 
+use ic_base_types::RegistryVersion;
 use ic_interfaces_registry::RegistryClient;
 use ic_p2p_test_utils::{
     create_peer_manager_and_registry_handle, create_peer_manager_with_local_store,
     mainnet_app_subnet, mainnet_nns_subnet,
 };
-use ic_test_utilities::types::ids::node_test_id;
 use ic_test_utilities_logger::with_test_replica_logger;
-use ic_types::RegistryVersion;
+use ic_types_test_utils::ids::node_test_id;
 
 #[test]
 fn test_single_node() {

rs/p2p/quic_transport/BUILD.bazel

@@ -11,14 +11,13 @@ DEPENDENCIES = [
     "//rs/crypto/tls_interfaces",
     "//rs/crypto/utils/tls",
     "//rs/ic_os/sev_interfaces",
-    "//rs/interfaces",
     "//rs/interfaces/registry",
     "//rs/monitoring/logger",
     "//rs/monitoring/metrics",
     "//rs/p2p/peer_manager",
     "//rs/phantom_newtype",
     "//rs/registry/helpers",
-    "//rs/types/types",
+    "//rs/types/base_types",
     "@crate_index//:axum",
     "@crate_index//:bincode",
     "@crate_index//:bytes",

rs/p2p/quic_transport/Cargo.toml

@@ -18,9 +18,8 @@ ic-async-utils = { path = "../../async_utils" }
 ic-crypto-tls-interfaces = { path = "../../crypto/tls_interfaces" }
 ic-crypto-utils-tls = { path = "../../crypto/utils/tls" }
 ic-icos-sev-interfaces = { path = "../../ic_os/sev_interfaces" }
-ic-interfaces = { path = "../../interfaces" }
 ic-interfaces-registry = { path = "../../interfaces/registry" }
-ic-types = { path = "../../types/types" }
+ic-base-types = { path = "../../types/base_types" }
 ic-logger = { path = "../../monitoring/logger" }
 ic-metrics = { path = "../../monitoring/metrics" }
 ic-peer-manager = { path = "../../p2p/peer_manager" }

rs/p2p/quic_transport/benches/bench.rs

@@ -12,6 +12,7 @@ use criterion::{
 };
 use either::Either;
 use http::Request;
+use ic_base_types::NodeId;
 use ic_icos_sev::Sev;
 use ic_logger::{replica_logger::no_op_logger, ReplicaLogger};
 use ic_metrics::MetricsRegistry;
@@ -20,7 +21,6 @@ use ic_p2p_test_utils::{
 };
 use ic_peer_manager::SubnetTopology;
 use ic_quic_transport::{DummyUdpSocket, QuicTransport, Transport};
-use ic_types::NodeId;
 use ic_types_test_utils::ids::node_test_id;
 use tokio::{
     runtime::{Handle, Runtime},

rs/p2p/quic_transport/src/connection_handle.rs

@@ -6,7 +6,7 @@
 //!
 use bytes::Bytes;
 use http::{Request, Response};
-use ic_types::NodeId;
+use ic_base_types::NodeId;
 use quinn::Connection;
 
 use crate::{

rs/p2p/quic_transport/src/connection_manager.rs

@@ -40,6 +40,7 @@ use axum::Router;
 use either::Either;
 use futures::StreamExt;
 use ic_async_utils::JoinMap;
+use ic_base_types::{NodeId, RegistryVersion};
 use ic_crypto_tls_interfaces::{
     AllowedClients, MalformedPeerCertificateError, SomeOrAllNodes, TlsConfig, TlsConfigError,
     TlsStream,
@@ -52,7 +53,6 @@ use ic_interfaces_registry::RegistryClient;
 use ic_logger::{error, info, ReplicaLogger};
 use ic_metrics::MetricsRegistry;
 use ic_peer_manager::SubnetTopology;
-use ic_types::{NodeId, RegistryVersion};
 use quinn::{
     AsyncUdpSocket, ConnectError, Connecting, Connection, ConnectionError, Endpoint,
     EndpointConfig, RecvStream, SendStream, VarInt,

rs/p2p/quic_transport/src/lib.rs

@@ -40,13 +40,13 @@ use axum::Router;
 use bytes::Bytes;
 use either::Either;
 use http::{Request, Response};
+use ic_base_types::NodeId;
 use ic_crypto_tls_interfaces::{TlsConfig, TlsStream};
 use ic_icos_sev_interfaces::ValidateAttestedStream;
 use ic_interfaces_registry::RegistryClient;
 use ic_logger::{info, ReplicaLogger};
 use ic_metrics::MetricsRegistry;
 use ic_peer_manager::SubnetTopology;
-use ic_types::NodeId;
 use phantom_newtype::AmountOf;
 use quinn::AsyncUdpSocket;
 

rs/p2p/quic_transport/src/metrics.rs

@@ -1,5 +1,5 @@
+use ic_base_types::NodeId;
 use ic_metrics::{tokio_metrics_collector::TokioTaskMetricsCollector, MetricsRegistry};
-use ic_types::NodeId;
 use prometheus::{GaugeVec, IntCounter, IntCounterVec, IntGauge};
 use quinn::Connection;
 use tokio_metrics::TaskMonitor;

rs/p2p/quic_transport/src/request_handler.rs

@@ -13,8 +13,8 @@
 use std::time::Duration;
 
 use axum::Router;
+use ic_base_types::NodeId;
 use ic_logger::{info, ReplicaLogger};
-use ic_types::NodeId;
 use quinn::{Connection, RecvStream, SendStream};
 use tower::ServiceExt;
 

rs/p2p/quic_transport/tests/common.rs

@@ -3,10 +3,10 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+use ic_base_types::{NodeId, RegistryVersion};
 use ic_crypto_tls_interfaces::{AllowedClients, TlsConfig, TlsConfigError};
 use ic_icos_sev_interfaces::{ValidateAttestationError, ValidateAttestedStream};
 use ic_p2p_test_utils::{temp_crypto_component_with_tls_keys, RegistryConsensusHandle};
-use ic_types::{NodeId, RegistryVersion};
 use tokio::io::{AsyncRead, AsyncWrite};
 use tokio_rustls::rustls::{ClientConfig, ServerConfig};
 

rs/p2p/quic_transport/tests/test.rs

@@ -5,6 +5,7 @@ use bytes::Bytes;
 use either::Either;
 use futures::FutureExt;
 use http::Request;
+use ic_base_types::{NodeId, RegistryVersion};
 use ic_icos_sev::Sev;
 use ic_logger::info;
 use ic_metrics::MetricsRegistry;
@@ -18,7 +19,6 @@ use ic_p2p_test_utils::{
 };
 use ic_quic_transport::{DummyUdpSocket, QuicTransport, Transport};
 use ic_test_utilities_logger::with_test_replica_logger;
-use ic_types::{NodeId, RegistryVersion};
 use ic_types_test_utils::ids::{NODE_1, NODE_2, NODE_3, NODE_4, NODE_5};
 use tokio::sync::Notify;
 use turmoil::Builder;