2 files changed, 8 insertions, 11 deletions
diff --git a/tvix/store/src/proto/grpc_directoryservice_wrapper.rs b/tvix/store/src/proto/grpc_directoryservice_wrapper.rs
index 6d2df310137f..f27688c4e962 100644
--- a/tvix/store/src/proto/grpc_directoryservice_wrapper.rs
+++ b/tvix/store/src/proto/grpc_directoryservice_wrapper.rs
@@ -1,27 +1,26 @@
 use crate::proto;
 use crate::{directoryservice::DirectoryService, B3Digest};
 use std::collections::HashMap;
+use std::sync::Arc;
 use tokio::{sync::mpsc::channel, task};
 use tokio_stream::wrappers::ReceiverStream;
 use tonic::{async_trait, Request, Response, Status, Streaming};
 use tracing::{debug, instrument, warn};
 
-pub struct GRPCDirectoryServiceWrapper<C: DirectoryService> {
-    directory_service: C,
+pub struct GRPCDirectoryServiceWrapper {
+    directory_service: Arc<Box<dyn DirectoryService>>,
 }
 
-impl<DS: DirectoryService> From<DS> for GRPCDirectoryServiceWrapper<DS> {
-    fn from(value: DS) -> Self {
+impl From<Box<dyn DirectoryService>> for GRPCDirectoryServiceWrapper {
+    fn from(value: Box<dyn DirectoryService>) -> Self {
         Self {
-            directory_service: value,
+            directory_service: Arc::new(value),
         }
     }
 }
 
 #[async_trait]
-impl<DS: DirectoryService + Send + Sync + Clone + 'static>
-    proto::directory_service_server::DirectoryService for GRPCDirectoryServiceWrapper<DS>
-{
+impl proto::directory_service_server::DirectoryService for GRPCDirectoryServiceWrapper {
     type GetStream = ReceiverStream<tonic::Result<proto::Directory, Status>>;
 
     #[instrument(skip(self))]
diff --git a/tvix/store/src/proto/tests/grpc_directoryservice.rs b/tvix/store/src/proto/tests/grpc_directoryservice.rs
index 069e82f6463e..a1058706d521 100644
--- a/tvix/store/src/proto/tests/grpc_directoryservice.rs
+++ b/tvix/store/src/proto/tests/grpc_directoryservice.rs
@@ -1,4 +1,3 @@
-use crate::directoryservice::DirectoryService;
 use crate::proto::directory_service_server::DirectoryService as GRPCDirectoryService;
 use crate::proto::get_directory_request::ByWhat;
 use crate::proto::{Directory, DirectoryNode, SymlinkNode};
@@ -8,8 +7,7 @@ use crate::tests::utils::gen_directory_service;
 use tokio_stream::StreamExt;
 use tonic::Status;
 
-fn gen_grpc_service(
-) -> GRPCDirectoryServiceWrapper<impl DirectoryService + Send + Sync + Clone + 'static> {
+fn gen_grpc_service() -> GRPCDirectoryServiceWrapper {
     let directory_service = gen_directory_service();
     GRPCDirectoryServiceWrapper::from(directory_service)
 }