YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Run cargo clippy --fix and cargo fmt

Browse source
This commit is contained in:
Joakim Frostegård 2024-01-20 09:56:14 +01:00
parent 22e151d0f0
commit 5401eaf85f
28 changed files with 94 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/udp/src/common.rs
View file

@ -211,7 +211,7 @@ impl Statistics {
}
fn create_atomic_usize_vec(len: usize) -> Vec<AtomicUsize> {
::std::iter::repeat_with(|| AtomicUsize::default())
::std::iter::repeat_with(AtomicUsize::default)
.take(len)
.collect()
}

2
crates/udp/src/workers/socket/mio.rs
View file

@ -205,7 +205,7 @@ impl SocketWorker {
if let Err(HandleRequestError::RequestChannelFull(failed_requests)) =
self.handle_request(pending_scrape_valid_until, request, src)
{
self.pending_requests.extend(failed_requests.into_iter());
self.pending_requests.extend(failed_requests);
self.polling_mode = PollMode::SkipReceiving;
break;

2
crates/udp/src/workers/socket/storage.rs
View file

@ -44,7 +44,7 @@ impl PendingScrapeResponseSlab {
for (i, info_hash) in request.info_hashes.into_iter().enumerate() {
let split_request = split_requests
.entry(SwarmWorkerIndex::from_info_hash(&config, info_hash))
.entry(SwarmWorkerIndex::from_info_hash(config, info_hash))
.or_insert_with(|| PendingScrapeRequest {
slab_key,
info_hashes: BTreeMap::new(),

6
crates/udp/src/workers/socket/validator.rs
View file

@ -59,8 +59,8 @@ impl ConnectionValidator {
let mut connection_id_bytes = [0u8; 8];
(&mut connection_id_bytes[..4]).copy_from_slice(&elapsed);
(&mut connection_id_bytes[4..]).copy_from_slice(&hash);
connection_id_bytes[..4].copy_from_slice(&elapsed);
connection_id_bytes[4..].copy_from_slice(&hash);
ConnectionId::new(i64::from_ne_bytes(connection_id_bytes))
}
@ -78,7 +78,7 @@ impl ConnectionValidator {
return false;
}
let tracker_elapsed = u64::from(self.start_time.elapsed().as_secs());
let tracker_elapsed = self.start_time.elapsed().as_secs();
let client_elapsed = u64::from(u32::from_ne_bytes(elapsed));
let client_expiration_time = client_elapsed + self.max_connection_age;

29
crates/udp/src/workers/swarm/storage.rs
View file

@ -365,13 +365,14 @@ impl<I: Ip> SmallPeerMap<I> {
self.0.retain(|(_, peer)| {
let keep = peer.valid_until.valid(now);
if !keep && config.statistics.peer_clients {
if let Err(_) =
statistics_sender.try_send(StatisticsMessage::PeerRemoved(peer.peer_id))
{
// Should never happen in practice
::log::error!("Couldn't send StatisticsMessage::PeerRemoved");
}
if !keep
&& config.statistics.peer_clients
&& statistics_sender
.try_send(StatisticsMessage::PeerRemoved(peer.peer_id))
.is_err()
{
// Should never happen in practice
::log::error!("Couldn't send StatisticsMessage::PeerRemoved");
}
keep
@ -480,13 +481,13 @@ impl<I: Ip> LargePeerMap<I> {
if peer.is_seeder {
self.num_seeders -= 1;
}
if config.statistics.peer_clients {
if let Err(_) =
statistics_sender.try_send(StatisticsMessage::PeerRemoved(peer.peer_id))
{
// Should never happen in practice
::log::error!("Couldn't send StatisticsMessage::PeerRemoved");
}
if config.statistics.peer_clients
&& statistics_sender
.try_send(StatisticsMessage::PeerRemoved(peer.peer_id))
.is_err()
{
// Should never happen in practice
::log::error!("Couldn't send StatisticsMessage::PeerRemoved");
}
}

10
crates/udp/tests/common/mod.rs
View file

@ -29,7 +29,7 @@ pub fn connect(socket: &UdpSocket, tracker_addr: SocketAddr) -> anyhow::Result<C
transaction_id: TransactionId::new(0),
});
let response = request_and_response(&socket, tracker_addr, request)?;
let response = request_and_response(socket, tracker_addr, request)?;
if let Response::Connect(response) = response {
Ok(response.connection_id)
@ -69,7 +69,7 @@ pub fn announce(
port: Port::new(peer_port),
});
Ok(request_and_response(&socket, tracker_addr, request)?)
request_and_response(socket, tracker_addr, request)
}
pub fn scrape(
@ -84,12 +84,12 @@ pub fn scrape(
info_hashes,
});
let response = request_and_response(&socket, tracker_addr, request)?;
let response = request_and_response(socket, tracker_addr, request)?;
if let Response::Scrape(response) = response {
Ok(response)
} else {
return Err(anyhow::anyhow!("not scrape response: {:?}", response));
Err(anyhow::anyhow!("not scrape response: {:?}", response))
}
}
@ -119,6 +119,6 @@ pub fn request_and_response(
.recv_from(&mut buffer)
.with_context(|| "recv response")?;
Ok(Response::from_bytes(&buffer[..bytes_read], true).with_context(|| "parse response")?)
Response::from_bytes(&buffer[..bytes_read], true).with_context(|| "parse response")
}
}