Skip to content

Commit 01e0ba7

Browse files
brocaarbrocaar
committed
Run cargo clippy --fix + fmt.
1 parent 67046e1 commit 01e0ba7

File tree

8 files changed

+41
-29
lines changed

8 files changed

+41
-29
lines changed

‎src/forwarder.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ use std::collections::HashMap;
22
use std::sync::Arc;
33
use std::time::{Duration, SystemTime};
44

5-
use anyhow::{anyhow, Context, Result};
5+
use anyhow::{Context, Result, anyhow};
66
use tokio::net::UdpSocket;
77
use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
8-
use tokio::sync::{oneshot, OnceCell, RwLock};
9-
use tracing::{debug, error, info, trace, warn, Instrument};
8+
use tokio::sync::{OnceCell, RwLock, oneshot};
9+
use tracing::{Instrument, debug, error, info, trace, warn};
1010

1111
use crate::config;
1212
use crate::monitoring::{inc_server_udp_received_count, inc_server_udp_sent_count};
13-
use crate::packets::{get_random_token, GatewayId, PacketType};
13+
use crate::packets::{GatewayId, PacketType, get_random_token};
1414
use crate::traits::PrintFullError;
1515

1616
static SERVERS: OnceCell<RwLock<Vec<Server>>> = OnceCell::const_new();
@@ -159,13 +159,13 @@ async fn handle_uplink_packet(gateway_id: GatewayId, data: &[u8]) -> Result<()>
159159
inc_server_udp_sent_count(&server.server, packet_type).await;
160160
}
161161
PacketType::TxAck => {
162-
if let Some(pull_resp_token) = socket.pull_resp_token {
163-
if pull_resp_token == random_token {
164-
info!(packet_type = %packet_type, "Sending UDP packet");
165-
socket.pull_resp_token = None;
166-
socket.socket.send(data).await.context("Send UDP packet")?;
167-
inc_server_udp_sent_count(&server.server, packet_type).await;
168-
}
162+
if let Some(pull_resp_token) = socket.pull_resp_token
163+
&& pull_resp_token == random_token
164+
{
165+
info!(packet_type = %packet_type, "Sending UDP packet");
166+
socket.pull_resp_token = None;
167+
socket.socket.send(data).await.context("Send UDP packet")?;
168+
inc_server_udp_sent_count(&server.server, packet_type).await;
169169
}
170170
}
171171
_ => {}
@@ -339,10 +339,10 @@ async fn set_pull_resp_token(srv: &str, gateway_id: GatewayId, token: u16) -> Re
339339
let mut servers = servers.write().await;
340340

341341
for server in servers.iter_mut() {
342-
if server.server.eq(srv) {
343-
if let Some(v) = server.sockets.get_mut(&gateway_id) {
344-
v.pull_resp_token = Some(token);
345-
}
342+
if server.server.eq(srv)
343+
&& let Some(v) = server.sockets.get_mut(&gateway_id)
344+
{
345+
v.pull_resp_token = Some(token);
346346
}
347347
}
348348

‎src/listener.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ use std::net::SocketAddr;
33
use std::sync::Arc;
44
use std::time::{Duration, SystemTime};
55

6-
use anyhow::{anyhow, Context, Result};
6+
use anyhow::{Context, Result, anyhow};
77
use tokio::net::UdpSocket;
8-
use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
8+
use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel};
99
use tokio::sync::{OnceCell, RwLock};
10-
use tracing::{debug, error, info, trace, warn, Instrument};
10+
use tracing::{Instrument, debug, error, info, trace, warn};
1111

1212
use crate::monitoring::{inc_gateway_udp_received_count, inc_gateway_udp_sent_count};
13-
use crate::packets::{get_random_token, GatewayId, PacketType};
13+
use crate::packets::{GatewayId, PacketType, get_random_token};
1414
use crate::traits::PrintFullError;
1515

1616
static GATEWAYS: OnceCell<RwLock<HashMap<GatewayId, Gateway>>> = OnceCell::const_new();

‎src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::str::FromStr;
22

33
use clap::{Parser, Subcommand};
44
use signal_hook::{consts::SIGINT, consts::SIGTERM, iterator::Signals};
5-
use tracing::{info, Level};
5+
use tracing::{Level, info};
66
use tracing_subscriber::{filter, prelude::*};
77

88
use chirpstack_packet_multiplexer::{cmd, config, forwarder, listener, monitoring};

‎src/monitoring.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use anyhow::Result;
2-
use axum::{http::StatusCode, routing::get, Router};
2+
use axum::{Router, http::StatusCode, routing::get};
33
use prometheus_client::{
4-
encoding::text::encode,
54
encoding::EncodeLabelSet,
5+
encoding::text::encode,
66
metrics::counter::Counter,
77
metrics::family::Family,
88
registry::{Metric, Registry},

‎src/packets.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::fmt;
22

3-
use anyhow::{anyhow, Result};
3+
use anyhow::{Result, anyhow};
44

55
#[derive(Clone, Copy, Debug)]
66
pub enum PacketType {

‎tests/test_filtered_server.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ async fn test() {
5757
// Expect PUSH_DATA forwarded to server 1.
5858
let size = server1_sock.recv(&mut buffer).await.unwrap();
5959
assert_eq!(
60-
&[0x02, 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x7b, 0x7d,],
60+
&[
61+
0x02, 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x7b, 0x7d,
62+
],
6163
&buffer[..size]
6264
);
6365

‎tests/test_one_server.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ async fn test() {
5151
// Expect PUSH_DATA forwarded to server.
5252
let size = server_sock.recv(&mut buffer).await.unwrap();
5353
assert_eq!(
54-
&[0x02, 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x7b, 0x7d,],
54+
&[
55+
0x02, 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x7b, 0x7d,
56+
],
5557
&buffer[..size]
5658
);
5759

@@ -70,7 +72,9 @@ async fn test() {
7072
// Expect PULL_ACK forwarded to server.
7173
let (size, addr) = server_sock.recv_from(&mut buffer).await.unwrap();
7274
assert_eq!(
73-
&[0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,],
75+
&[
76+
0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
77+
],
7478
&buffer[..size]
7579
);
7680

@@ -110,7 +114,9 @@ async fn test() {
110114
// Expect TX_ACK at server.
111115
let size = server_sock.recv(&mut buffer).await.unwrap();
112116
assert_eq!(
113-
&[0x02, 0x01, 0x02, 0x05, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08],
117+
&[
118+
0x02, 0x01, 0x02, 0x05, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
119+
],
114120
&buffer[..size]
115121
);
116122
}

‎tests/test_uplink_only_server.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ async fn test() {
5252
// Expect PUSH_DATA forwarded to server.
5353
let size = server_sock.recv(&mut buffer).await.unwrap();
5454
assert_eq!(
55-
&[0x02, 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x7b, 0x7d,],
55+
&[
56+
0x02, 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x7b, 0x7d,
57+
],
5658
&buffer[..size]
5759
);
5860

@@ -71,7 +73,9 @@ async fn test() {
7173
// Expect PULL_ACK forwarded to server.
7274
let (size, addr) = server_sock.recv_from(&mut buffer).await.unwrap();
7375
assert_eq!(
74-
&[0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,],
76+
&[
77+
0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
78+
],
7579
&buffer[..size]
7680
);
7781

0 commit comments

Comments
 (0)