fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-04-25 03:02:12 +00:00
Code Issues Projects Releases Wiki Activity

protocols/kad: Remove unnecessary PeerId conversion for fixed iter (#1573)

Browse Source 
`FixedPeersIter` requires the initial set of peers to be passed as
`PeerId`s and not as `Key<PeerId>`s. This commit removes the unnecessary
conversion.
This commit is contained in:
Max Inden 2020-05-13 16:47:02 +02:00 committed by GitHub
parent 70e797112f
commit 06721128f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,7 +761,6 @@ where
}
QueryInfo::PrepareAddProvider { key, context } => {
let closest_peers = result.peers.map(kbucket::Key::from);
let provider_id = params.local_peer_id().clone();
let external_addresses = params.external_addresses().collect();
let inner = QueryInner::new(QueryInfo::AddProvider {
@ -770,7 +769,7 @@ where
external_addresses,
context,
});
self.queries.add_fixed(closest_peers, inner);
self.queries.add_fixed(result.peers, inner);
None
}
@ -799,7 +798,7 @@ where
let context = PutRecordContext::Cache;
let info = QueryInfo::PutRecord { record, quorum, context, num_results: 0 };
let inner = QueryInner::new(info);
self.queries.add_fixed(iter::once(cache_key), inner);
self.queries.add_fixed(iter::once(cache_key.into_preimage()), inner);
}
Ok(GetRecordOk { records })
} else if records.is_empty() {
@ -814,10 +813,9 @@ where
}
QueryInfo::PreparePutRecord { record, quorum, context } => {
let closest_peers = result.peers.map(kbucket::Key::from);
let info = QueryInfo::PutRecord { record, quorum, context, num_results: 0 };
let inner = QueryInner::new(info);
self.queries.add_fixed(closest_peers, inner);
self.queries.add_fixed(result.peers, inner);
None
}

4
protocols/kad/src/query.rs
View File

@ -89,9 +89,8 @@ impl<TInner> QueryPool<TInner> {
/// Adds a query to the pool that contacts a fixed set of peers.
pub fn add_fixed<I>(&mut self, peers: I, inner: TInner) -> QueryId
where
I: IntoIterator<Item = Key<PeerId>>
I: IntoIterator<Item = PeerId>
{
let peers = peers.into_iter().map(|k| k.into_preimage()).collect::<Vec<_>>();
let parallelism = self.config.replication_factor.get();
let peer_iter = QueryPeerIter::Fixed(FixedPeersIter::new(peers, parallelism));
self.add(peer_iter, inner)
@ -295,4 +294,3 @@ pub struct QueryResult<TInner, TPeers> {
/// The successfully contacted peers.
pub peers: TPeers
}

7
protocols/kad/src/query/peers/fixed.rs
View File

@ -57,7 +57,12 @@ enum PeerState {
}
impl FixedPeersIter {
pub fn new(peers: Vec<PeerId>, parallelism: usize) -> Self {
pub fn new<I>(peers: I, parallelism: usize) -> Self
where
I: IntoIterator<Item = PeerId>
{
let peers = peers.into_iter().collect::<Vec<_>>();
Self {
parallelism,
peers: FnvHashMap::default(),