refactor: simplify a few bits and bobs

Signed-off-by: ljedrz <ljedrz@gmail.com>
This commit is contained in:
ljedrz 2020-06-26 16:03:22 +02:00
parent a8103cb14c
commit 3b36d89ccc
2 changed files with 6 additions and 11 deletions

View File

@ -29,7 +29,7 @@ impl BlockStore for FsBlockStore {
fn new(path: PathBuf) -> Self {
FsBlockStore {
path,
cids: Arc::new(Mutex::new(HashSet::new())),
cids: Default::default(),
}
}
@ -45,7 +45,7 @@ impl BlockStore for FsBlockStore {
let mut stream = fs::read_dir(path).await?;
fn append_cid(cids: &Arc<Mutex<HashSet<Cid>>>, path: PathBuf) {
fn append_cid(cids: &Mutex<HashSet<Cid>>, path: PathBuf) {
if path.extension() != Some(OsStr::new("data")) {
return;
}

View File

@ -12,7 +12,7 @@ use super::{BlockRm, BlockRmError};
// FIXME: Transition to Persistent Map to make iterating more consistent
use std::collections::HashMap;
#[derive(Clone, Debug)]
#[derive(Clone, Debug, Default)]
pub struct MemBlockStore {
blocks: Arc<Mutex<HashMap<Cid, Block>>>,
}
@ -20,9 +20,7 @@ pub struct MemBlockStore {
#[async_trait]
impl BlockStore for MemBlockStore {
fn new(_path: PathBuf) -> Self {
MemBlockStore {
blocks: Arc::new(Mutex::new(HashMap::new())),
}
Default::default()
}
async fn init(&self) -> Result<(), Error> {
@ -74,7 +72,7 @@ impl BlockStore for MemBlockStore {
}
}
#[derive(Clone, Debug)]
#[derive(Clone, Debug, Default)]
pub struct MemDataStore {
ipns: Arc<Mutex<HashMap<Vec<u8>, Vec<u8>>>>,
pin: Arc<Mutex<HashMap<Vec<u8>, Vec<u8>>>>,
@ -83,10 +81,7 @@ pub struct MemDataStore {
#[async_trait]
impl DataStore for MemDataStore {
fn new(_path: PathBuf) -> Self {
MemDataStore {
ipns: Arc::new(Mutex::new(HashMap::new())),
pin: Arc::new(Mutex::new(HashMap::new())),
}
Default::default()
}
async fn init(&self) -> Result<(), Error> {