Skip to content

Commit 730de19

Browse files
dignifiedquiredignifiedquire
committed
apply CR
1 parent dac292c commit 730de19

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

Diff for: ‎protocols/kad/src/behaviour.rs

+24-24
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ where
952952
providers,
953953
closest_peers: Default::default(),
954954
})),
955-
index: Index {
955+
step: ProgressStep {
956956
count: 1,
957957
last: false,
958958
},
@@ -1272,7 +1272,7 @@ where
12721272
peer,
12731273
num_remaining,
12741274
})),
1275-
index: Index {
1275+
step: ProgressStep {
12761276
count: 1,
12771277
last: true,
12781278
},
@@ -1287,7 +1287,7 @@ where
12871287
key,
12881288
peers: result.peers.collect(),
12891289
})),
1290-
index: Index {
1290+
step: ProgressStep {
12911291
count: 1,
12921292
last: true,
12931293
},
@@ -1309,7 +1309,7 @@ where
13091309
providers_so_far: providers_found,
13101310
closest_peers: result.peers.collect(),
13111311
})),
1312-
index: Index {
1312+
step: ProgressStep {
13131313
count, // FIXME: count?
13141314
last: true,
13151315
},
@@ -1349,13 +1349,13 @@ where
13491349
id: query_id,
13501350
stats: get_closest_peers_stats.merge(result.stats),
13511351
result: QueryResult::StartProviding(Ok(AddProviderOk { key })),
1352-
index: Index::single(),
1352+
step: ProgressStep::single(),
13531353
}),
13541354
AddProviderContext::Republish => Some(KademliaEvent::OutboundQueryProgressed {
13551355
id: query_id,
13561356
stats: get_closest_peers_stats.merge(result.stats),
13571357
result: QueryResult::RepublishProvider(Ok(AddProviderOk { key })),
1358-
index: Index::single(),
1358+
step: ProgressStep::single(),
13591359
}),
13601360
},
13611361

@@ -1406,7 +1406,7 @@ where
14061406
id: query_id,
14071407
stats: result.stats,
14081408
result: QueryResult::GetRecord(results),
1409-
index: Index::single(),
1409+
step: ProgressStep::single(),
14101410
})
14111411
}
14121412

@@ -1457,14 +1457,14 @@ where
14571457
id: query_id,
14581458
stats: get_closest_peers_stats.merge(result.stats),
14591459
result: QueryResult::PutRecord(mk_result(record.key)),
1460-
index: Index::single(),
1460+
step: ProgressStep::single(),
14611461
})
14621462
}
14631463
PutRecordContext::Republish => Some(KademliaEvent::OutboundQueryProgressed {
14641464
id: query_id,
14651465
stats: get_closest_peers_stats.merge(result.stats),
14661466
result: QueryResult::RepublishRecord(mk_result(record.key)),
1467-
index: Index::single(),
1467+
step: ProgressStep::single(),
14681468
}),
14691469
PutRecordContext::Replicate => {
14701470
debug!("Record replicated: {:?}", record.key);
@@ -1512,7 +1512,7 @@ where
15121512
peer,
15131513
num_remaining,
15141514
})),
1515-
index: Index::single(),
1515+
step: ProgressStep::single(),
15161516
})
15171517
}
15181518

@@ -1521,13 +1521,13 @@ where
15211521
id: query_id,
15221522
stats: result.stats,
15231523
result: QueryResult::StartProviding(Err(AddProviderError::Timeout { key })),
1524-
index: Index::single(),
1524+
step: ProgressStep::single(),
15251525
},
15261526
AddProviderContext::Republish => KademliaEvent::OutboundQueryProgressed {
15271527
id: query_id,
15281528
stats: result.stats,
15291529
result: QueryResult::RepublishProvider(Err(AddProviderError::Timeout { key })),
1530-
index: Index::single(),
1530+
step: ProgressStep::single(),
15311531
},
15321532
}),
15331533

@@ -1538,7 +1538,7 @@ where
15381538
key,
15391539
peers: result.peers.collect(),
15401540
})),
1541-
index: Index::single(),
1541+
step: ProgressStep::single(),
15421542
}),
15431543

