git/caesar-transfer
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

performe cleanup with clippy

Browse source
This commit is contained in:
Patryk Hegenberg 2024-04-28 01:49:46 +02:00
parent a362d8ce5c
commit bec368325c
2 changed files with 60 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/receiver/client.rs
View file

@ -609,7 +609,6 @@ pub async fn start(socket: Socket, fragment: &str) {
#[cfg(test)]
mod tests {
use super::*;
use aes_gcm::KeyInit;
use tokio_tungstenite::tungstenite::Message as WebSocketMessage;
#[test]
@ -635,7 +634,7 @@ mod tests {
let (sender, _) = flume::bounded(1000);
let mut context = Context {
hmac: vec![],
sender: sender,
sender,
key: EphemeralSecret::random(&mut OsRng),
shared_key: None,
files: vec![
@ -670,7 +669,7 @@ mod tests {
let (sender, _) = flume::bounded(1000);
let mut context = Context {
hmac: vec![],
sender: sender,
sender,
key: EphemeralSecret::random(&mut OsRng),
shared_key: None,
files: vec![],
@ -735,7 +734,7 @@ mod tests {
// Test a chunk packet with no shared key
let mut context = Context {
hmac: vec![],
sender: sender,
sender,
key: EphemeralSecret::random(&mut OsRng),
shared_key: None,
files: vec![File {

88
src/sender/client.rs
View file

@ -710,35 +710,35 @@ mod tests {
use super::*;
use aes_gcm::KeyInit;
#[test]
fn test_on_chunk() {
let (sender, _) = flume::bounded(1000);
let mut context = Context {
hmac: vec![],
sender: sender,
key: EphemeralSecret::random(&mut OsRng),
shared_key: None,
files: vec![
File {
name: "file1.txt".to_string(),
size: 100,
path: "file1.txt".to_string(),
},
File {
name: "file2.txt".to_string(),
size: 100,
path: "file2.txt".to_string(),
},
],
task: None,
};
}
// #[test]
// fn test_on_chunk() {
// let (sender, _) = flume::bounded(1000);
// let context = Context {
// hmac: vec![],
// sender,
// key: EphemeralSecret::random(&mut OsRng),
// shared_key: None,
// files: vec![
// File {
// name: "file1.txt".to_string(),
// size: 100,
// path: "file1.txt".to_string(),
// },
// File {
// name: "file2.txt".to_string(),
// size: 100,
// path: "file2.txt".to_string(),
// },
// ],
// task: None,
// };
// }
#[test]
fn test_on_progress() {
let (sender, _) = flume::bounded(1000);
let mut context = Context {
let context = Context {
hmac: vec![],
sender: sender,
sender,
key: EphemeralSecret::random(&mut OsRng),
shared_key: Some(Aes128Gcm::new(Key::<Aes128Gcm>::from_slice(&[0u8; 16]))),
files: vec![
@ -755,14 +755,23 @@ mod tests {
],
task: None,
};
assert_eq!(on_progress(&context, ProgressPacket { index: 0, progress: 50 }), Status::Continue());
assert_eq!(
on_progress(
&context,
ProgressPacket {
index: 0,
progress: 50
}
),
Status::Continue()
);
}
#[test]
fn test_on_create_room() {
let (sender, _) = flume::bounded(1000);
let mut context = Context {
let context = Context {
hmac: vec![],
sender: sender,
sender,
key: EphemeralSecret::random(&mut OsRng),
shared_key: None,
files: vec![
@ -824,7 +833,7 @@ mod tests {
let (sender, _) = flume::bounded(1000);
let mut context = Context {
hmac: vec![],
sender: sender,
sender,
key: EphemeralSecret::random(&mut OsRng),
shared_key: None,
files: vec![
@ -848,7 +857,7 @@ mod tests {
let (sender, _) = flume::bounded(1000);
let mut context = Context {
hmac: vec![],
sender: sender,
sender,
key: EphemeralSecret::random(&mut OsRng),
shared_key: None,
files: vec![
@ -865,9 +874,22 @@ mod tests {
],
task: None,
};
assert_eq!(on_message(&mut context, WebSocketMessage::Text(r#"{"type":"leave","index":5}"#.to_string())), Status::Continue());
assert_eq!(
on_message(
&mut context,
WebSocketMessage::Text(r#"{"type":"leave","index":5}"#.to_string())
),
Status::Continue()
);
assert_eq!(on_message(&mut context, WebSocketMessage::Text(r#"{"type":"create","id":"b531e87d-e51a-4507-94f4-335cbe2d32f3-Nc5skZReq7qJN7INwckyAZLWEEbxsrFfH/692tUNgkM="}"#.to_string())), Status::Continue());
assert_eq!(on_message(&mut context, WebSocketMessage::Text(r#"{"type":"error","message":"Error Message: Test"}"#.to_string())), Status::Err("Error Message: Test".to_string()));
assert_eq!(
on_message(
&mut context,
WebSocketMessage::Text(
r#"{"type":"error","message":"Error Message: Test"}"#.to_string()
)
),
Status::Err("Error Message: Test".to_string())
);
}
}