Refactored *Configs into separate crates to resolve dependency cycles…

… for #2007

Cargo.toml

@@ -8,8 +8,10 @@ edition = "2018"
 
 [workspace]
 members = [
+    "core/chain-configs",
     "core/crypto",
     "core/primitives",
+    "core/runtime-configs",
     "core/store",
     "core/metrics",
     "runtime/runtime",
@@ -47,6 +49,7 @@ serde_json = "1.0.0"
 reqwest = "0.10"
 futures = "0.3"
 
+near-chain-configs = { path = "./core/chain-configs" }
 near-crypto = { path = "./core/crypto" }
 near-primitives = { path = "./core/primitives" }
 near-store = { path = "./core/store" }

chain/chain/Cargo.toml

@@ -19,6 +19,7 @@ lazy_static = "1.4"
 
 borsh = "0.2.10"
 
+near-chain-configs = { path = "../../core/chain-configs" }
 near-crypto = { path = "../../core/crypto" }
 near-primitives = { path = "../../core/primitives" }
 near-store = { path = "../../core/store" }

chain/chain/src/chain.rs

@@ -7,6 +7,7 @@ use chrono::prelude::{DateTime, Utc};
 use chrono::Duration;
 use log::{debug, error, info};
 
+use near_chain_configs::GenesisConfig;
 use near_primitives::block::{genesis_chunks, Approval};
 use near_primitives::challenge::{
     BlockDoubleSign, Challenge, ChallengeBody, ChallengesResult, ChunkProofs, ChunkState,
@@ -209,6 +210,21 @@ impl ChainGenesis {
     }
 }
 
+impl From<GenesisConfig> for ChainGenesis {
+    fn from(genesis_config: GenesisConfig) -> Self {
+        ChainGenesis::new(
+            genesis_config.genesis_time,
+            genesis_config.gas_limit,
+            genesis_config.min_gas_price,
+            genesis_config.total_supply,
+            genesis_config.max_inflation_rate,
+            genesis_config.gas_price_adjustment_rate,
+            genesis_config.transaction_validity_period,
+            genesis_config.epoch_length,
+        )
+    }
+}
+
 /// Facade to the blockchain block processing and storage.
 /// Provides current view on the state according to the chain state.
 pub struct Chain {

chain/client/Cargo.toml

@@ -25,6 +25,7 @@ near-crypto = { path = "../../core/crypto" }
 near-primitives = { path = "../../core/primitives" }
 near-store = { path = "../../core/store" }
 near-metrics = { path = "../../core/metrics" }
+near-chain-configs = { path = "../../core/chain-configs" }
 near-chain = { path = "../chain" }
 near-network = { path = "../network" }
 near-pool = { path = "../pool" }

chain/client/src/client.rs

@@ -17,6 +17,7 @@ use near_chain::{
     BlockStatus, Chain, ChainGenesis, ChainStoreAccess, Doomslug, DoomslugThresholdMode,
     Provenance, RuntimeAdapter, Tip,
 };
+use near_chain_configs::ClientConfig;
 use near_chunks::{ProcessPartialEncodedChunkResult, ShardsManager};
 use near_network::{FullPeerInfo, NetworkAdapter, NetworkClientResponses, NetworkRequests};
 use near_primitives::block::{Approval, ApprovalMessage, Block, BlockHeader};
@@ -34,7 +35,7 @@ use near_store::Store;
 use crate::metrics;
 use crate::sync::{BlockSync, HeaderSync, StateSync, StateSyncResult};
 use crate::types::{Error, ShardSyncDownload};
-use crate::{BlockProducer, ClientConfig, SyncStatus};
+use crate::{BlockProducer, SyncStatus};
 
 pub struct Client {
     pub config: ClientConfig,

chain/client/src/client_actor.rs

@@ -14,6 +14,7 @@ use near_chain::{
     byzantine_assert, Block, BlockHeader, ChainGenesis, ChainStoreAccess, ErrorKind, Provenance,
     RuntimeAdapter,
 };
+use near_chain_configs::ClientConfig;
 use near_crypto::Signature;
 use near_network::types::{AnnounceAccount, NetworkInfo, PeerId, ReasonForBan, StateResponseInfo};
 use near_network::{
@@ -31,8 +32,8 @@ use crate::client::Client;
 use crate::info::InfoHelper;
 use crate::sync::{highest_height_peer, StateSyncResult};
 use crate::types::{
-    BlockProducer, ClientConfig, Error, GetNetworkInfo, NetworkInfoResponse, ShardSyncDownload,
-    ShardSyncStatus, Status, StatusSyncInfo, SyncStatus,
+    BlockProducer, Error, GetNetworkInfo, NetworkInfoResponse, ShardSyncDownload, ShardSyncStatus,
+    Status, StatusSyncInfo, SyncStatus,
 };
 use crate::StatusResponse;
 use near_chain::test_utils::format_hash;

chain/client/src/info.rs

@@ -7,12 +7,13 @@ use serde_json::json;
 use sysinfo::{get_current_pid, set_open_files_limit, Pid, ProcessExt, System, SystemExt};
 
 use near_chain::Tip;
+use near_chain_configs::ClientConfig;
 use near_network::types::{NetworkInfo, PeerId};
 use near_primitives::serialize::to_base;
 use near_primitives::types::Version;
 use near_telemetry::{telemetry, TelemetryActor};
 
-use crate::types::{BlockProducer, ClientConfig, ShardSyncStatus, SyncStatus};
+use crate::types::{BlockProducer, ShardSyncStatus, SyncStatus};
 use near_primitives::types::Gas;
 use std::cmp::min;
 

chain/client/src/lib.rs

@@ -4,9 +4,8 @@ extern crate lazy_static;
 pub use crate::client::Client;
 pub use crate::client_actor::ClientActor;
 pub use crate::types::{
-    BlockProducer, ClientConfig, Error, GetBlock, GetChunk, GetGasPrice, GetKeyValueChanges,
-    GetNetworkInfo, GetNextLightClientBlock, GetValidatorInfo, Query, Status, StatusResponse,
-    SyncStatus, TxStatus,
+    BlockProducer, Error, GetBlock, GetChunk, GetGasPrice, GetKeyValueChanges, GetNetworkInfo,
+    GetNextLightClientBlock, GetValidatorInfo, Query, Status, StatusResponse, SyncStatus, TxStatus,
 };
 pub use crate::view_client::ViewClientActor;
 

chain/client/src/test_utils.rs

@@ -11,6 +11,7 @@ use rand::{thread_rng, Rng};
 
 use near_chain::test_utils::KeyValueRuntime;
 use near_chain::{Chain, ChainGenesis, DoomslugThresholdMode, Provenance, RuntimeAdapter};
+use near_chain_configs::ClientConfig;
 use near_crypto::{InMemorySigner, KeyType, PublicKey};
 use near_network::types::{
     AccountOrPeerIdOrHash, NetworkInfo, NetworkViewClientMessages, NetworkViewClientResponses,
@@ -29,7 +30,7 @@ use near_store::test_utils::create_test_store;
 use near_store::Store;
 use near_telemetry::TelemetryActor;
 
-use crate::{BlockProducer, Client, ClientActor, ClientConfig, SyncStatus, ViewClientActor};
+use crate::{BlockProducer, Client, ClientActor, SyncStatus, ViewClientActor};
 use near_network::routing::EdgeInfo;
 use near_primitives::hash::{hash, CryptoHash};
 use std::ops::Bound::{Excluded, Included, Unbounded};