Skip to content

[libp2p-kad] Remove the Discovered event. #1632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romanb merged 2 commits into from
Jun 30, 2020
Merged

[libp2p-kad] Remove the Discovered event. #1632

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19f548d
Remove the `Discovered` event.
romanb Jun 27, 2020
797b5bc
Merge branch 'master' into kad-remove-discovered
romanb Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 3 additions & 31 deletions protocols/kad/src/behaviour.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,17 +753,6 @@ where
{
let local_id = self.kbuckets.local_key().preimage().clone();
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) {
log::trace!("Request to {:?} in query {:?} succeeded.", source, query_id);
for peer in others_iter.clone() {
Expand Down Expand Up @@ -1374,13 +1363,6 @@ where

/// Processes a provider record received from a peer.
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() {
let record = ProviderRecord {
key,
Expand Down Expand Up @@ -1873,22 +1855,12 @@ pub enum KademliaEvent {
stats: QueryStats
},

/// A peer has been discovered during a query.
Discovered {
/// 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.
/// The routing table has been updated with a new peer and / or
/// address, thereby possibly evicting another peer.
RoutingUpdated {
/// The ID of the peer that was added or updated.
peer: PeerId,
/// The list of known addresses of `peer`.
/// The full list of known addresses of `peer`.
addresses: Addresses,
/// The ID of the peer that was evicted from the routing table to make
/// room for the new peer, if any.
Expand Down