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

feat(swarm): rename NetworkBehaviourAction to ToSwarm

Browse Source 
Resolves #3123.

Pull-Request: #3658.
This commit is contained in:
Thomas Eizinger
2023-03-24 14:43:49 +01:00
committed by GitHub
parent 7ffa63b656
commit dcbc04e89e
32 changed files with 698 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
protocols/perf/src/client/behaviour.rs
View File

@ -29,8 +29,8 @@ use libp2p_core::Multiaddr;
use libp2p_identity::PeerId;
use libp2p_swarm::{
derive_prelude::ConnectionEstablished, ConnectionClosed, ConnectionHandlerUpgrErr,
ConnectionId, FromSwarm, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler,
PollParameters, THandlerInEvent, THandlerOutEvent,
ConnectionId, FromSwarm, NetworkBehaviour, NotifyHandler, PollParameters, THandlerInEvent,
THandlerOutEvent, ToSwarm,
};
use void::Void;
@ -47,7 +47,7 @@ pub struct Event {
#[derive(Default)]
pub struct Behaviour {
/// Queue of actions to return when polled.
queued_events: VecDeque<NetworkBehaviourAction<Event, THandlerInEvent<Self>>>,
queued_events: VecDeque<ToSwarm<Event, THandlerInEvent<Self>>>,
/// Set of connected peers.
connected: HashSet<PeerId>,
}
@ -64,12 +64,11 @@ impl Behaviour {
let id = RunId::next();
self.queued_events
.push_back(NetworkBehaviourAction::NotifyHandler {
peer_id: server,
handler: NotifyHandler::Any,
event: crate::client::handler::Command { id, params },
});
self.queued_events.push_back(ToSwarm::NotifyHandler {
peer_id: server,
handler: NotifyHandler::Any,
event: crate::client::handler::Command { id, params },
});
Ok(id)
}
@ -141,14 +140,14 @@ impl NetworkBehaviour for Behaviour {
super::handler::Event { id, result }: THandlerOutEvent<Self>,
) {
self.queued_events
.push_back(NetworkBehaviourAction::GenerateEvent(Event { id, result }));
.push_back(ToSwarm::GenerateEvent(Event { id, result }));
}
fn poll(
&mut self,
_cx: &mut Context<'_>,
_: &mut impl PollParameters,
) -> Poll<NetworkBehaviourAction<Self::OutEvent, THandlerInEvent<Self>>> {
) -> Poll<ToSwarm<Self::OutEvent, THandlerInEvent<Self>>> {
if let Some(event) = self.queued_events.pop_front() {
return Poll::Ready(event);
}

17
protocols/perf/src/server/behaviour.rs
View File

@ -27,8 +27,8 @@ use std::{
use libp2p_identity::PeerId;
use libp2p_swarm::{
ConnectionId, FromSwarm, NetworkBehaviour, NetworkBehaviourAction, PollParameters,
THandlerInEvent, THandlerOutEvent,
ConnectionId, FromSwarm, NetworkBehaviour, PollParameters, THandlerInEvent, THandlerOutEvent,
ToSwarm,
};
use crate::server::handler::Handler;
@ -44,7 +44,7 @@ pub struct Event {
#[derive(Default)]
pub struct Behaviour {
/// Queue of actions to return when polled.
queued_events: VecDeque<NetworkBehaviourAction<Event, THandlerInEvent<Self>>>,
queued_events: VecDeque<ToSwarm<Event, THandlerInEvent<Self>>>,
}
impl Behaviour {
@ -100,18 +100,17 @@ impl NetworkBehaviour for Behaviour {
_connection_id: ConnectionId,
super::handler::Event { stats }: THandlerOutEvent<Self>,
) {
self.queued_events
.push_back(NetworkBehaviourAction::GenerateEvent(Event {
remote_peer_id: event_source,
stats,
}))
self.queued_events.push_back(ToSwarm::GenerateEvent(Event {
remote_peer_id: event_source,
stats,
}))
}
fn poll(
&mut self,
_cx: &mut Context<'_>,
_: &mut impl PollParameters,
) -> Poll<NetworkBehaviourAction<Self::OutEvent, THandlerInEvent<Self>>> {
) -> Poll<ToSwarm<Self::OutEvent, THandlerInEvent<Self>>> {
if let Some(event) = self.queued_events.pop_front() {
return Poll::Ready(event);
}