From 7725eb53ad67730e92a3839a6c10925c668e5586 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 9 Jun 2023 12:26:34 +0300
Subject: refactor(tvix/store): use Box<dyn DirectoryService>

Once we support configuring services at runtime, we don't know what
DirectoryService we're using at compile time.

This also means, we can't explicitly use the is_closed method from
GRPCPutter, without making it part of the DirectoryPutter itself.

Change-Id: Icd2a1ec4fc5649a6cd15c9cc7db4c2b473630431
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8727
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
---
 tvix/store/src/tests/import.rs       |  1 -
 tvix/store/src/tests/nar_renderer.rs | 15 +++++++--------
 tvix/store/src/tests/utils.rs        |  8 ++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'tvix/store/src/tests')

diff --git a/tvix/store/src/tests/import.rs b/tvix/store/src/tests/import.rs
index 725d467bd0cf..3498cf444640 100644
--- a/tvix/store/src/tests/import.rs
+++ b/tvix/store/src/tests/import.rs
@@ -1,5 +1,4 @@
 use super::utils::{gen_blob_service, gen_directory_service};
-use crate::directoryservice::DirectoryService;
 use crate::import::ingest_path;
 use crate::proto;
 use crate::tests::fixtures::DIRECTORY_COMPLICATED;
diff --git a/tvix/store/src/tests/nar_renderer.rs b/tvix/store/src/tests/nar_renderer.rs
index 20cca1e77848..bc9cc635eec3 100644
--- a/tvix/store/src/tests/nar_renderer.rs
+++ b/tvix/store/src/tests/nar_renderer.rs
@@ -1,4 +1,3 @@
-use crate::directoryservice::DirectoryService;
 use crate::nar::calculate_size_and_sha256;
 use crate::nar::write_nar;
 use crate::proto::DirectoryNode;
@@ -21,7 +20,7 @@ fn single_symlink() {
         }),
         // don't put anything in the stores, as we don't actually do any requests.
         &gen_blob_service(),
-        gen_directory_service(),
+        &gen_directory_service(),
     )
     .expect("must succeed");
 
@@ -43,7 +42,7 @@ fn single_file_missing_blob() {
         }),
         // the blobservice is empty intentionally, to provoke the error.
         &gen_blob_service(),
-        gen_directory_service(),
+        &gen_directory_service(),
     )
     .expect_err("must fail");
 
@@ -83,7 +82,7 @@ fn single_file_wrong_blob_size() {
                 executable: false,
             }),
             &blob_service,
-            gen_directory_service(),
+            &gen_directory_service(),
         )
         .expect_err("must fail");
 
@@ -108,7 +107,7 @@ fn single_file_wrong_blob_size() {
                 executable: false,
             }),
             &blob_service,
-            gen_directory_service(),
+            &gen_directory_service(),
         )
         .expect_err("must fail");
 
@@ -145,7 +144,7 @@ fn single_file() {
             executable: false,
         }),
         &blob_service,
-        gen_directory_service(),
+        &gen_directory_service(),
     )
     .expect("must succeed");
 
@@ -182,7 +181,7 @@ fn test_complicated() {
             size: DIRECTORY_COMPLICATED.size(),
         }),
         &blob_service,
-        directory_service.clone(),
+        &directory_service,
     )
     .expect("must succeed");
 
@@ -196,7 +195,7 @@ fn test_complicated() {
             size: DIRECTORY_COMPLICATED.size(),
         }),
         &blob_service,
-        directory_service,
+        &directory_service,
     )
     .expect("must succeed");
 
diff --git a/tvix/store/src/tests/utils.rs b/tvix/store/src/tests/utils.rs
index 6905fe56b5d7..285db449d36d 100644
--- a/tvix/store/src/tests/utils.rs
+++ b/tvix/store/src/tests/utils.rs
@@ -8,13 +8,13 @@ pub fn gen_blob_service() -> Box<dyn BlobService> {
     Box::new(MemoryBlobService::default())
 }
 
-pub fn gen_directory_service() -> impl DirectoryService + Send + Sync + Clone + 'static {
-    MemoryDirectoryService::default()
+pub fn gen_directory_service() -> Box<dyn DirectoryService> {
+    Box::new(MemoryDirectoryService::default())
 }
 
-pub fn gen_pathinfo_service<DS: DirectoryService + Clone>(
+pub fn gen_pathinfo_service(
     blob_service: Box<dyn BlobService>,
-    directory_service: DS,
+    directory_service: Box<dyn DirectoryService>,
 ) -> impl PathInfoService {
     MemoryPathInfoService::new(blob_service, directory_service)
 }
-- 
cgit 1.4.1