refactor(chain): expunge rocksdb from near-jsonrpc-primitives dependency tree

chain/chunks-primitives/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "near-chunks-primitives"
+version = "0.1.0"
+authors = ["Near Inc <hello@nearprotocol.com>"]
+edition = "2018"
+
+[dependencies]
+near-chain-primitives = { path = "../chain-primitives" }

chain/chunks/src/types.rs → chain/chunks-primitives/src/error.rs

@@ -1,3 +1,5 @@
+use std::fmt;
+
 #[derive(Debug)]
 pub enum Error {
     InvalidPartMessage,
@@ -10,12 +12,12 @@ pub enum Error {
     DuplicateChunkHeight,
     UnknownChunk,
     KnownPart,
-    ChainError(near_chain::Error),
+    ChainError(near_chain_primitives::Error),
     IOError(std::io::Error),
 }
 
-impl std::fmt::Display for Error {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         write!(f, "{:?}", self)
     }
 }
@@ -26,8 +28,8 @@ impl From<std::io::Error> for Error {
     }
 }
 
-impl From<near_chain::Error> for Error {
-    fn from(err: near_chain::Error) -> Self {
+impl From<near_chain_primitives::Error> for Error {
+    fn from(err: near_chain_primitives::Error) -> Self {
         Error::ChainError(err)
     }
 }

chain/chunks-primitives/src/lib.rs

@@ -0,0 +1,3 @@
+mod error;
+
+pub use error::Error;

chain/chunks/Cargo.toml

@@ -17,6 +17,7 @@ reed-solomon-erasure = "4"
 
 near-crypto = { path = "../../core/crypto" }
 near-primitives = { path = "../../core/primitives" }
+near-chunks-primitives = { path = "../chunks-primitives" }
 near-store = { path = "../../core/store" }
 near-network = { path = "../network" }
 near-chain = { path = "../chain" }

chain/chunks/src/lib.rs

@@ -40,12 +40,11 @@ use near_primitives::version::ProtocolVersion;
 use near_primitives::{checked_feature, unwrap_or_return};
 
 use crate::chunk_cache::{EncodedChunksCache, EncodedChunksCacheEntry};
-pub use crate::types::Error;
+pub use near_chunks_primitives::Error;
 use rand::Rng;
 
 mod chunk_cache;
 pub mod test_utils;
-mod types;
 
 const CHUNK_PRODUCER_BLACKLIST_SIZE: usize = 100;
 pub const CHUNK_REQUEST_RETRY_MS: u64 = 100;

chain/client-primitives/Cargo.toml

@@ -16,10 +16,10 @@ thiserror = "1.0"
 near-chain-primitives = { path = "../chain-primitives" }
 near-chain-configs = { path = "../../core/chain-configs" }
 
-near-chunks = { path = "../chunks" }
+near-chunks-primitives = { path = "../chunks-primitives" }
 near-crypto = { path = "../../core/crypto" }
-near-network = { path = "../network" }
+near-network-primitives = { path = "../network-primitives" }
 near-primitives = { path = "../../core/primitives" }
 
 [features]
-metric_recorder = []
+metric_recorder = ["near-network-primitives/metric_recorder"]

chain/client-primitives/src/types.rs

@@ -1,5 +1,5 @@
 #[cfg(feature = "metric_recorder")]
-use near_network::recorder::MetricRecorder;
+use near_network_primitives::recorder::MetricRecorder;
 use std::collections::HashMap;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
@@ -9,8 +9,7 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use near_chain_configs::ProtocolConfigView;
-use near_network::types::{AccountOrPeerIdOrHash, KnownProducer};
-use near_network::PeerInfo;
+use near_network_primitives::types::{AccountOrPeerIdOrHash, KnownProducer, PeerInfo};
 use near_primitives::errors::InvalidTxError;
 use near_primitives::hash::CryptoHash;
 use near_primitives::merkle::{MerklePath, PartialMerkleTree};
@@ -33,7 +32,7 @@ pub use near_primitives::views::{StatusResponse, StatusSyncInfo};
 #[derive(Debug)]
 pub enum Error {
     Chain(near_chain_primitives::Error),
-    Chunk(near_chunks::Error),
+    Chunk(near_chunks_primitives::Error),
     BlockProducer(String),
     ChunkProducer(String),
     Other(String),
@@ -66,8 +65,8 @@ impl From<near_chain_primitives::ErrorKind> for Error {
     }
 }
 
-impl From<near_chunks::Error> for Error {
-    fn from(err: near_chunks::Error) -> Self {
+impl From<near_chunks_primitives::Error> for Error {
+    fn from(err: near_chunks_primitives::Error) -> Self {
         Error::Chunk(err)
     }
 }

chain/client/Cargo.toml

@@ -56,7 +56,7 @@ near-test-contracts = { path = "../../runtime/near-test-contracts" }
 byzantine_asserts = ["near-chain/byzantine_asserts"]
 expensive_tests = []
 adversarial = ["near-network/adversarial", "near-chain/adversarial"]
-metric_recorder = ["near-client-primitives/metric_recorder"]
+metric_recorder = ["near-network/metric_recorder", "near-client-primitives/metric_recorder"]
 delay_detector = ["near-chain/delay_detector", "near-network/delay_detector", "delay-detector"]
 protocol_feature_block_header_v3 = ["near-primitives/protocol_feature_block_header_v3", "near-chain/protocol_feature_block_header_v3", "near-store/protocol_feature_block_header_v3"]
 protocol_feature_restore_receipts_after_fix = []

chain/network-primitives/Cargo.toml

@@ -0,0 +1,28 @@
+[package]
+name = "near-network-primitives"
+version = "0.1.0"
+authors = ["Near Inc <hello@nearprotocol.com>"]
+edition = "2018"
+
+[dependencies]
+actix = "=0.11.0-beta.2"
+tokio = { version = "1.1", features = ["full"] }
+futures = "0.3"
+chrono = { version = "0.4.4", features = ["serde"] }
+borsh = "0.8.1"
+serde = { version = "1", features = [ "derive" ] }
+serde_json = "1"
+strum = { version = "0.20", features = ["derive"] }
+tracing = "0.1.13"
+conqueue = "0.4.0"
+byteorder = "1.2"
+lazy_static = "1.4"
+
+near-crypto = { path = "../../core/crypto" }
+near-primitives = { path = "../../core/primitives" }
+near-metrics = { path = "../../core/metrics" }
+
+[features]
+adversarial = []
+metric_recorder = []
+sandbox = []

chain/network-primitives/src/lib.rs

@@ -0,0 +1,6 @@
+#[cfg(feature = "metric_recorder")]
+pub mod recorder;
+
+pub mod metrics;
+pub mod routing;
+pub mod types;

chain/network/src/metrics.rs → chain/network-primitives/src/metrics.rs

@@ -6,6 +6,8 @@ use near_metrics::{
 use std::collections::HashMap;
 use strum::VariantNames;
 
+use lazy_static::lazy_static;
+
 lazy_static! {
     pub static ref PEER_CONNECTIONS_TOTAL: near_metrics::Result<IntGauge> =
         try_create_int_gauge("near_peer_connections_total", "Number of connected peers");