refactor: remove dead code (#7814)

chain/network/src/network_protocol/mod.rs

@@ -700,7 +700,7 @@ pub enum AccountOrPeerIdOrHash {
 }
 
 pub struct RawRoutedMessage {
-    pub target: AccountOrPeerIdOrHash,
+    pub target: PeerIdOrHash,
     pub body: RoutedMessageBody,
 }
 
@@ -714,7 +714,7 @@ impl RawRoutedMessage {
         now: Option<time::Utc>,
     ) -> RoutedMessageV2 {
         let author = PeerId::new(node_key.public_key());
-        let target = self.target.peer_id_or_hash().unwrap();
+        let target = self.target;
         let hash = RoutedMessage::build_hash(&target, &author, &self.body);
         let signature = node_key.sign(hash.as_ref());
         RoutedMessageV2 {

chain/network/src/network_protocol/testonly.rs

@@ -5,7 +5,6 @@ use crate::network_protocol::{
     Edge, PartialEdgeInfo, PeerInfo, RawRoutedMessage, RoutedMessageBody,
 };
 use crate::time;
-use crate::types::AccountOrPeerIdOrHash;
 use crate::types::{AccountKeys, ChainInfo, Handshake, RoutingTableUpdate};
 use near_crypto::{InMemorySigner, KeyType, SecretKey};
 use near_primitives::block::{genesis_chunks, Block, BlockHeader, GenesisId};
@@ -355,7 +354,7 @@ pub fn make_handshake<R: Rng>(rng: &mut R, chain: &Chain) -> Handshake {
 pub fn make_routed_message<R: Rng>(rng: &mut R, body: RoutedMessageBody) -> RoutedMessageV2 {
     let signer = make_signer(rng);
     let peer_id = PeerId::new(signer.public_key);
-    RawRoutedMessage { target: AccountOrPeerIdOrHash::PeerId(peer_id.clone()), body }.sign(
+    RawRoutedMessage { target: PeerIdOrHash::PeerId(peer_id.clone()), body }.sign(
         &signer.secret_key,
         /*ttl=*/ 1,
         None,

chain/network/src/peer/peer_actor.rs

@@ -2,8 +2,8 @@ use crate::accounts_data;
 use crate::concurrency::atomic_cell::AtomicCell;
 use crate::concurrency::demux;
 use crate::network_protocol::{
-    AccountOrPeerIdOrHash, Edge, EdgeState, Encoding, ParsePeerMessageError, PartialEdgeInfo,
-    PeerChainInfoV2, PeerInfo, RawRoutedMessage, RoutedMessageBody, SyncAccountsData,
+    Edge, EdgeState, Encoding, ParsePeerMessageError, PartialEdgeInfo, PeerChainInfoV2, PeerInfo,
+    RawRoutedMessage, RoutedMessageBody, SyncAccountsData,
 };
 use crate::peer::stream;
 use crate::peer::tracker::Tracker;
@@ -446,7 +446,7 @@ impl PeerActor {
                             RawRoutedMessage {
                                 // TODO(gprusak): Rename AccountIrPeerIdOrHash to
                                 // RoutedMessageTarget for better readability.
-                                target: AccountOrPeerIdOrHash::Hash(msg_hash.unwrap()),
+                                target: PeerIdOrHash::Hash(msg_hash.unwrap()),
                                 body: RoutedMessageBody::TxStatusResponse(*tx_result),
                             },
                         );
@@ -464,7 +464,7 @@ impl PeerActor {
                         let msg = act.network_state.sign_message(
                             &act.clock,
                             RawRoutedMessage {
-                                target: AccountOrPeerIdOrHash::Hash(msg_hash.unwrap()),
+                                target: PeerIdOrHash::Hash(msg_hash.unwrap()),
                                 body,
                             },
                         );

chain/network/src/peer/testonly.rs

@@ -17,7 +17,7 @@ use crate::tcp;
 use crate::testonly::actix::ActixSystem;
 use crate::testonly::fake_client;
 use crate::time;
-use crate::types::AccountOrPeerIdOrHash;
+use crate::types::PeerIdOrHash;
 use actix::{Actor, Context, Handler};
 use near_crypto::{InMemorySigner, Signature};
 use near_o11y::WithSpanContextExt;
@@ -144,7 +144,7 @@ impl PeerHandle {
         ttl: u8,
         utc: Option<time::Utc>,
     ) -> RoutedMessageV2 {
-        RawRoutedMessage { target: AccountOrPeerIdOrHash::PeerId(peer_id), body }.sign(
+        RawRoutedMessage { target: PeerIdOrHash::PeerId(peer_id), body }.sign(
             &self.cfg.network.node_key,
             ttl,
             utc,

chain/network/src/peer_manager/network_state.rs

@@ -1,8 +1,8 @@
 use crate::accounts_data;
 use crate::config;
 use crate::network_protocol::{
-    AccountOrPeerIdOrHash, Edge, EdgeState, PartialEdgeInfo, PeerIdOrHash, PeerMessage, Ping, Pong,
-    RawRoutedMessage, RoutedMessageBody, RoutedMessageV2, RoutingTableUpdate,
+    Edge, EdgeState, PartialEdgeInfo, PeerIdOrHash, PeerMessage, Ping, Pong, RawRoutedMessage,
+    RoutedMessageBody, RoutedMessageV2, RoutingTableUpdate,
 };
 use crate::peer_manager::connection;
 use crate::private_actix::PeerToManagerMsg;
@@ -139,13 +139,13 @@ impl NetworkState {
 
     pub fn send_ping(&self, clock: &time::Clock, nonce: u64, target: PeerId) {
         let body = RoutedMessageBody::Ping(Ping { nonce, source: self.config.node_id() });
-        let msg = RawRoutedMessage { target: AccountOrPeerIdOrHash::PeerId(target), body };
+        let msg = RawRoutedMessage { target: PeerIdOrHash::PeerId(target), body };
         self.send_message_to_peer(clock, self.sign_message(clock, msg));
     }
 
     pub fn send_pong(&self, clock: &time::Clock, nonce: u64, target: CryptoHash) {
         let body = RoutedMessageBody::Pong(Pong { nonce, source: self.config.node_id() });
-        let msg = RawRoutedMessage { target: AccountOrPeerIdOrHash::Hash(target), body };
+        let msg = RawRoutedMessage { target: PeerIdOrHash::Hash(target), body };
         self.send_message_to_peer(clock, self.sign_message(clock, msg));
     }
 
@@ -219,7 +219,7 @@ impl NetworkState {
             }
         };
 
-        let msg = RawRoutedMessage { target: AccountOrPeerIdOrHash::PeerId(target), body: msg };
+        let msg = RawRoutedMessage { target: PeerIdOrHash::PeerId(target), body: msg };
         let msg = self.sign_message(clock, msg);
         if msg.body.is_important() {
             let mut success = false;

chain/network/src/peer_manager/peer_manager_actor.rs

@@ -23,7 +23,7 @@ use crate::time;
 use crate::types::{
     ConnectedPeerInfo, FullPeerInfo, GetNetworkInfo, KnownPeerStatus, KnownProducer,
     NetworkClientMessages, NetworkInfo, NetworkRequests, NetworkResponses,
-    NetworkViewClientMessages, NetworkViewClientResponses, PeerManagerMessageRequest,
+    NetworkViewClientMessages, NetworkViewClientResponses, PeerIdOrHash, PeerManagerMessageRequest,
     PeerManagerMessageResponse, PeerType, ReasonForBan, SetChainInfo,
 };
 use actix::fut::future::wrap_future;
@@ -941,19 +941,18 @@ impl PeerManagerActor {
         target: &AccountOrPeerIdOrHash,
         msg: RoutedMessageBody,
     ) -> bool {
-        match target {
+        let target = match target {
             AccountOrPeerIdOrHash::AccountId(account_id) => {
-                self.state.send_message_to_account(&self.clock, account_id, msg)
+                return self.state.send_message_to_account(&self.clock, account_id, msg);
             }
-            peer_or_hash @ AccountOrPeerIdOrHash::PeerId(_)
-            | peer_or_hash @ AccountOrPeerIdOrHash::Hash(_) => self.state.send_message_to_peer(
-                &self.clock,
-                self.state.sign_message(
-                    &self.clock,
-                    RawRoutedMessage { target: peer_or_hash.clone(), body: msg },
-                ),
-            ),
-        }
+            AccountOrPeerIdOrHash::PeerId(it) => PeerIdOrHash::PeerId(it.clone()),
+            AccountOrPeerIdOrHash::Hash(it) => PeerIdOrHash::Hash(it.clone()),
+        };
+
+        self.state.send_message_to_peer(
+            &self.clock,
+            self.state.sign_message(&self.clock, RawRoutedMessage { target, body: msg }),
+        )
     }
 
     pub(crate) fn get_network_info(&self) -> NetworkInfo {
@@ -1100,7 +1099,7 @@ impl PeerManagerActor {
                     &self.clock,
                     self.state.sign_message(
                         &self.clock,
-                        RawRoutedMessage { target: AccountOrPeerIdOrHash::Hash(route_back), body },
+                        RawRoutedMessage { target: PeerIdOrHash::Hash(route_back), body },
                     ),
                 ) {
                     NetworkResponses::NoResponse
@@ -1176,9 +1175,7 @@ impl PeerManagerActor {
                                 self.state.sign_message(
                                     &self.clock,
                                     RawRoutedMessage {
-                                        target: AccountOrPeerIdOrHash::PeerId(
-                                            matching_peer.clone(),
-                                        ),
+                                        target: PeerIdOrHash::PeerId(matching_peer.clone()),
                                         body: RoutedMessageBody::PartialEncodedChunkRequest(
                                             request.clone(),
                                         ),
@@ -1207,7 +1204,7 @@ impl PeerManagerActor {
                     self.state.sign_message(
                         &self.clock,
                         RawRoutedMessage {
-                            target: AccountOrPeerIdOrHash::Hash(route_back),
+                            target: PeerIdOrHash::Hash(route_back),
                             body: RoutedMessageBody::PartialEncodedChunkResponse(response),
                         },
                     ),

chain/network/src/types.rs

@@ -119,16 +119,6 @@ impl KnownPeerStatus {
     }
 }
 
-impl AccountOrPeerIdOrHash {
-    pub(crate) fn peer_id_or_hash(&self) -> Option<PeerIdOrHash> {
-        match self {
-            AccountOrPeerIdOrHash::AccountId(_) => None,
-            AccountOrPeerIdOrHash::PeerId(peer_id) => Some(PeerIdOrHash::PeerId(peer_id.clone())),
-            AccountOrPeerIdOrHash::Hash(hash) => Some(PeerIdOrHash::Hash(*hash)),
-        }
-    }
-}
-
 /// Set of account keys.
 /// This is information which chain pushes to network to implement tier1.
 /// See ChainInfo.