cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Cleans up swarm poll and adds identify behaviour

Browse Source
This commit is contained in:
Age Manning 2019-03-21 12:57:41 +11:00
parent 67a3dfe052
commit 35815ce786
No known key found for this signature in database
GPG Key ID: 05EED64B79E06A93
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
beacon_node/eth2-libp2p/src/service.rs
View File

@ -11,8 +11,8 @@ use libp2p::core::{
transport::boxed::Boxed, transport::boxed::Boxed,
upgrade::{InboundUpgradeExt, OutboundUpgradeExt}, upgrade::{InboundUpgradeExt, OutboundUpgradeExt},
}; };
use libp2p::{core, secio, Transport}; use libp2p::identify::protocol::IdentifyInfo;
use libp2p::{PeerId, Swarm}; use libp2p::{core, secio, PeerId, Swarm, Transport};
use slog::{debug, info, trace, warn}; use slog::{debug, info, trace, warn};
use std::io::{Error, ErrorKind}; use std::io::{Error, ErrorKind};
use std::time::Duration; use std::time::Duration;
@ -104,17 +104,23 @@ impl Stream for Service {
// TODO: Currently only gossipsub events passed here. // TODO: Currently only gossipsub events passed here.
// Build a type for more generic events // Build a type for more generic events
match self.swarm.poll() { match self.swarm.poll() {
Ok(Async::Ready(Some(BehaviourEvent::Message(m)))) => { //Behaviour events
Ok(Async::Ready(Some(event))) => match event {
// TODO: Stub here for debugging // TODO: Stub here for debugging
debug!(self.log, "Message received: {}", m); BehaviourEvent::Message(m) => {
return Ok(Async::Ready(Some(Libp2pEvent::Message(m)))); debug!(self.log, "Message received: {}", m);
} return Ok(Async::Ready(Some(Libp2pEvent::Message(m))));
Ok(Async::Ready(Some(BehaviourEvent::RPC(peer_id, event)))) => { }
return Ok(Async::Ready(Some(Libp2pEvent::RPC(peer_id, event)))); BehaviourEvent::RPC(peer_id, event) => {
} return Ok(Async::Ready(Some(Libp2pEvent::RPC(peer_id, event))));
Ok(Async::Ready(Some(BehaviourEvent::PeerDialed(peer_id)))) => { }
return Ok(Async::Ready(Some(Libp2pEvent::PeerDialed(peer_id)))); BehaviourEvent::PeerDialed(peer_id) => {
} return Ok(Async::Ready(Some(Libp2pEvent::PeerDialed(peer_id))));
}
BehaviourEvent::Identified(peer_id, info) => {
return Ok(Async::Ready(Some(Libp2pEvent::Identified(peer_id, info))));
}
},
Ok(Async::Ready(None)) => unreachable!("Swarm stream shouldn't end"), Ok(Async::Ready(None)) => unreachable!("Swarm stream shouldn't end"),
Ok(Async::NotReady) => break, Ok(Async::NotReady) => break,
_ => break, _ => break,
@ -164,5 +170,6 @@ pub enum Libp2pEvent {
// We have received an RPC event on the swarm // We have received an RPC event on the swarm
RPC(PeerId, RPCEvent), RPC(PeerId, RPCEvent),
PeerDialed(PeerId), PeerDialed(PeerId),
Identified(PeerId, IdentifyInfo),
Message(String), Message(String),
} }