Skip to content

Commit 4cb5648

Browse files
josecelanojosecelano
committed
fix: [#1579] clippy errors
1 parent 15b8025 commit 4cb5648

File tree

28 files changed

+73
-78
lines changed

28 files changed

+73
-78
lines changed

‎console/tracker-client/src/console/clients/checker/checks/udp.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ mod tests {
117117
let socket_addr = resolve_socket_addr(&Url::parse("udp://localhost:8080").unwrap());
118118

119119
assert!(
120-
socket_addr == SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080)
121-
|| socket_addr == SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)), 8080)
120+
socket_addr == SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080)
121+
|| socket_addr == SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 8080)
122122
);
123123
}
124124

@@ -127,8 +127,8 @@ mod tests {
127127
let socket_addr = resolve_socket_addr(&Url::parse("udp://localhost:8080").unwrap());
128128

129129
assert!(
130-
socket_addr == SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080)
131-
|| socket_addr == SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)), 8080)
130+
socket_addr == SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080)
131+
|| socket_addr == SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 8080)
132132
);
133133
}
134134
}

‎console/tracker-client/src/console/clients/udp/checker.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl Client {
116116
bytes_uploaded: NumberOfBytes(0i64.into()),
117117
bytes_left: NumberOfBytes(0i64.into()),
118118
event: AnnounceEvent::Started.into(),
119-
ip_address: Ipv4Addr::new(0, 0, 0, 0).into(),
119+
ip_address: Ipv4Addr::UNSPECIFIED.into(),
120120
key: PeerKey::new(0i32),
121121
peers_wanted: NumberOfPeers(1i32.into()),
122122
port: Port::new(port),

‎packages/axum-http-tracker-server/src/v1/handlers/announce.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ mod tests {
234234
async fn it_should_fail_when_the_authentication_key_is_missing() {
235235
let http_core_tracker_services = initialize_private_tracker();
236236

237-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
237+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
238238
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
239239

240240
let maybe_key = None;
@@ -265,7 +265,7 @@ mod tests {
265265

266266
let unregistered_key = authentication::Key::from_str("YZSl4lMZupRuOpSRC3krIKR5BPB14nrJ").unwrap();
267267

268-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
268+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
269269
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
270270

271271
let maybe_key = Some(unregistered_key);
@@ -308,7 +308,7 @@ mod tests {
308308

309309
let announce_request = sample_announce_request();
310310

311-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
311+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
312312
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
313313

314314
let response = handle_announce(
@@ -356,7 +356,7 @@ mod tests {
356356
connection_info_socket_address: None,
357357
};
358358

359-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
359+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
360360
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
361361

362362
let response = handle_announce(
@@ -401,7 +401,7 @@ mod tests {
401401
connection_info_socket_address: None,
402402
};
403403

404-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
404+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
405405
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
406406

407407
let response = handle_announce(

‎packages/axum-http-tracker-server/src/v1/handlers/scrape.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ mod tests {
192192

193193
#[tokio::test]
194194
async fn it_should_return_zeroed_swarm_metadata_when_the_authentication_key_is_missing() {
195-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
195+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
196196
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
197197

198198
let (core_tracker_services, core_http_tracker_services) = initialize_private_tracker();
@@ -224,7 +224,7 @@ mod tests {
224224

225225
#[tokio::test]
226226
async fn it_should_return_zeroed_swarm_metadata_when_the_authentication_key_is_invalid() {
227-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
227+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
228228
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
229229

230230
let (core_tracker_services, core_http_tracker_services) = initialize_private_tracker();
@@ -272,7 +272,7 @@ mod tests {
272272

273273
let scrape_request = sample_scrape_request();
274274

275-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
275+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
276276
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
277277

278278
let scrape_service = ScrapeService::new(
@@ -314,7 +314,7 @@ mod tests {
314314
connection_info_socket_address: None,
315315
};
316316

317-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
317+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
318318
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
319319

320320
let scrape_service = ScrapeService::new(
@@ -361,7 +361,7 @@ mod tests {
361361
connection_info_socket_address: None,
362362
};
363363

364-
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
364+
let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
365365
let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
366366

367367
let scrape_service = ScrapeService::new(

‎packages/axum-http-tracker-server/tests/server/v1/contract.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ mod for_all_config_modes {
748748
Client::new(*env.bind_address())
749749
.announce(
750750
&QueryBuilder::default()
751-
.with_peer_addr(&IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)))
751+
.with_peer_addr(&IpAddr::V6(Ipv6Addr::LOCALHOST))
752752
.query(),
753753
)
754754
.await;

‎packages/configuration/src/v2_0_0/health_check_api.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ impl Default for HealthCheckApi {
2525

2626
impl HealthCheckApi {
2727
fn default_bind_address() -> SocketAddr {
28-
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1313)
28+
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 1313)
2929
}
3030
}

‎packages/configuration/src/v2_0_0/http_tracker.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl Default for HttpTracker {
3737

3838
impl HttpTracker {
3939
fn default_bind_address() -> SocketAddr {
40-
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 7070)
40+
SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), 7070)
4141
}
4242

4343
fn default_tsl_config() -> Option<TslConfig> {

‎packages/configuration/src/v2_0_0/mod.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,7 @@ mod tests {
492492
fn configuration_should_contain_the_external_ip() {
493493
let configuration = Configuration::default();
494494

495-
assert_eq!(
496-
configuration.core.net.external_ip,
497-
Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)))
498-
);
495+
assert_eq!(configuration.core.net.external_ip, Some(IpAddr::V4(Ipv4Addr::UNSPECIFIED)));
499496
}
500497

501498
#[test]

‎packages/configuration/src/v2_0_0/network.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl Default for Network {
3232
impl Network {
3333
#[allow(clippy::unnecessary_wraps)]
3434
fn default_external_ip() -> Option<IpAddr> {
35-
Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)))
35+
Some(IpAddr::V4(Ipv4Addr::UNSPECIFIED))
3636
}
3737

3838
fn default_on_reverse_proxy() -> bool {

‎packages/configuration/src/v2_0_0/tracker_api.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ impl Default for HttpApi {
4343

4444
impl HttpApi {
4545
fn default_bind_address() -> SocketAddr {
46-
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1212)
46+
SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 1212)
4747
}
4848

4949
#[allow(clippy::unnecessary_wraps)]

0 commit comments

Comments
 (0)