jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Cleanup code

Browse Source
This commit is contained in:
sprites0
2025-07-01 17:33:00 +00:00
parent 4b078a1b2d
commit 7fb5e8dd96
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/pseudo_peer/config.rs
View File

@ -1,10 +1,10 @@
use aws_config::BehaviorVersion; use aws_config::BehaviorVersion;
use super::sources::HlNodeBlockSource;
use super::{ use super::{
consts::DEFAULT_S3_BUCKET, consts::DEFAULT_S3_BUCKET,
sources::{BlockSourceBoxed, LocalBlockSource, S3BlockSource}, sources::{
BlockSourceBoxed, CachedBlockSource, HlNodeBlockSource, LocalBlockSource, S3BlockSource,
},
}; };
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::Arc; use std::sync::Arc;
@ -43,7 +43,7 @@ impl BlockSourceConfig {
} }
pub async fn create_block_source(&self) -> BlockSourceBoxed { pub async fn create_block_source(&self) -> BlockSourceBoxed {
let block_source: BlockSourceBoxed = match &self.source_type { match &self.source_type {
BlockSourceType::S3 { bucket } => { BlockSourceType::S3 { bucket } => {
let client = aws_sdk_s3::Client::new( let client = aws_sdk_s3::Client::new(
&aws_config::defaults(BehaviorVersion::latest()) &aws_config::defaults(BehaviorVersion::latest())
@ -51,29 +51,34 @@ impl BlockSourceConfig {
.load() .load()
.await, .await,
); );
let block_source = S3BlockSource::new(client, bucket.clone()); Arc::new(Box::new(S3BlockSource::new(client, bucket.clone())))
Arc::new(Box::new(block_source))
} }
BlockSourceType::Local { path } => { BlockSourceType::Local { path } => {
let block_source = LocalBlockSource::new(path.clone()); Arc::new(Box::new(LocalBlockSource::new(path.clone())))
Arc::new(Box::new(block_source))
} }
}; }
}
pub async fn create_block_source_from_node(
&self,
fallback_block_source: BlockSourceBoxed,
) -> BlockSourceBoxed {
let Some(block_source_from_node) = self.block_source_from_node.as_ref() else { let Some(block_source_from_node) = self.block_source_from_node.as_ref() else {
return block_source; return fallback_block_source;
}; };
let block_source = HlNodeBlockSource::new( Arc::new(Box::new(
block_source.clone(), HlNodeBlockSource::new(
PathBuf::from(block_source_from_node.clone()), fallback_block_source,
) PathBuf::from(block_source_from_node.clone()),
.await; )
Arc::new(Box::new(block_source)) .await,
))
} }
pub async fn create_cached_block_source(&self) -> BlockSourceBoxed { pub async fn create_cached_block_source(&self) -> BlockSourceBoxed {
let block_source = self.create_block_source().await; let block_source = self.create_block_source().await;
Arc::new(Box::new(block_source)) let block_source = self.create_block_source_from_node(block_source).await;
Arc::new(Box::new(CachedBlockSource::new(block_source)))
} }
} }