[network] move ChainId to Libra types

Closes: #4969
Approved by: aching

config/src/config/mod.rs

@@ -44,9 +44,9 @@ pub use safety_rules_config::*;
 mod upstream_config;
 pub use upstream_config::*;
 mod test_config;
-use crate::{chain_id::ChainId, network_id::NetworkId};
+use crate::network_id::NetworkId;
 use libra_secure_storage::{KVStorage, Storage};
-use libra_types::waypoint::Waypoint;
+use libra_types::{chain_id::ChainId, waypoint::Waypoint};
 pub use test_config::*;
 
 /// Config pulls in configuration information from the config file.

config/src/lib.rs

@@ -3,7 +3,6 @@
 
 #![forbid(unsafe_code)]
 
-pub mod chain_id;
 pub mod config;
 pub mod generator;
 pub mod keys;

network/builder/src/builder.rs

@@ -11,7 +11,6 @@
 //! long as the latter is in its trusted peers set.
 use channel::{self, message_queues::QueueStyle};
 use libra_config::{
-    chain_id::ChainId,
     config::{DiscoveryMethod, NetworkConfig, RoleType, HANDSHAKE_VERSION},
     network_id::{NetworkContext, NetworkId},
 };
@@ -22,7 +21,7 @@ use libra_network_address::{
     encrypted::{TEST_SHARED_VAL_NETADDR_KEY, TEST_SHARED_VAL_NETADDR_KEY_VERSION},
     NetworkAddress,
 };
-use libra_types::PeerId;
+use libra_types::{chain_id::ChainId, PeerId};
 use network::{
     connectivity_manager::{builder::ConnectivityManagerBuilder, ConnectivityRequest},
     constants,

network/builder/src/dummy.rs

@@ -6,11 +6,11 @@
 use crate::builder::NetworkBuilder;
 use channel::message_queues::QueueStyle;
 use futures::{executor::block_on, StreamExt};
-use libra_config::{chain_id::ChainId, config::RoleType, network_id::NetworkId};
+use libra_config::{config::RoleType, network_id::NetworkId};
 use libra_crypto::{test_utils::TEST_SEED, x25519, Uniform};
 use libra_metrics::IntCounterVec;
 use libra_network_address::NetworkAddress;
-use libra_types::PeerId;
+use libra_types::{chain_id::ChainId, PeerId};
 use netcore::transport::ConnectionOrigin;
 use network::{
     constants::{MAX_FRAME_SIZE, NETWORK_CHANNEL_SIZE},

network/src/peer_manager/builder.rs

@@ -13,12 +13,12 @@ use crate::{
     ProtocolId,
 };
 use channel::{self, libra_channel, message_queues::QueueStyle};
-use libra_config::{chain_id::ChainId, config::HANDSHAKE_VERSION, network_id::NetworkContext};
+use libra_config::{config::HANDSHAKE_VERSION, network_id::NetworkContext};
 use libra_crypto::x25519;
 use libra_logger::prelude::*;
 use libra_metrics::IntCounterVec;
 use libra_network_address::NetworkAddress;
-use libra_types::PeerId;
+use libra_types::{chain_id::ChainId, PeerId};
 use netcore::transport::{
     memory::MemoryTransport,
     tcp::{TcpSocket, TcpTransport},

network/src/protocols/wire/handshake/v1/mod.rs

@@ -10,7 +10,8 @@
 //! supported over that messaging protocol. On receipt, both ends will determine the highest
 //! intersecting messaging protocol version and use that for the remainder of the session.
 
-use libra_config::{chain_id::ChainId, network_id::NetworkId};
+use libra_config::network_id::NetworkId;
+use libra_types::chain_id::ChainId;
 use serde::{Deserialize, Serialize};
 use std::{collections::BTreeMap, convert::TryInto, fmt, iter::Iterator};
 

network/src/transport.rs

@@ -14,11 +14,11 @@ use futures::{
     io::{AsyncRead, AsyncWrite},
     stream::{Stream, StreamExt, TryStreamExt},
 };
-use libra_config::{chain_id::ChainId, config::HANDSHAKE_VERSION, network_id::NetworkId};
+use libra_config::{config::HANDSHAKE_VERSION, network_id::NetworkId};
 use libra_crypto::x25519;
 use libra_logger::prelude::*;
 use libra_network_address::{parse_dns_tcp, parse_ip_tcp, parse_memory, NetworkAddress};
-use libra_types::PeerId;
+use libra_types::{chain_id::ChainId, PeerId};
 use netcore::transport::{tcp, ConnectionOrigin, Transport};
 use serde::Serialize;
 use std::{

types/src/lib.rs

@@ -10,6 +10,7 @@ pub mod account_state;
 pub mod account_state_blob;
 pub mod block_info;
 pub mod block_metadata;
+pub mod chain_id;
 pub mod contract_event;
 pub mod epoch_change;
 pub mod epoch_state;