15441544
QueryInfo::PutRecord {
@@ -1561,14 +1561,14 @@ where
15611561
id: query_id,
15621562
stats: result.stats,
15631563
result: QueryResult::PutRecord(err),
1564-
index: Index::single(),
1564+
step: ProgressStep::single(),
15651565
})
15661566
}
15671567
PutRecordContext::Republish => Some(KademliaEvent::OutboundQueryProgressed {
15681568
id: query_id,
15691569
stats: result.stats,
15701570
result: QueryResult::RepublishRecord(err),
1571-
index: Index::single(),
1571+
step: ProgressStep::single(),
15721572
}),
15731573
PutRecordContext::Replicate => match phase {
15741574
PutRecordPhase::GetClosestPeers => {
@@ -1608,7 +1608,7 @@ where
16081608
records,
16091609
quorum,
16101610
})),
1611-
index: Index::single(),
1611+
step: ProgressStep::single(),
16121612
}),
16131613

16141614
QueryInfo::GetProviders { key, .. } => Some(KademliaEvent::OutboundQueryProgressed {
@@ -1618,7 +1618,7 @@ where
16181618
key,
16191619
closest_peers: result.peers.collect(),
16201620
})),
1621-
index: Index::single(),
1621+
step: ProgressStep::single(),
16221622
}),
16231623
}
16241624
}
@@ -2136,7 +2136,7 @@ where
21362136
providers_so_far: *providers_found,
21372137
closest_peers,
21382138
})),
2139-
index: Index {
2139+
step: ProgressStep {
21402140
count: *count,
21412141
last: false,
21422142
},
@@ -2494,16 +2494,16 @@ pub enum KademliaEvent {
24942494
// is made of multiple requests across multiple remote peers.
24952495
InboundRequest { request: InboundRequest },
24962496

2497-
/// An outbound query has finished.
2497+
/// An outbound query has made progress.
24982498
OutboundQueryProgressed {
24992499
/// The ID of the query that finished.
25002500
id: QueryId,
2501-
/// The optional final result of the query.
2501+
/// The intermediate result of the query.
25022502
result: QueryResult,
25032503
/// Execution statistics from the query.
25042504
stats: QueryStats,
2505-
/// Indicates which event this is, if therer are multiple responses for a single request.
2506-
index: Index,
2505+
/// Indicates which event this is, if therer are multiple responses for a single query.
2506+
step: ProgressStep,
25072507
},
25082508

25092509
/// The routing table has been updated with a new peer and / or
@@ -2559,14 +2559,14 @@ pub enum KademliaEvent {
25592559

25602560
/// Information about progress events.
25612561
#[derive(Debug, Clone)]
2562-
pub struct Index {
2562+
pub struct ProgressStep {
25632563
/// The index into the event
25642564
pub count: usize,
25652565
/// Is this the final event?
25662566
pub last: bool,
25672567
}
25682568

2569-
impl Index {
2569+
impl ProgressStep {
25702570
/// Generates an index for the case only a single event is emitted.
25712571
pub(crate) fn single() -> Self {
25722572
Self {

Diff for: ‎protocols/kad/src/behaviour/test.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -578,15 +578,15 @@ fn put_record() {
578578
id,
579579
result: QueryResult::PutRecord(res),
580580
stats,
581-
index,
581+
step: index,
582582
},
583583
)))
584584
| Poll::Ready(Some(SwarmEvent::Behaviour(
585585
KademliaEvent::OutboundQueryProgressed {
586586
id,
587587
result: QueryResult::RepublishRecord(res),
588588
stats,
589-
index,
589+
step: index,
590590
},
591591
))) => {
592592
assert!(qids.is_empty() || qids.remove(&id));
@@ -1365,7 +1365,7 @@ fn get_providers_single() {
13651365
SwarmEvent::Behaviour(KademliaEvent::OutboundQueryProgressed {
13661366
id,
13671367
result: QueryResult::GetProviders(Ok(GetProvidersOk { key, providers, .. })),
1368-
index,
1368+
step: index,
13691369
..
13701370
}) if id == query_id => {
13711371
if index.last {
@@ -1431,7 +1431,7 @@ fn get_providers_limit<const N: usize>() {
14311431
providers,
14321432
..
14331433
})),
1434-
index,
1434+
step: index,
14351435
..
14361436
},
14371437
))) if i == 0 && id == query_id => {

0 commit comments

Comments
 (0)