Skip to content

Commit 6a8ad1f

Browse files
committed
chore: fix format
1 parent 1bd2220 commit 6a8ad1f

File tree

3 files changed

+38
-24
lines changed

3 files changed

+38
-24
lines changed

crates/bit_rev/src/protocol_udp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,4 +296,4 @@ mod tests {
296296
let result = tracker.parse_udp_url();
297297
assert!(result.is_err());
298298
}
299-
}
299+
}

crates/bit_rev/src/tracker_peers.rs

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ impl TrackerPeers {
5959
.cloned()
6060
.collect();
6161

62-
debug!("Connecting to trackers: TCP: {:?}, UDP: {:?}", tcp_trackers, udp_trackers);
62+
debug!(
63+
"Connecting to trackers: TCP: {:?}, UDP: {:?}",
64+
tcp_trackers, udp_trackers
65+
);
6366
let torrent_meta = self.torrent_meta.clone();
6467
let peer_states = self.peer_states.clone();
6568
let piece_tx = self.piece_tx.clone();
@@ -100,17 +103,25 @@ impl TrackerPeers {
100103
piece_tx.clone(),
101104
have_broadcast.clone(),
102105
torrent_downloaded_state.clone(),
103-
).await;
106+
)
107+
.await;
104108

105109
//sleep interval
106110
tokio::time::sleep(std::time::Duration::from_millis(
107111
request_peers_res.interval,
108-
)).await;
112+
))
113+
.await;
109114
}
110-
Err(e) => debug!("Failed to parse peers from TCP tracker {}: {}", tracker, e),
115+
Err(e) => debug!(
116+
"Failed to parse peers from TCP tracker {}: {}",
117+
tracker, e
118+
),
111119
}
112120
}
113-
Err(e) => debug!("Failed to request peers from TCP tracker {}: {}", tracker, e),
121+
Err(e) => debug!(
122+
"Failed to request peers from TCP tracker {}: {}",
123+
tracker, e
124+
),
114125
}
115126
});
116127
}
@@ -125,12 +136,16 @@ impl TrackerPeers {
125136
tokio::spawn(async move {
126137
match request_udp_peers(&tracker, &torrent_meta, &peer_id, 6881).await {
127138
Ok(udp_response) => {
128-
debug!("Received UDP response from tracker {}: {:?}", tracker, udp_response);
129-
let new_peers: Vec<_> = udp_response.peers
139+
debug!(
140+
"Received UDP response from tracker {}: {:?}",
141+
tracker, udp_response
142+
);
143+
let new_peers: Vec<_> = udp_response
144+
.peers
130145
.into_iter()
131146
.map(|p| p.to_socket_addr())
132147
.collect();
133-
148+
134149
process_peers(
135150
new_peers,
136151
info_hash,
@@ -139,14 +154,19 @@ impl TrackerPeers {
139154
piece_tx.clone(),
140155
have_broadcast.clone(),
141156
torrent_downloaded_state.clone(),
142-
).await;
143-
157+
)
158+
.await;
159+
144160
//sleep interval
145161
tokio::time::sleep(std::time::Duration::from_secs(
146162
udp_response.interval as u64,
147-
)).await;
163+
))
164+
.await;
148165
}
149-
Err(e) => error!("Failed to request peers from UDP tracker {}: {}", tracker, e),
166+
Err(e) => error!(
167+
"Failed to request peers from UDP tracker {}: {}",
168+
tracker, e
169+
),
150170
}
151171
});
152172
}
@@ -189,18 +209,12 @@ async fn process_peers(
189209
torrent_downloaded_state.clone(),
190210
));
191211

192-
let peer_connection = PeerConnection::new(
193-
peer,
194-
info_hash,
195-
peer_id,
196-
peer_handler.clone(),
197-
);
212+
let peer_connection =
213+
PeerConnection::new(peer, info_hash, peer_id, peer_handler.clone());
198214

199215
let task_peer_chunk_req_fut = peer_handler.task_peer_chunk_requester();
200-
let connect_peer_fut = peer_connection.manage_peer_incoming(
201-
peer_writer_rx,
202-
have_broadcast.subscribe(),
203-
);
216+
let connect_peer_fut =
217+
peer_connection.manage_peer_incoming(peer_writer_rx, have_broadcast.subscribe());
204218

205219
let req = select! {
206220
r = connect_peer_fut => {

crates/bit_rev/tests/integration_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use bit_rev::protocol::Protocol;
12
use std::io::Error;
23
use std::net::SocketAddr;
34
use std::time::Duration;
4-
use bit_rev::protocol::Protocol;
55
use tokio::io::{AsyncReadExt, AsyncWriteExt};
66
use tokio::net::TcpListener;
77

0 commit comments

Comments
 (0)