fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-18 04:21:22 +00:00
Code Issues Projects Releases Wiki Activity

core/: Remove TInEvent and TOutEvent (#2183)

Browse Source 
TInEvent and TOutEvent are implied through THandler and thus
superflucious. Both are removed in favor of a derivation through
THandler.
This commit is contained in:
Max Inden
2021-08-11 12:41:28 +02:00
committed by GitHub
parent 7391b6e3f3
commit 008561283e
24 changed files with 356 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
swarm/src/lib.rs
View File

@ -100,6 +100,7 @@ use libp2p_core::{Executor, Multiaddr, Negotiated, PeerId, Transport, connection
ConnectionLimit,
ConnectedPoint,
EstablishedConnection,
ConnectionHandler,
IntoConnectionHandler,
ListenerId,
PendingConnectionError,
@ -278,8 +279,6 @@ where
{
network: Network<
transport::Boxed<(PeerId, StreamMuxerBox)>,
THandlerInEvent<TBehaviour>,
THandlerOutEvent<TBehaviour>,
NodeHandlerWrapperBuilder<THandler<TBehaviour>>,
>,
@ -682,7 +681,7 @@ where
}
},
PendingNotifyHandler::Any(ids) => {
if let Some((event, ids)) = notify_any(ids, &mut peer, event, cx) {
if let Some((event, ids)) = notify_any::<_, _, TBehaviour>(ids, &mut peer, event, cx) {
let handler = PendingNotifyHandler::Any(ids);
this.pending_event = Some((peer_id, handler, event));
return Poll::Pending
@ -759,7 +758,7 @@ where
}
NotifyHandler::Any => {
let ids = peer.connections().into_ids().collect();
if let Some((event, ids)) = notify_any(ids, &mut peer, event, cx) {
if let Some((event, ids)) = notify_any::<_, _, TBehaviour>(ids, &mut peer, event, cx) {
let handler = PendingNotifyHandler::Any(ids);
this.pending_event = Some((peer_id, handler, event));
return Poll::Pending
@ -838,15 +837,17 @@ fn notify_one<'a, THandlerInEvent>(
///
/// Returns `None` if either all connections are closing or the event
/// was successfully sent to a handler, in either case the event is consumed.
fn notify_any<'a, TTrans, THandlerInEvent, THandlerOutEvent, THandler>(
fn notify_any<'a, TTrans, THandler, TBehaviour>(
ids: SmallVec<[ConnectionId; 10]>,
peer: &mut ConnectedPeer<'a, TTrans, THandlerInEvent, THandlerOutEvent, THandler>,
event: THandlerInEvent,
peer: &mut ConnectedPeer<'a, TTrans, THandler>,
event: THandlerInEvent<TBehaviour>,
cx: &mut Context<'_>,
) -> Option<(THandlerInEvent, SmallVec<[ConnectionId; 10]>)>
) -> Option<(THandlerInEvent<TBehaviour>, SmallVec<[ConnectionId; 10]>)>
where
TTrans: Transport,
TBehaviour: NetworkBehaviour,
THandler: IntoConnectionHandler,
THandler::Handler: ConnectionHandler<InEvent = THandlerInEvent<TBehaviour>, OutEvent = THandlerOutEvent<TBehaviour>>
{
let mut pending = SmallVec::new();
let mut event = Some(event); // (1)