move near_network_primitives::metrics back into near_network

near · Aug 11, 2021 · 9a4d37c · 9a4d37c
1 parent be74434
commit 9a4d37c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain/network-primitives/Cargo.toml b/chain/network-primitives/Cargo.toml
@@ -20,7 +20,6 @@ lazy_static = "1.4"
 
 near-crypto = { path = "../../core/crypto" }
 near-primitives = { path = "../../core/primitives" }
-near-metrics = { path = "../../core/metrics" }
 
 [features]
 adversarial = []

diff --git a/chain/network-primitives/src/lib.rs b/chain/network-primitives/src/lib.rs
@@ -1,6 +1,5 @@
 #[cfg(feature = "metric_recorder")]
 pub mod recorder;
 
-pub mod metrics;
 pub mod routing;
 pub mod types;
diff --git a/chain/network/src/lib.rs b/chain/network/src/lib.rs
@@ -5,12 +5,12 @@ pub use near_network_primitives::types::{
 pub use peer::{EPOCH_SYNC_PEER_TIMEOUT_MS, EPOCH_SYNC_REQUEST_TIMEOUT_MS};
 pub use peer_manager::PeerManagerActor;
 
-pub use near_network_primitives::metrics;
 #[cfg(feature = "metric_recorder")]
 pub use near_network_primitives::recorder;
 
 mod cache;
 mod codec;
+pub mod metrics;
 mod peer;
 mod peer_manager;
 pub mod peer_store;

diff --git a/chain/network-primitives/src/metrics.rs → chain/network/src/metrics.rs b/chain/network-primitives/src/metrics.rs → chain/network/src/metrics.rs
diff --git a/chain/network/src/peer.rs b/chain/network/src/peer.rs
@@ -41,10 +41,12 @@ use crate::types::{
     UPDATE_INTERVAL_LAST_TIME_RECEIVED_MESSAGE,
 };
 use crate::PeerManagerActor;
-use crate::{metrics::NetworkMetrics, NetworkResponses};
+use crate::{
+    metrics::{self, NetworkMetrics},
+    NetworkResponses,
+};
 #[cfg(feature = "delay_detector")]
 use delay_detector::DelayDetector;
-use near_network_primitives::metrics;
 use near_performance_metrics_macros::perf;
 use near_primitives::sharding::PartialEncodedChunk;
 use near_rust_allocator_proxy::allocator::get_tid;