From 9a4d37c3c7d47393a79849837e38359fc68c5350 Mon Sep 17 00:00:00 2001
From: Miraculous Owonubi <omiraculous@gmail.com>
Date: Wed, 11 Aug 2021 15:33:18 +0100
Subject: [PATCH] move near_network_primitives::metrics back into near_network

---
 Cargo.lock                                           | 1 -
 chain/network-primitives/Cargo.toml                  | 1 -
 chain/network-primitives/src/lib.rs                  | 1 -
 chain/network/src/lib.rs                             | 2 +-
 chain/{network-primitives => network}/src/metrics.rs | 0
 chain/network/src/peer.rs                            | 6 ++++--
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename chain/{network-primitives => network}/src/metrics.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 5f73bbe830a..00f00dcfd58 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3074,7 +3074,6 @@ dependencies = [
  "futures",
  "lazy_static",
  "near-crypto",
- "near-metrics",
  "near-primitives",
  "serde",
  "serde_json",
diff --git a/chain/network-primitives/Cargo.toml b/chain/network-primitives/Cargo.toml
index 45d06c77d47..391bc23b561 100644
--- 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
index 0ec5e89e27d..01127971b7f 100644
--- 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
index 0ed4c79bf02..6d40e4055ca 100644
--- 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 b/chain/network/src/metrics.rs
similarity index 100%
rename from chain/network-primitives/src/metrics.rs
rename to chain/network/src/metrics.rs
diff --git a/chain/network/src/peer.rs b/chain/network/src/peer.rs
index b37c7a9e1fa..8ca9e2c626e 100644
--- 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;