refactor(tvix/store): use Box<dyn DirectoryService> r/6272

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

1 files changed, 6 insertions, 3 deletions

diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs
index 97e2447ec82a..4cedce6849d2 100644
--- a/tvix/store/src/bin/tvix-store.rs
+++ b/tvix/store/src/bin/tvix-store.rs
@@ -9,6 +9,7 @@ use tracing_subscriber::prelude::*;
 use tvix_store::blobservice::BlobService;
 use tvix_store::blobservice::GRPCBlobService;
 use tvix_store::blobservice::SledBlobService;
+use tvix_store::directoryservice::DirectoryService;
 use tvix_store::directoryservice::GRPCDirectoryService;
 use tvix_store::directoryservice::SledDirectoryService;
 use tvix_store::pathinfoservice::GRPCPathInfoService;
@@ -103,10 +104,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             let boxed_blob_service: Box<dyn BlobService> = Box::new(blob_service.clone());
             let boxed_blob_service2: Box<dyn BlobService> = Box::new(blob_service.clone());
             let directory_service = SledDirectoryService::new("directories.sled".into())?;
+            let boxed_directory_service = Box::new(directory_service.clone());
+            let boxed_directory_service2: Box<dyn DirectoryService> = Box::new(directory_service);
             let path_info_service = SledPathInfoService::new(
                 "pathinfo.sled".into(),
                 boxed_blob_service,
-                directory_service.clone(),
+                boxed_directory_service,
             )?;
 
             let listen_address = listen_address
@@ -122,7 +125,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     boxed_blob_service2,
                 )))
                 .add_service(DirectoryServiceServer::new(
-                    GRPCDirectoryServiceWrapper::from(directory_service),
+                    GRPCDirectoryServiceWrapper::from(boxed_directory_service2),
                 ))
                 .add_service(PathInfoServiceServer::new(
                     GRPCPathInfoServiceWrapper::from(path_info_service),
@@ -154,7 +157,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
             let io = Arc::new(TvixStoreIO::new(
                 Box::new(blob_service),
-                directory_service,
+                Box::new(directory_service),
                 path_info_service,
             ));