Remove serde from near-client-primitives. (#5515)

We should remove `serde` from `near-client-primitives`. It's only needed by `jsonrpc`. More changes will be required, to separate `jsonrpc` api, from rest of the code base, but that's a first step. See #5516 Blocks #5428 (review)
near · Nov 29, 2021 · 4b68972 · 4b68972
1 parent 3ad7dc9
commit 4b68972
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain/client-primitives/Cargo.toml b/chain/client-primitives/Cargo.toml
@@ -13,7 +13,6 @@ description = "This crate hosts NEAR client-related error types"
 [dependencies]
 actix = "=0.11.0-beta.2"
 chrono = { version = "0.4.4", features = ["serde"] }
-serde = { version = "1", features = ["derive"] }
 strum = { version = "0.20", features = ["derive"] }
 thiserror = "1.0"
 

diff --git a/chain/client-primitives/src/types.rs b/chain/client-primitives/src/types.rs
@@ -5,7 +5,6 @@ use std::sync::Arc;
 use actix::Message;
 use chrono::DateTime;
 use near_primitives::time::Utc;
-use serde::{Deserialize, Serialize};
 
 use near_chain_configs::ProtocolConfigView;
 use near_network_primitives::types::{AccountOrPeerIdOrHash, KnownProducer, PeerInfo};
@@ -462,7 +461,7 @@ impl From<near_chain_primitives::Error> for GetGasPriceError {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Debug)]
 pub struct NetworkInfoResponse {
     pub active_peers: Vec<PeerInfo>,
     pub num_active_peers: usize,

diff --git a/chain/jsonrpc-primitives/Cargo.toml b/chain/jsonrpc-primitives/Cargo.toml
@@ -24,6 +24,7 @@ near-client-primitives = { path = "../client-primitives" }
 near-crypto = { path = "../../core/crypto" }
 near-metrics = { path = "../../core/metrics" }
 near-primitives = { path = "../../core/primitives" }
+near-network-primitives = { path = "../../chain/network-primitives" }
 near-primitives-core = { path = "../../core/primitives-core" }
 near-rpc-error-macro = { path = "../../tools/rpctypegen/macro" }
 

diff --git a/chain/jsonrpc-primitives/src/types/network_info.rs b/chain/jsonrpc-primitives/src/types/network_info.rs
@@ -1,9 +1,15 @@
+use near_network_primitives::types::{KnownProducer, PeerInfo};
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Debug)]
+#[derive(Serialize, Deserialize, Debug)]
 pub struct RpcNetworkInfoResponse {
-    #[serde(flatten)]
-    pub network_info_response: near_client_primitives::types::NetworkInfoResponse,
+    pub active_peers: Vec<PeerInfo>,
+    pub num_active_peers: usize,
+    pub peer_max_count: u32,
+    pub sent_bytes_per_sec: u64,
+    pub received_bytes_per_sec: u64,
+    /// Accounts of known block and chunk producers from routing table.
+    pub known_producers: Vec<KnownProducer>,
 }
 
 #[derive(thiserror::Error, Debug, Serialize, Deserialize)]
@@ -15,7 +21,14 @@ pub enum RpcNetworkInfoError {
 
 impl From<near_client_primitives::types::NetworkInfoResponse> for RpcNetworkInfoResponse {
     fn from(network_info_response: near_client_primitives::types::NetworkInfoResponse) -> Self {
-        Self { network_info_response }
+        Self {
+            active_peers: network_info_response.active_peers,
+            num_active_peers: network_info_response.num_active_peers,
+            peer_max_count: network_info_response.peer_max_count,
+            sent_bytes_per_sec: network_info_response.sent_bytes_per_sec,
+            received_bytes_per_sec: network_info_response.received_bytes_per_sec,
+            known_producers: network_info_response.known_producers,
+        }
     }
 }