Skip to content

Commit

Permalink
autonat/behaviour: remove no longer needed inject methods
Browse files Browse the repository at this point in the history
  • Loading branch information
jxs committed Oct 11, 2022
1 parent fb0d273 commit c3e648e
Showing 1 changed file with 3 additions and 116 deletions.
119 changes: 3 additions & 116 deletions protocols/autonat/src/behaviour.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ pub use as_server::{InboundProbeError, InboundProbeEvent};
use futures_timer::Delay;
use instant::Instant;
use libp2p_core::{
connection::ConnectionId, multiaddr::Protocol, transport::ListenerId, ConnectedPoint, Endpoint,
connection::ConnectionId, multiaddr::Protocol, ConnectedPoint, Endpoint,
Multiaddr, PeerId,
};
use libp2p_request_response::{
handler::RequestResponseHandlerEvent, ProtocolSupport, RequestId, RequestResponse,
ProtocolSupport, RequestId, RequestResponse,
RequestResponseConfig, RequestResponseEvent, RequestResponseMessage, ResponseChannel,
};
use libp2p_swarm::{
behaviour::FromSwarm, DialError, IntoConnectionHandler, NetworkBehaviour,
behaviour::FromSwarm, DialError, NetworkBehaviour,
NetworkBehaviourAction, PollParameters,
};
use std::{
Expand Down Expand Up @@ -428,78 +428,6 @@ impl NetworkBehaviour for Behaviour {
type ConnectionHandler = <RequestResponse<AutoNatCodec> as NetworkBehaviour>::ConnectionHandler;
type OutEvent = Event;

fn inject_connection_established(
&mut self,
peer: &PeerId,
conn: &ConnectionId,
endpoint: &ConnectedPoint,
failed_addresses: Option<&Vec<Multiaddr>>,
other_established: usize,
) {
let failed_addresses = failed_addresses
.map(|v| v.as_slice())
.unwrap_or_else(|| &[]);
self.on_connection_established(*peer, *conn, endpoint, failed_addresses, other_established)
}

fn inject_connection_closed(
&mut self,
peer: &PeerId,
conn: &ConnectionId,
endpoint: &ConnectedPoint,
handler: <Self::ConnectionHandler as IntoConnectionHandler>::Handler,
remaining_established: usize,
) {
self.on_connection_closed(*peer, *conn, endpoint, handler, remaining_established)
}

fn inject_dial_failure(
&mut self,
peer: Option<PeerId>,
handler: Self::ConnectionHandler,
error: &DialError,
) {
self.on_dial_failure(peer, handler, error)
}

fn inject_address_change(
&mut self,
peer: &PeerId,
conn: &ConnectionId,
old: &ConnectedPoint,
new: &ConnectedPoint,
) {
self.on_address_change(*peer, *conn, old, new)
}

fn inject_new_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
self.inner.on_swarm_event(FromSwarm::NewListenAddr {
listener_id: id,
addr,
});
self.as_client().on_new_address();
}

fn inject_expired_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
self.inner.on_swarm_event(FromSwarm::ExpiredListenAddr {
listener_id: id,
addr,
});
self.as_client().on_expired_address(addr);
}

fn inject_new_external_addr(&mut self, addr: &Multiaddr) {
self.inner
.on_swarm_event(FromSwarm::NewExternalAddr { addr });
self.as_client().on_new_address();
}

fn inject_expired_external_addr(&mut self, addr: &Multiaddr) {
self.inner
.on_swarm_event(FromSwarm::ExpiredExternalAddr { addr });
self.as_client().on_expired_address(addr);
}

fn poll(&mut self, cx: &mut Context<'_>, params: &mut impl PollParameters) -> Poll<Action> {
loop {
if let Some(event) = self.pending_out_events.pop_front() {
Expand Down Expand Up @@ -553,47 +481,6 @@ impl NetworkBehaviour for Behaviour {
self.inner.addresses_of_peer(peer)
}

fn inject_event(
&mut self,
peer_id: PeerId,
conn: ConnectionId,
event: RequestResponseHandlerEvent<AutoNatCodec>,
) {
self.inner.on_connection_handler_event(peer_id, conn, event)
}

fn inject_listen_failure(
&mut self,
local_addr: &Multiaddr,
send_back_addr: &Multiaddr,
handler: Self::ConnectionHandler,
) {
self.inner.on_swarm_event(FromSwarm::ListenFailure {
local_addr,
send_back_addr,
handler,
});
}

fn inject_new_listener(&mut self, id: ListenerId) {
self.inner
.on_swarm_event(FromSwarm::NewListener { listener_id: id })
}

fn inject_listener_error(&mut self, id: ListenerId, err: &(dyn std::error::Error + 'static)) {
self.inner.on_swarm_event(FromSwarm::ListenerError {
listener_id: id,
err,
});
}

fn inject_listener_closed(&mut self, id: ListenerId, reason: Result<(), &std::io::Error>) {
self.inner.on_swarm_event(FromSwarm::ListenerClosed {
listener_id: id,
reason,
});
}

fn on_swarm_event(&mut self, event: FromSwarm<Self::ConnectionHandler>) {
match event {
FromSwarm::ConnectionEstablished {
Expand Down

0 comments on commit c3e648e

Please sign in to comment.