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

Remove the Discovered event. (#1632)

Browse Source 
See the discussion in https://github.com/libp2p/rust-libp2p/pull/1628.
This commit is contained in:
Roman Borschel
2020-06-30 16:54:56 +02:00
committed by GitHub
parent 92b3ce37d5
commit d5b26359bb
1 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
protocols/kad/src/behaviour.rs
View File

@ -753,17 +753,6 @@ where
{ {
let local_id = self.kbuckets.local_key().preimage().clone(); let local_id = self.kbuckets.local_key().preimage().clone();
let others_iter = peers.filter(|p| p.node_id != local_id); let others_iter = peers.filter(|p| p.node_id != local_id);
for peer in others_iter.clone() {
self.queued_events.push_back(NetworkBehaviourAction::GenerateEvent(
KademliaEvent::Discovered {
peer_id: peer.node_id.clone(),
addresses: peer.multiaddrs.clone(),
ty: peer.connection_ty,
}
));
}
if let Some(query) = self.queries.get_mut(query_id) { if let Some(query) = self.queries.get_mut(query_id) {
log::trace!("Request to {:?} in query {:?} succeeded.", source, query_id); log::trace!("Request to {:?} in query {:?} succeeded.", source, query_id);
for peer in others_iter.clone() { for peer in others_iter.clone() {
@ -1374,13 +1363,6 @@ where
/// Processes a provider record received from a peer. /// Processes a provider record received from a peer.
fn provider_received(&mut self, key: record::Key, provider: KadPeer) { fn provider_received(&mut self, key: record::Key, provider: KadPeer) {
self.queued_events.push_back(NetworkBehaviourAction::GenerateEvent(
KademliaEvent::Discovered {
peer_id: provider.node_id.clone(),
addresses: provider.multiaddrs.clone(),
ty: provider.connection_ty,
}));
if &provider.node_id != self.kbuckets.local_key().preimage() { if &provider.node_id != self.kbuckets.local_key().preimage() {
let record = ProviderRecord { let record = ProviderRecord {
key, key,
@ -1873,22 +1855,12 @@ pub enum KademliaEvent {
stats: QueryStats stats: QueryStats
}, },
/// A peer has been discovered during a query. /// The routing table has been updated with a new peer and / or
Discovered { /// address, thereby possibly evicting another peer.
/// The ID of the discovered peer.
peer_id: PeerId,
/// The known addresses of the discovered peer.
addresses: Vec<Multiaddr>,
/// The connection status reported by the discovered peer
/// towards the local peer.
ty: KadConnectionType,
},
/// The routing table has been updated.
RoutingUpdated { RoutingUpdated {
/// The ID of the peer that was added or updated. /// The ID of the peer that was added or updated.
peer: PeerId, peer: PeerId,
/// The list of known addresses of `peer`. /// The full list of known addresses of `peer`.
addresses: Addresses, addresses: Addresses,
/// The ID of the peer that was evicted from the routing table to make /// The ID of the peer that was evicted from the routing table to make
/// room for the new peer, if any. /// room for the new peer, if any.