From e716bd09579208f17c016bb265fc92bacc1b1216 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 10 Mar 2023 12:20:26 +0100 Subject: refactor(tvix/store): impl Default for MemoryDirectoryService Change-Id: Ie75a1e67c8c0499ff10f60d90251b768937dad3a Reviewed-on: https://cl.tvl.fyi/c/depot/+/8235 Reviewed-by: tazjin Tested-by: BuildkiteCI Autosubmit: flokli --- tvix/store/src/directoryservice/memory.rs | 10 +--------- tvix/store/src/tests/utils.rs | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'tvix/store') diff --git a/tvix/store/src/directoryservice/memory.rs b/tvix/store/src/directoryservice/memory.rs index 34ee452033..87cd038888 100644 --- a/tvix/store/src/directoryservice/memory.rs +++ b/tvix/store/src/directoryservice/memory.rs @@ -6,19 +6,11 @@ use tracing::{instrument, warn}; use super::DirectoryService; -#[derive(Clone)] +#[derive(Clone, Default)] pub struct MemoryDirectoryService { db: Arc, proto::Directory>>>, } -impl MemoryDirectoryService { - pub fn new() -> Self { - let db = Arc::new(RwLock::new(HashMap::default())); - - Self { db } - } -} - impl DirectoryService for MemoryDirectoryService { // TODO: change api to only be by digest #[instrument(skip(self, by_what))] diff --git a/tvix/store/src/tests/utils.rs b/tvix/store/src/tests/utils.rs index 0b4a85a3af..6cf888c9d6 100644 --- a/tvix/store/src/tests/utils.rs +++ b/tvix/store/src/tests/utils.rs @@ -14,7 +14,7 @@ pub fn gen_chunk_service() -> impl ChunkService + Clone { } pub fn gen_directory_service() -> impl DirectoryService + Send + Sync + Clone + 'static { - MemoryDirectoryService::new() + MemoryDirectoryService::default() } pub fn gen_pathinfo_service() -> impl PathInfoService { -- cgit 1.4.1