Skip to content

Commit 8a4dba3

Browse files
josecelanojosecelano
committed
refactor: [#1264] rename variables
1 parent 2fb1c6f commit 8a4dba3

File tree

10 files changed

+49
-45
lines changed

10 files changed

+49
-45
lines changed

‎packages/axum-http-tracker-server/src/environment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub struct Environment<S> {
2222
impl<S> Environment<S> {
2323
/// Add a torrent to the tracker
2424
pub fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) {
25-
let _stats_updated = self
25+
let _number_of_downloads_increased = self
2626
.container
2727
.tracker_core_container
2828
.in_memory_torrent_repository

‎packages/axum-rest-tracker-api-server/src/environment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ where
3333
{
3434
/// Add a torrent to the tracker
3535
pub fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) {
36-
let _stats_updated = self
36+
let _number_of_downloads_increased = self
3737
.container
3838
.tracker_core_container
3939
.in_memory_torrent_repository

‎packages/torrent-repository/src/entry/single.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl Entry for EntrySingle {
5151
}
5252

5353
fn upsert_peer(&mut self, peer: &peer::Peer) -> bool {
54-
let mut downloaded_stats_updated: bool = false;
54+
let mut number_of_downloads_increased: bool = false;
5555

5656
match peer::ReadInfo::get_event(peer) {
5757
AnnounceEvent::Stopped => {
@@ -62,7 +62,7 @@ impl Entry for EntrySingle {
6262
// Don't count if peer was not previously known and not already completed.
6363
if previous.is_some_and(|p| p.event != AnnounceEvent::Completed) {
6464
self.downloaded += 1;
65-
downloaded_stats_updated = true;
65+
number_of_downloads_increased = true;
6666
}
6767
}
6868
_ => {
@@ -72,7 +72,7 @@ impl Entry for EntrySingle {
7272
}
7373
}
7474

75-
downloaded_stats_updated
75+
number_of_downloads_increased
7676
}
7777

7878
fn remove_inactive_peers(&mut self, current_cutoff: DurationSinceUnixEpoch) {

‎packages/tracker-core/src/announce_handler.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ impl AnnounceHandler {
185185
/// returns the updated swarm stats.
186186
#[must_use]
187187
fn upsert_peer_and_get_stats(&self, info_hash: &InfoHash, peer: &peer::Peer) -> SwarmMetadata {
188-
let stats_updated = self.in_memory_torrent_repository.upsert_peer(info_hash, peer);
188+
let number_of_downloads_increased = self.in_memory_torrent_repository.upsert_peer(info_hash, peer);
189189

190190
let swarm_metadata = self.in_memory_torrent_repository.get_swarm_metadata(info_hash);
191191

192-
if stats_updated {
192+
if number_of_downloads_increased {
193193
self.persist_stats(info_hash, &swarm_metadata);
194194
}
195195

‎packages/tracker-core/src/torrent/manager.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ mod tests {
195195
// Add a peer to the torrent
196196
let mut peer = sample_peer();
197197
peer.updated = DurationSinceUnixEpoch::new(0, 0);
198-
let _stats_updated = services.in_memory_torrent_repository.upsert_peer(&infohash, &peer);
198+
let _number_of_downloads_increased = services.in_memory_torrent_repository.upsert_peer(&infohash, &peer);
199199

200200
// Simulate the time has passed 1 second more than the max peer timeout.
201201
clock::Stopped::local_add(&Duration::from_secs(
@@ -212,7 +212,7 @@ mod tests {
212212
// Add a peer to the torrent
213213
let mut peer = sample_peer();
214214
peer.updated = DurationSinceUnixEpoch::new(0, 0);
215-
let _stats_updated = in_memory_torrent_repository.upsert_peer(infohash, &peer);
215+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(infohash, &peer);
216216

217217
// Remove the peer. The torrent is now peerless.
218218
in_memory_torrent_repository.remove_inactive_peers(peer.updated.add(Duration::from_secs(1)));

‎packages/tracker-core/src/torrent/repository/in_memory.rs

+26-24
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ mod tests {
268268

269269
let info_hash = sample_info_hash();
270270

271-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
271+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
272272

273273
assert!(in_memory_torrent_repository.get(&info_hash).is_some());
274274
}
@@ -279,8 +279,8 @@ mod tests {
279279

280280
let info_hash = sample_info_hash();
281281

282-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
283-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
282+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
283+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
284284

285285
assert!(in_memory_torrent_repository.get(&info_hash).is_some());
286286
}
@@ -306,7 +306,7 @@ mod tests {
306306
let info_hash = sample_info_hash();
307307
let peer = sample_peer();
308308

309-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
309+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
310310

311311
let peers = in_memory_torrent_repository.get_torrent_peers(&info_hash);
312312

@@ -339,7 +339,7 @@ mod tests {
339339
event: AnnounceEvent::Completed,
340340
};
341341

342-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
342+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
343343
}
344344

345345
let peers = in_memory_torrent_repository.get_torrent_peers(&info_hash);
@@ -378,7 +378,7 @@ mod tests {
378378
let info_hash = sample_info_hash();
379379
let peer = sample_peer();
380380

381-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
381+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
382382

383383
let peers = in_memory_torrent_repository.get_peers_for(&info_hash, &peer, TORRENT_PEERS_LIMIT);
384384

@@ -393,7 +393,7 @@ mod tests {
393393

394394
let excluded_peer = sample_peer();
395395

396-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &excluded_peer);
396+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &excluded_peer);
397397

398398
// Add 74 peers
399399
for idx in 2..=75 {
@@ -407,7 +407,7 @@ mod tests {
407407
event: AnnounceEvent::Completed,
408408
};
409409

410-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
410+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
411411
}
412412

413413
let peers = in_memory_torrent_repository.get_peers_for(&info_hash, &excluded_peer, TORRENT_PEERS_LIMIT);
@@ -435,7 +435,7 @@ mod tests {
435435
let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
436436

437437
let info_hash = sample_info_hash();
438-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
438+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
439439

440440
let _unused = in_memory_torrent_repository.remove(&info_hash);
441441

@@ -450,7 +450,7 @@ mod tests {
450450
let mut peer = sample_peer();
451451
peer.updated = DurationSinceUnixEpoch::new(0, 0);
452452

453-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
453+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
454454

455455
// Cut off time is 1 second after the peer was updated
456456
in_memory_torrent_repository.remove_inactive_peers(peer.updated.add(Duration::from_secs(1)));
@@ -466,7 +466,7 @@ mod tests {
466466
// Insert a sample peer for the torrent to force adding the torrent entry
467467
let mut peer = sample_peer();
468468
peer.updated = DurationSinceUnixEpoch::new(0, 0);
469-
let _stats_updated = in_memory_torrent_repository.upsert_peer(info_hash, &peer);
469+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(info_hash, &peer);
470470

471471
// Remove the peer
472472
in_memory_torrent_repository.remove_inactive_peers(peer.updated.add(Duration::from_secs(1)));
@@ -530,7 +530,7 @@ mod tests {
530530
let info_hash = sample_info_hash();
531531
let peer = sample_peer();
532532

533-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
533+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
534534

535535
let torrent_entry = in_memory_torrent_repository.get(&info_hash).unwrap();
536536

@@ -563,7 +563,7 @@ mod tests {
563563

564564
let info_hash = sample_info_hash();
565565
let peer = sample_peer();
566-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
566+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &peer);
567567

568568
let torrent_entries = in_memory_torrent_repository.get_paginated(None);
569569

@@ -605,12 +605,12 @@ mod tests {
605605
// Insert one torrent entry
606606
let info_hash_one = sample_info_hash_one();
607607
let peer_one = sample_peer_one();
608-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_one);
608+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_one);
609609

610610
// Insert another torrent entry
611611
let info_hash_one = sample_info_hash_alphabetically_ordered_after_sample_info_hash_one();
612612
let peer_two = sample_peer_two();
613-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_two);
613+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_two);
614614

615615
// Get only the first page where page size is 1
616616
let torrent_entries =
@@ -641,12 +641,12 @@ mod tests {
641641
// Insert one torrent entry
642642
let info_hash_one = sample_info_hash_one();
643643
let peer_one = sample_peer_one();
644-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_one);
644+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_one);
645645

646646
// Insert another torrent entry
647647
let info_hash_one = sample_info_hash_alphabetically_ordered_after_sample_info_hash_one();
648648
let peer_two = sample_peer_two();
649-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_two);
649+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_two);
650650

651651
// Get only the first page where page size is 1
652652
let torrent_entries =
@@ -677,12 +677,12 @@ mod tests {
677677
// Insert one torrent entry
678678
let info_hash_one = sample_info_hash_one();
679679
let peer_one = sample_peer_one();
680-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_one);
680+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_one);
681681

682682
// Insert another torrent entry
683683
let info_hash_one = sample_info_hash_alphabetically_ordered_after_sample_info_hash_one();
684684
let peer_two = sample_peer_two();
685-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_two);
685+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash_one, &peer_two);
686686

687687
// Get only the first page where page size is 1
688688
let torrent_entries =
@@ -727,7 +727,7 @@ mod tests {
727727
async fn it_should_return_the_torrent_metrics_when_there_is_a_leecher() {
728728
let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
729729

730-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&sample_info_hash(), &leecher());
730+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&sample_info_hash(), &leecher());
731731

732732
let torrent_metrics = in_memory_torrent_repository.get_torrents_metrics();
733733

@@ -746,7 +746,7 @@ mod tests {
746746
async fn it_should_return_the_torrent_metrics_when_there_is_a_seeder() {
747747
let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
748748

749-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&sample_info_hash(), &seeder());
749+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&sample_info_hash(), &seeder());
750750

751751
let torrent_metrics = in_memory_torrent_repository.get_torrents_metrics();
752752

@@ -765,7 +765,8 @@ mod tests {
765765
async fn it_should_return_the_torrent_metrics_when_there_is_a_completed_peer() {
766766
let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
767767

768-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&sample_info_hash(), &complete_peer());
768+
let _number_of_downloads_increased =
769+
in_memory_torrent_repository.upsert_peer(&sample_info_hash(), &complete_peer());
769770

770771
let torrent_metrics = in_memory_torrent_repository.get_torrents_metrics();
771772

@@ -786,7 +787,8 @@ mod tests {
786787

787788
let start_time = std::time::Instant::now();
788789
for i in 0..1_000_000 {
789-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&gen_seeded_infohash(&i), &leecher());
790+
let _number_of_downloads_increased =
791+
in_memory_torrent_repository.upsert_peer(&gen_seeded_infohash(&i), &leecher());
790792
}
791793
let result_a = start_time.elapsed();
792794

@@ -822,7 +824,7 @@ mod tests {
822824

823825
let infohash = sample_info_hash();
824826

825-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&infohash, &leecher());
827+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&infohash, &leecher());
826828

827829
let swarm_metadata = in_memory_torrent_repository.get_swarm_metadata(&infohash);
828830

‎packages/tracker-core/src/torrent/services.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ mod tests {
231231

232232
let hash = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned(); // DevSkim: ignore DS173237
233233
let info_hash = InfoHash::from_str(&hash).unwrap();
234-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
234+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
235235

236236
let torrent_info = get_torrent_info(&in_memory_torrent_repository, &info_hash).unwrap();
237237

@@ -275,7 +275,7 @@ mod tests {
275275
let hash = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned(); // DevSkim: ignore DS173237
276276
let info_hash = InfoHash::from_str(&hash).unwrap();
277277

278-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
278+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer());
279279

280280
let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::default()));
281281

@@ -300,8 +300,8 @@ mod tests {
300300
let hash2 = "03840548643af2a7b63a9f5cbca348bc7150ca3a".to_owned(); // DevSkim: ignore DS173237
301301
let info_hash2 = InfoHash::from_str(&hash2).unwrap();
302302

303-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash1, &sample_peer());
304-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash2, &sample_peer());
303+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash1, &sample_peer());
304+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash2, &sample_peer());
305305

306306
let offset = 0;
307307
let limit = 1;
@@ -321,8 +321,8 @@ mod tests {
321321
let hash2 = "03840548643af2a7b63a9f5cbca348bc7150ca3a".to_owned(); // DevSkim: ignore DS173237
322322
let info_hash2 = InfoHash::from_str(&hash2).unwrap();
323323

324-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash1, &sample_peer());
325-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash2, &sample_peer());
324+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash1, &sample_peer());
325+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash2, &sample_peer());
326326

327327
let offset = 1;
328328
let limit = 4000;
@@ -347,11 +347,11 @@ mod tests {
347347

348348
let hash1 = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned(); // DevSkim: ignore DS173237
349349
let info_hash1 = InfoHash::from_str(&hash1).unwrap();
350-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash1, &sample_peer());
350+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash1, &sample_peer());
351351

352352
let hash2 = "03840548643af2a7b63a9f5cbca348bc7150ca3a".to_owned(); // DevSkim: ignore DS173237
353353
let info_hash2 = InfoHash::from_str(&hash2).unwrap();
354-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash2, &sample_peer());
354+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash2, &sample_peer());
355355

