about summary refs log tree commit diff
path: root/tvix/store/src/proto
diff options
context:
space:
mode:
Diffstat (limited to 'tvix/store/src/proto')
-rw-r--r--tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs13
-rw-r--r--tvix/store/src/proto/tests/grpc_pathinfoservice.rs8
2 files changed, 12 insertions, 9 deletions
diff --git a/tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs b/tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs
index 645f4aa60556..9f26da213bd5 100644
--- a/tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs
+++ b/tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs
@@ -1,15 +1,16 @@
 use crate::nar::RenderError;
 use crate::pathinfoservice::PathInfoService;
 use crate::proto;
+use std::sync::Arc;
 use tonic::{async_trait, Request, Response, Result, Status};
 use tracing::{instrument, warn};
 
-pub struct GRPCPathInfoServiceWrapper<PS: PathInfoService> {
-    path_info_service: PS,
+pub struct GRPCPathInfoServiceWrapper {
+    path_info_service: Arc<dyn PathInfoService>,
 }
 
-impl<PS: PathInfoService> From<PS> for GRPCPathInfoServiceWrapper<PS> {
-    fn from(value: PS) -> Self {
+impl From<Arc<dyn PathInfoService>> for GRPCPathInfoServiceWrapper {
+    fn from(value: Arc<dyn PathInfoService>) -> Self {
         Self {
             path_info_service: value,
         }
@@ -17,9 +18,7 @@ impl<PS: PathInfoService> From<PS> for GRPCPathInfoServiceWrapper<PS> {
 }
 
 #[async_trait]
-impl<PS: PathInfoService + Send + Sync + 'static> proto::path_info_service_server::PathInfoService
-    for GRPCPathInfoServiceWrapper<PS>
-{
+impl proto::path_info_service_server::PathInfoService for GRPCPathInfoServiceWrapper {
     #[instrument(skip(self))]
     async fn get(
         &self,
diff --git a/tvix/store/src/proto/tests/grpc_pathinfoservice.rs b/tvix/store/src/proto/tests/grpc_pathinfoservice.rs
index 8b7038ccbc35..186461d16528 100644
--- a/tvix/store/src/proto/tests/grpc_pathinfoservice.rs
+++ b/tvix/store/src/proto/tests/grpc_pathinfoservice.rs
@@ -8,6 +8,7 @@ use crate::tests::fixtures::DUMMY_OUTPUT_HASH;
 use crate::tests::utils::gen_blob_service;
 use crate::tests::utils::gen_directory_service;
 use crate::tests::utils::gen_pathinfo_service;
+use std::sync::Arc;
 use tonic::Request;
 
 /// generates a GRPCPathInfoService out of blob, directory and pathinfo services.
@@ -15,10 +16,13 @@ use tonic::Request;
 /// We only interact with it via the PathInfo GRPC interface.
 /// It uses the NonCachingNARCalculationService NARCalculationService to
 /// calculate NARs.
-fn gen_grpc_service() -> impl GRPCPathInfoService {
+fn gen_grpc_service() -> Arc<dyn GRPCPathInfoService> {
     let blob_service = gen_blob_service();
     let directory_service = gen_directory_service();
-    GRPCPathInfoServiceWrapper::from(gen_pathinfo_service(blob_service, directory_service))
+    Arc::new(GRPCPathInfoServiceWrapper::from(gen_pathinfo_service(
+        blob_service,
+        directory_service,
+    )))
 }
 
 /// Trying to get a non-existent PathInfo should return a not found error.