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, 8 insertions, 12 deletions

diff --git a/tvix/store/src/pathinfoservice/sled.rs b/tvix/store/src/pathinfoservice/sled.rs
index 98ea60ff44..a5aa987020 100644
--- a/tvix/store/src/pathinfoservice/sled.rs
+++ b/tvix/store/src/pathinfoservice/sled.rs
@@ -11,18 +11,18 @@ use tracing::warn;
 ///
 /// The PathInfo messages are stored as encoded protos, and keyed by their output hash,
 /// as that's currently the only request type available.
-pub struct SledPathInfoService<DS: DirectoryService> {
+pub struct SledPathInfoService {
     db: sled::Db,
 
     blob_service: Box<dyn BlobService>,
-    directory_service: DS,
+    directory_service: Box<dyn DirectoryService>,
 }
 
-impl<DS: DirectoryService> SledPathInfoService<DS> {
+impl SledPathInfoService {
     pub fn new(
         p: PathBuf,
         blob_service: Box<dyn BlobService>,
-        directory_service: DS,
+        directory_service: Box<dyn DirectoryService>,
     ) -> Result<Self, sled::Error> {
         let config = sled::Config::default().use_compression(true).path(p);
         let db = config.open()?;
@@ -36,7 +36,7 @@ impl<DS: DirectoryService> SledPathInfoService<DS> {
 
     pub fn new_temporary(
         blob_service: Box<dyn BlobService>,
-        directory_service: DS,
+        directory_service: Box<dyn DirectoryService>,
     ) -> Result<Self, sled::Error> {
         let config = sled::Config::default().temporary(true);
         let db = config.open()?;
@@ -49,7 +49,7 @@ impl<DS: DirectoryService> SledPathInfoService<DS> {
     }
 }
 
-impl<DS: DirectoryService + Clone> PathInfoService for SledPathInfoService<DS> {
+impl PathInfoService for SledPathInfoService {
     fn get(&self, digest: [u8; 20]) -> Result<Option<proto::PathInfo>, Error> {
         match self.db.get(digest) {
             Ok(None) => Ok(None),
@@ -95,11 +95,7 @@ impl<DS: DirectoryService + Clone> PathInfoService for SledPathInfoService<DS> {
     }
 
     fn calculate_nar(&self, root_node: &proto::node::Node) -> Result<(u64, [u8; 32]), Error> {
-        calculate_size_and_sha256(
-            root_node,
-            &self.blob_service,
-            self.directory_service.clone(),
-        )
-        .map_err(|e| Error::StorageError(e.to_string()))
+        calculate_size_and_sha256(root_node, &self.blob_service, &self.directory_service)
+            .map_err(|e| Error::StorageError(e.to_string()))
     }
 }