356356
let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::default()));
357357

‎packages/udp-tracker-server/src/environment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ where
3131
/// Add a torrent to the tracker
3232
#[allow(dead_code)]
3333
pub fn add_torrent(&self, info_hash: &InfoHash, peer: &peer::Peer) {
34-
let _stats_updated = self
34+
let _number_of_downloads_increased = self
3535
.container
3636
.tracker_core_container
3737
.in_memory_torrent_repository

‎packages/udp-tracker-server/src/handlers/announce.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,8 @@ mod tests {
366366
.with_peer_address(SocketAddr::new(IpAddr::V6(client_ip_v6), client_port))
367367
.into();
368368

369-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash.0.into(), &peer_using_ipv6);
369+
let _number_of_downloads_increased =
370+
in_memory_torrent_repository.upsert_peer(&info_hash.0.into(), &peer_using_ipv6);
370371
}
371372

372373
async fn announce_a_new_peer_using_ipv4(
@@ -677,7 +678,8 @@ mod tests {
677678
.with_peer_address(SocketAddr::new(IpAddr::V4(client_ip_v4), client_port))
678679
.into();
679680

680-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash.0.into(), &peer_using_ipv4);
681+
let _number_of_downloads_increased =
682+
in_memory_torrent_repository.upsert_peer(&info_hash.0.into(), &peer_using_ipv4);
681683
}
682684

683685
async fn announce_a_new_peer_using_ipv6(

‎packages/udp-tracker-server/src/handlers/scrape.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ mod tests {
166166
.with_number_of_bytes_left(0)
167167
.into();
168168

169-
let _stats_updated = in_memory_torrent_repository.upsert_peer(&info_hash.0.into(), &peer);
169+
let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash.0.into(), &peer);
170170
}
171171

172172
fn build_scrape_request(remote_addr: &SocketAddr, info_hash: &InfoHash) -> ScrapeRequest {

0 commit comments

Comments
 (0)