diff --git a/zebra-network/src/peer.rs b/zebra-network/src/peer.rs index 449cb9c8..434efb24 100644 --- a/zebra-network/src/peer.rs +++ b/zebra-network/src/peer.rs @@ -12,7 +12,7 @@ mod handshake; mod server; pub use client::Client; -pub use connector::PeerConnector; +pub use connector::Connector; pub use error::{HandshakeError, PeerError, SharedPeerError}; pub use handshake::Handshake; pub use server::Server; diff --git a/zebra-network/src/peer/connector.rs b/zebra-network/src/peer/connector.rs index 028fc667..e0851eb9 100644 --- a/zebra-network/src/peer/connector.rs +++ b/zebra-network/src/peer/connector.rs @@ -14,25 +14,25 @@ use super::{HandshakeError, Client, Handshake}; /// A wrapper around [`peer::Handshake`] that opens a TCP connection before /// forwarding to the inner handshake service. Writing this as its own /// [`tower::Service`] lets us apply unified timeout policies, etc. -pub struct PeerConnector { +pub struct Connector { handshaker: Handshake, } -impl Clone for PeerConnector { +impl Clone for Connector { fn clone(&self) -> Self { - Self { + Connector { handshaker: self.handshaker.clone(), } } } -impl PeerConnector { +impl Connector { pub fn new(handshaker: Handshake) -> Self { - Self { handshaker } + Connector { handshaker } } } -impl Service for PeerConnector +impl Service for Connector where S: Service + Clone + Send + 'static, S::Future: Send, diff --git a/zebra-network/src/peer_set/initialize.rs b/zebra-network/src/peer_set/initialize.rs index 2eca8baf..1cb448dd 100644 --- a/zebra-network/src/peer_set/initialize.rs +++ b/zebra-network/src/peer_set/initialize.rs @@ -26,7 +26,6 @@ use tower_load::{peak_ewma::PeakEwmaDiscover, NoInstrument}; use crate::{ peer, - peer::{PeerConnector}, timestamp_collector::TimestampCollector, AddressBook, BoxedStdError, Config, Request, Response, }; @@ -67,7 +66,7 @@ where let hs = peer::Handshake::new(config.clone(), inbound_service, timestamp_collector); ( hs_timeout.layer(hs.clone()), - hs_timeout.layer(PeerConnector::new(hs)), + hs_timeout.layer(peer::Connector::new(hs)), ) };