diff options
| author | Florian Klink <flokli@flokli.de> | 2023-12-16T23·32+0200 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-12-22T16·55+0000 |
| commit | 52cad8619511b97c4bcd5768ce9b3579ff665505 (patch) | |
| tree | 6fea69b620b0847000777cd0a908f6f42d57bf29 /tvix/store/src/pathinfoservice/grpc.rs | |
| parent | 93a228b9a4479f4687bde5158d5d68d42cad30e2 (diff) | |
refactor(tvix/store): remove Arc<> from PathInfoService::from_addr r/7255
This makes PathInfoService::from_addr return a Box<dyn PathInfoService>, rather than an Arc<dyn …>, and leaves it up to the consumers to rewrap it into an Arc where needed. This allows us to drop the Arc for the tvix-store daemon subcommand. Change-Id: Ic83aa2ade6c51912281bd17c7eef7252e152b2d1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10409 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/store/src/pathinfoservice/grpc.rs')
| -rw-r--r-- | tvix/store/src/pathinfoservice/grpc.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tvix/store/src/pathinfoservice/grpc.rs b/tvix/store/src/pathinfoservice/grpc.rs index ef3b0b77ec..9a8599bce2 100644 --- a/tvix/store/src/pathinfoservice/grpc.rs +++ b/tvix/store/src/pathinfoservice/grpc.rs @@ -115,7 +115,6 @@ impl PathInfoService for GRPCPathInfoService { #[cfg(test)] mod tests { - use std::sync::Arc; use std::time::Duration; use tempfile::TempDir; @@ -151,11 +150,11 @@ mod tests { let mut server = tonic::transport::Server::builder(); let router = server.add_service( crate::proto::path_info_service_server::PathInfoServiceServer::new( - GRPCPathInfoServiceWrapper::from(Arc::new(MemoryPathInfoService::new( + GRPCPathInfoServiceWrapper::new(Box::new(MemoryPathInfoService::new( gen_blob_service(), gen_directory_service(), )) - as Arc<dyn PathInfoService>), + as Box<dyn PathInfoService>), ), ); router.serve_with_incoming(uds_stream).await |