maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/store/pathinfosvc): use Arc<dyn …>

Browse source 
This removes the use of generics, like previously done with Blob and
Directory services.

Change-Id: I7cc8bd1439b026c88e80c11e38aafc63c74e5e84
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8751
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-06-12 16:04:56 +03:00 • committed by flokli
parent 64a4f6185c
commit b5e37869e6
8 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs
View file

@ -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,

8
tvix/store/src/proto/tests/grpc_pathinfoservice.rs
View file

@ -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.