Skip to content

Commit 8c78930

Browse files
committed
format moment
1 parent e2c6ba6 commit 8c78930

34 files changed

+1259
-801
lines changed

benches/codec_bench.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use criterion::{criterion_group, criterion_main, Criterion, black_box};
21
use cipherstream::file_transfer::{FileTransferCodec, FileTransferProtocol, ProtocolRequest};
2+
use criterion::{Criterion, black_box, criterion_group, criterion_main};
33
use futures::io::Cursor;
44
use libp2p::request_response::Codec;
55

@@ -20,7 +20,10 @@ fn bench_codec_request_roundtrip(c: &mut Criterion) {
2020
// write phase
2121
futures::executor::block_on(async {
2222
let mut w = Cursor::new(&mut buf);
23-
let _ = codec.write_request(&protocol, &mut w, request.clone()).await.unwrap();
23+
codec
24+
.write_request(&protocol, &mut w, request.clone())
25+
.await
26+
.unwrap();
2427
});
2528
// read phase
2629
futures::executor::block_on(async {
@@ -34,4 +37,3 @@ fn bench_codec_request_roundtrip(c: &mut Criterion) {
3437

3538
criterion_group!(benches, bench_codec_request_roundtrip);
3639
criterion_main!(benches);
37-

benches/hash_bench.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use criterion::{criterion_group, criterion_main, Criterion, black_box};
21
use cipherstream::crypto;
3-
use tempfile::NamedTempFile;
2+
use criterion::{Criterion, black_box, criterion_group, criterion_main};
43
use std::io::Write;
4+
use tempfile::NamedTempFile;
55

66
fn bench_file_hashing(c: &mut Criterion) {
77
let sizes = [1024usize, 1024 * 64, 1024 * 1024];
@@ -11,7 +11,9 @@ fn bench_file_hashing(c: &mut Criterion) {
1111
let path = tmp.path().to_path_buf();
1212
c.bench_function(&format!("hash_file_{}KB", size / 1024), |b| {
1313
b.iter(|| {
14-
let _ = futures::executor::block_on(async { crypto::compute_file_hash(&path).await.unwrap() });
14+
let _ = futures::executor::block_on(async {
15+
crypto::compute_file_hash(&path).await.unwrap()
16+
});
1517
black_box(());
1618
})
1719
});
@@ -20,4 +22,3 @@ fn bench_file_hashing(c: &mut Criterion) {
2022

2123
criterion_group!(benches, bench_file_hashing);
2224
criterion_main!(benches);
23-

benches/request_response_bench.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use criterion::{criterion_group, criterion_main, Criterion, black_box};
2-
use cipherstream::file_transfer::{FileTransferCodec, FileTransferProtocol, ProtocolRequest, ProtocolResponse};
1+
use cipherstream::file_transfer::{FileTransferCodec, FileTransferProtocol, ProtocolResponse};
2+
use criterion::{Criterion, black_box, criterion_group, criterion_main};
33
use futures::io::Cursor;
44
use libp2p::request_response::Codec;
55

@@ -19,7 +19,10 @@ fn bench_codec_response_roundtrip(c: &mut Criterion) {
1919
// write phase
2020
futures::executor::block_on(async {
2121
let mut w = Cursor::new(&mut buf);
22-
let _ = codec.write_response(&protocol, &mut w, response.clone()).await.unwrap();
22+
codec
23+
.write_response(&protocol, &mut w, response.clone())
24+
.await
25+
.unwrap();
2326
});
2427
// read phase
2528
futures::executor::block_on(async {
@@ -33,4 +36,3 @@ fn bench_codec_response_roundtrip(c: &mut Criterion) {
3336

3437
criterion_group!(benches, bench_codec_response_roundtrip);
3538
criterion_main!(benches);
36-

src/application/dto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ pub struct SendFileResponse {
5050
pub struct ErrorResponse {
5151
pub error: String,
5252
pub details: Option<String>,
53-
}
53+
}

src/application/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
pub mod use_cases;
2-
pub mod services;
31
pub mod dto;
2+
pub mod services;
3+
pub mod use_cases;
44

5-
pub use use_cases::*;
5+
pub use dto::*;
66
pub use services::*;
7-
pub use dto::*;
7+
pub use use_cases::*;

src/application/services.rs

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
use std::sync::Arc;
21
use crate::core::traits::*;
3-
use crate::infrastructure::{repositories::*, config::AppConfig, UtilityService};
2+
use crate::infrastructure::{UtilityService, config::AppConfig, repositories::*};
3+
use std::sync::Arc;
44

55
/// Application service that provides dependency injection and orchestrates the system
66
pub struct ApplicationService {
77
pub config: Arc<AppConfig>,
88
// pub use_cases: Arc<super::UseCases>,
9-
9+
1010
// Domain services
1111
// pub transfer_service: Arc<TransferDomainService>,
1212
// pub peer_service: Arc<PeerDomainService>,
1313
// pub file_service: Arc<FileDomainService>,
14-
14+
1515
// Repositories
1616
pub file_repository: Arc<dyn FileRepository>,
1717
pub transfer_repository: Arc<dyn TransferRepository>,
@@ -24,7 +24,7 @@ impl ApplicationService {
2424
// Validate and prepare configuration
2525
config.validate()?;
2626
config.ensure_directories()?;
27-
27+
2828
let config = Arc::new(config);
2929

3030
// Create repositories
@@ -53,9 +53,7 @@ pub struct FileSystemService {
5353

5454
impl FileSystemService {
5555
pub fn new(config: Arc<AppConfig>) -> Self {
56-
Self {
57-
_config: config,
58-
}
56+
Self { _config: config }
5957
}
6058
}
6159

@@ -64,7 +62,7 @@ impl FileService for FileSystemService {
6462
async fn add_file(&self, path: &str) -> DomainResult<crate::core::domain::File> {
6563
let (name, size) = self.get_file_metadata(path).await?;
6664
let hash = self.calculate_file_hash(path).await?;
67-
65+
6866
Ok(crate::core::domain::File {
6967
id: crate::core::domain::FileId::new(),
7068
name,
@@ -85,43 +83,43 @@ impl FileService for FileSystemService {
8583
async fn get_file_metadata(&self, path: &str) -> DomainResult<(String, u64)> {
8684
let path_buf = std::path::Path::new(path);
8785
let metadata = tokio::fs::metadata(path).await?;
88-
86+
8987
let name = path_buf
9088
.file_name()
9189
.ok_or("Invalid filename")?
9290
.to_string_lossy()
9391
.to_string();
94-
92+
9593
Ok((name, metadata.len()))
9694
}
9795

9896
async fn read_file_chunk(&self, path: &str, offset: u64, size: usize) -> DomainResult<Vec<u8>> {
9997
use tokio::io::{AsyncReadExt, AsyncSeekExt};
100-
98+
10199
let mut file = tokio::fs::File::open(path).await?;
102100
file.seek(std::io::SeekFrom::Start(offset)).await?;
103-
101+
104102
let mut buffer = vec![0u8; size];
105103
let bytes_read = file.read(&mut buffer).await?;
106104
buffer.truncate(bytes_read);
107-
105+
108106
Ok(buffer)
109107
}
110108

111109
async fn write_file_chunk(&self, path: &str, offset: u64, data: &[u8]) -> DomainResult<()> {
112-
use tokio::io::{AsyncWriteExt, AsyncSeekExt};
113-
110+
use tokio::io::{AsyncSeekExt, AsyncWriteExt};
111+
114112
let mut file = tokio::fs::OpenOptions::new()
115113
.create(true)
116114
.write(true)
117115
.truncate(false)
118116
.open(path)
119117
.await?;
120-
118+
121119
file.seek(std::io::SeekFrom::Start(offset)).await?;
122120
file.write_all(data).await?;
123121
file.flush().await?;
124-
122+
125123
Ok(())
126124
}
127-
}
125+
}

src/application/use_cases.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use crate::core::{domain::*, services::*, traits::*};
12
use std::sync::Arc;
2-
use crate::core::{domain::*, traits::*, services::*};
33

44
/// Use case for sending a file to another peer
55
pub struct SendFileUseCase {
@@ -153,4 +153,4 @@ impl UseCases {
153153
cancel_transfer: CancelTransferUseCase::new(transfer_service),
154154
}
155155
}
156-
}
156+
}

0 commit comments

Comments
 (0)