Skip to content

Commit b9a4718

Browse files
committed
backend: run rust fmt
1 parent d468aca commit b9a4718

File tree

6 files changed

+51
-22
lines changed

6 files changed

+51
-22
lines changed

backend/src/routes/management.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ use crate::{
3333
error::Error,
3434
rate_limit::ChargerRateLimiter,
3535
routes::{auth::login::FindBy, charger::add::get_charger_from_db, user::get_user_id},
36-
utils::{get_charger_by_uid, get_connection, parse_uuid, update_charger_state_change, web_block_unpacked},
36+
utils::{
37+
get_charger_by_uid, get_connection, parse_uuid, update_charger_state_change,
38+
web_block_unpacked,
39+
},
3740
AppState, BridgeState,
3841
};
3942

backend/src/routes/user/create_authorization_token.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ pub mod tests {
106106
let req = TestRequest::post()
107107
.uri("/create_authorization_token")
108108
.cookie(Cookie::new("access_token", token))
109-
.set_json(CreateAuthorizationTokenSchema { use_once, name: "Test Token".to_string() })
109+
.set_json(CreateAuthorizationTokenSchema {
110+
use_once,
111+
name: "Test Token".to_string(),
112+
})
110113
.to_request();
111114

112115
let resp: ResponseAuthorizationToken = test::call_and_read_body_json(&app, req).await;
@@ -127,7 +130,10 @@ pub mod tests {
127130
let req = TestRequest::post()
128131
.uri("/create_authorization_token")
129132
.cookie(Cookie::new("access_token", token))
130-
.set_json(CreateAuthorizationTokenSchema { use_once: true, name: "Test Token".to_string() })
133+
.set_json(CreateAuthorizationTokenSchema {
134+
use_once: true,
135+
name: "Test Token".to_string(),
136+
})
131137
.to_request();
132138

133139
let resp = test::call_service(&app, req).await;

backend/src/routes/user/get_authorization_tokens.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ mod tests {
8282
id: String::new(),
8383
token: String::new(),
8484
use_once: false,
85-
name:String::new(),
85+
name: String::new(),
8686
created_at: 0,
8787
last_used_at: None,
8888
};

backend/src/udp_server/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ use std::{
3333
};
3434

3535
use self::socket::ManagementSocket;
36-
use crate::{udp_server::multiplex::run_server, utils::update_charger_state_change, AppState, BridgeState, DiscoveryCharger};
36+
use crate::{
37+
udp_server::multiplex::run_server, utils::update_charger_state_change, AppState, BridgeState,
38+
DiscoveryCharger,
39+
};
3740
use actix_web::web;
3841
use ipnetwork::IpNetwork;
3942
use packet::ManagementResponseV2;

backend/src/udp_server/multiplex.rs

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ use rand::TryRngCore;
3535
use rand_core::OsRng;
3636

3737
use crate::{
38-
udp_server::{management::RemoteConnMeta, packet::ManagementCommand}, utils::update_charger_state_change, ws_udp_bridge::open_connection, AppState, BridgeState
38+
udp_server::{management::RemoteConnMeta, packet::ManagementCommand},
39+
utils::update_charger_state_change,
40+
ws_udp_bridge::open_connection,
41+
AppState, BridgeState,
3942
};
4043

4144
use super::{management::try_port_discovery, socket::ManagementSocket};
@@ -182,15 +185,22 @@ pub fn send_data(socket: &UdpSocket, addr: SocketAddr, data: &[u8]) {
182185
}
183186
}
184187

185-
pub async fn run_server(bridge_state: web::Data<BridgeState>, app_state: web::Data<AppState>, arbiter: Arc<Arbiter>) {
188+
pub async fn run_server(
189+
bridge_state: web::Data<BridgeState>,
190+
app_state: web::Data<AppState>,
191+
arbiter: Arc<Arbiter>,
192+
) {
186193
let mut buf = vec![0u8; 65535];
187194
loop {
188195
if let Ok((s, addr)) = bridge_state.socket.recv_from(&mut buf) {
189196
let bridge_state = bridge_state.clone();
190197
let buf = buf.clone();
191198

192199
// Check if the packet is for port discovery
193-
if try_port_discovery(&bridge_state, &buf[..s], addr).await.is_ok() {
200+
if try_port_discovery(&bridge_state, &buf[..s], addr)
201+
.await
202+
.is_ok()
203+
{
194204
continue;
195205
}
196206

@@ -212,12 +222,13 @@ pub async fn run_server(bridge_state: web::Data<BridgeState>, app_state: web::Da
212222
match charger_map.entry(addr) {
213223
Entry::Occupied(tunn) => tunn.into_mut().clone(),
214224
Entry::Vacant(v) => {
215-
let (id, tunn_data) = match create_tunn(&bridge_state, addr, &buf[..s]).await {
216-
Ok(tunn) => tunn,
217-
Err(_err) => {
218-
continue;
219-
}
220-
};
225+
let (id, tunn_data) =
226+
match create_tunn(&bridge_state, addr, &buf[..s]).await {
227+
Ok(tunn) => tunn,
228+
Err(_err) => {
229+
continue;
230+
}
231+
};
221232

222233
arbiter.spawn(update_charger_state_change(id, app_state.clone()));
223234

@@ -227,7 +238,8 @@ pub async fn run_server(bridge_state: web::Data<BridgeState>, app_state: web::Da
227238
v.insert(tunn_data.clone());
228239
let tunn = tunn_data.clone();
229240
let mut lost_map = bridge_state.lost_connections.lock().await;
230-
let mut undiscovered_clients = bridge_state.undiscovered_clients.lock().await;
241+
let mut undiscovered_clients =
242+
bridge_state.undiscovered_clients.lock().await;
231243
if let Some(conns) = lost_map.remove(&id) {
232244
for (conn_no, recipient) in conns.into_iter() {
233245
let meta = RemoteConnMeta {

backend/src/utils.rs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ pub async fn validate_auth_token(
155155
Ok(_) => Ok(()),
156156
Err(_err) => Err(Error::InternalError),
157157
}
158-
}).await?;
158+
})
159+
.await?;
159160

160161
Ok(())
161162
}
@@ -189,14 +190,14 @@ pub fn send_email(email: &str, subject: &str, body: String, state: &web::Data<Ap
189190
{
190191
let _ = body;
191192
let _ = state;
192-
println!("Test mode: Email would be sent to {} with subject '{}'", email, subject);
193+
println!(
194+
"Test mode: Email would be sent to {} with subject '{}'",
195+
email, subject
196+
);
193197
}
194198
}
195199

196-
pub async fn update_charger_state_change(
197-
charger_id: uuid::Uuid,
198-
state: web::Data<AppState>,
199-
) {
200+
pub async fn update_charger_state_change(charger_id: uuid::Uuid, state: web::Data<AppState>) {
200201
let Ok(mut conn) = get_connection(&state) else {
201202
log::error!("Failed to get database connection for updating charger state change");
202203
return;
@@ -211,7 +212,11 @@ pub async fn update_charger_state_change(
211212
{
212213
Ok(_) => Ok(()),
213214
Err(_err) => {
214-
log::error!("Failed to update last_state_change for charger {}: {}", charger_id, _err);
215+
log::error!(
216+
"Failed to update last_state_change for charger {}: {}",
217+
charger_id,
218+
_err
219+
);
215220
Err(Error::InternalError)
216221
}
217222
}

0 commit comments

Comments
 (0)