minor network API cleanup

chain/network/src/network_protocol/testonly.rs

@@ -1,7 +1,7 @@
 use super::*;
 
 use crate::config;
-use crate::types::{AccountKeys, ChainInfo, Handshake, RoutingTableUpdate};
+use crate::types::{AccountKeys, ChainInfo};
 use near_crypto::{InMemorySigner, KeyType, SecretKey};
 use near_network_primitives::time;
 use near_network_primitives::types::{

chain/network/src/network_protocol/tests.rs

@@ -2,7 +2,6 @@ use super::*;
 use crate::network_protocol::testonly as data;
 use crate::network_protocol::Encoding;
 use crate::testonly::make_rng;
-use crate::types::{HandshakeFailureReason, PeerMessage};
 use anyhow::{bail, Context as _};
 use near_network_primitives::time;
 use near_network_primitives::types::{

chain/network/src/peer/peer_actor.rs

@@ -2,6 +2,7 @@ use crate::accounts_data;
 use crate::concurrency::atomic_cell::AtomicCell;
 use crate::concurrency::demux;
 use crate::network_protocol::{Encoding, ParsePeerMessageError, SyncAccountsData};
+use crate::network_protocol::{Handshake, HandshakeFailureReason, PeerMessage};
 use crate::peer::stream;
 use crate::peer::tracker::Tracker;
 use crate::peer_manager::connection;
@@ -14,9 +15,7 @@ use crate::private_actix::{
 };
 use crate::sink::Sink;
 use crate::stats::metrics;
-use crate::types::{
-    Handshake, HandshakeFailureReason, NetworkClientMessages, NetworkClientResponses, PeerMessage,
-};
+use crate::types::{NetworkClientMessages, NetworkClientResponses};
 use actix::{
     Actor, ActorContext, ActorFutureExt, AsyncContext, Context, ContextFutureSpawner, Handler,
     Running, WrapFuture,

chain/network/src/peer/testonly.rs

@@ -2,6 +2,7 @@ use crate::broadcast;
 use crate::concurrency::demux;
 use crate::config::NetworkConfig;
 use crate::network_protocol::testonly as data;
+use crate::network_protocol::{PeerMessage, RoutingTableUpdate};
 use crate::peer::peer_actor::{PeerActor, StreamConfig};
 use crate::peer_manager::network_state::NetworkState;
 use crate::peer_manager::peer_manager_actor;
@@ -11,7 +12,6 @@ use crate::routing::routing_table_view::RoutingTableView;
 use crate::store;
 use crate::testonly::actix::ActixSystem;
 use crate::testonly::fake_client;
-use crate::types::{PeerMessage, RoutingTableUpdate};
 use actix::{Actor, Context, Handler};
 use near_crypto::{InMemorySigner, Signature};
 use near_network_primitives::types::{

chain/network/src/peer/tests/communication.rs

@@ -1,11 +1,11 @@
 use crate::network_protocol::testonly as data;
 use crate::network_protocol::Encoding;
+use crate::network_protocol::{Handshake, HandshakeFailureReason, PeerMessage};
 use crate::peer::testonly::{Event, PeerConfig, PeerHandle};
 use crate::peer_manager::peer_manager_actor::Event as PME;
 use crate::testonly::fake_client::Event as CE;
 use crate::testonly::make_rng;
 use crate::testonly::stream::Stream;
-use crate::types::{Handshake, HandshakeFailureReason, PeerMessage};
 use anyhow::Context as _;
 use assert_matches::assert_matches;
 use near_network_primitives::time;

chain/network/src/peer_manager/network_state.rs

@@ -1,12 +1,13 @@
 use crate::accounts_data;
 use crate::concurrency::demux;
 use crate::config;
+use crate::network_protocol::PeerMessage;
 use crate::peer::peer_actor::{PeerActor, StreamConfig};
 use crate::peer_manager::connection;
 use crate::private_actix::PeerToManagerMsg;
 use crate::routing::routing_table_view::RoutingTableView;
 use crate::stats::metrics;
-use crate::types::{ChainInfo, NetworkClientMessages, PeerMessage};
+use crate::types::{ChainInfo, NetworkClientMessages};
 use actix::Recipient;
 use arc_swap::ArcSwap;
 use near_network_primitives::time;

chain/network/src/peer_manager/peer_manager_actor.rs

@@ -1,5 +1,5 @@
 use crate::config;
-use crate::network_protocol::{AccountData, SyncAccountsData};
+use crate::network_protocol::{AccountData, PeerMessage, RoutingTableUpdate, SyncAccountsData};
 use crate::peer_manager::connection;
 use crate::peer_manager::network_state::NetworkState;
 use crate::peer_manager::peer_store::PeerStore;
@@ -16,7 +16,7 @@ use crate::store;
 use crate::types::{
     ConnectedPeerInfo, FullPeerInfo, GetNetworkInfo, NetworkClientMessages, NetworkInfo,
     NetworkRequests, NetworkResponses, PeerManagerMessageRequest, PeerManagerMessageResponse,
-    PeerMessage, RoutingTableUpdate, SetChainInfo,
+    SetChainInfo,
 };
 use actix::{
     Actor, ActorFutureExt, Addr, Arbiter, AsyncContext, Context, ContextFutureSpawner, Handler,

chain/network/src/peer_manager/tests.rs

@@ -2,13 +2,13 @@ use crate::concurrency::demux;
 use crate::config;
 use crate::network_protocol::testonly as data;
 use crate::network_protocol::{Encoding, PeerAddr, SyncAccountsData};
+use crate::network_protocol::{PeerMessage, RoutingTableUpdate};
 use crate::peer;
 use crate::peer_manager;
 use crate::peer_manager::network_state::LIMIT_PENDING_PEERS;
 use crate::peer_manager::peer_manager_actor::Event as PME;
 use crate::peer_manager::testonly::{Event, NormalAccountData};
 use crate::testonly::{assert_is_superset, make_rng, AsSet as _};
-use crate::types::{PeerMessage, RoutingTableUpdate};
 use itertools::Itertools;
 use near_network_primitives::time;
 use near_network_primitives::types::{Ping, RoutedMessageBody, EDGE_MIN_TIMESTAMP_NONCE};

chain/network/src/types.rs

@@ -1,7 +1,5 @@
 /// Type that belong to the network protocol.
-pub use crate::network_protocol::{
-    Encoding, Handshake, HandshakeFailureReason, PeerMessage, RoutingTableUpdate, SignedAccountData,
-};
+use crate::network_protocol::SignedAccountData;
 use crate::routing::routing_table_view::RoutingTableInfo;
 use futures::future::BoxFuture;
 use futures::FutureExt;
@@ -452,6 +450,7 @@ impl<M: actix::Message, T: MsgRecipient<M>> MsgRecipient<M> for NetworkRecipient
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::network_protocol::{Handshake, HandshakeFailureReason, RoutingTableUpdate};
 
     // NOTE: this has it's counterpart in `near_network_primitives::types::tests`
     const ALLOWED_SIZE: usize = 1 << 20;