From 3f011d276253852c58559fc12cf9e26bd17ed853 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 12 Oct 2023 16:08:00 +0200 Subject: refactor(tvix/*store): reorganize from_url Move the channel creation depending on the string-based URL into its own block. Change-Id: I546b769acd2296b548eb966b62c495f910266df5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9706 Reviewed-by: Connor Brewster Tested-by: BuildkiteCI --- tvix/store/src/pathinfoservice/grpc.rs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'tvix/store') diff --git a/tvix/store/src/pathinfoservice/grpc.rs b/tvix/store/src/pathinfoservice/grpc.rs index 3fe1903a14a2..9bb09e86137f 100644 --- a/tvix/store/src/pathinfoservice/grpc.rs +++ b/tvix/store/src/pathinfoservice/grpc.rs @@ -44,20 +44,16 @@ impl PathInfoService for GRPCPathInfoService { match url.scheme().strip_prefix("grpc+") { None => Err(Error::StorageError("invalid scheme".to_string())), Some(rest) => { - if rest == "unix" { + let channel = if rest == "unix" { if url.host_str().is_some() { return Err(Error::StorageError("host may not be set".to_string())); } let path = url.path().to_string(); - let channel = tonic::transport::Endpoint::try_from("http://[::]:50051") // doesn't matter + tonic::transport::Endpoint::try_from("http://[::]:50051") // doesn't matter .unwrap() .connect_with_connector_lazy(tower::service_fn( move |_: tonic::transport::Uri| UnixStream::connect(path.clone()), - )); - - Ok(Self::from_client( - proto::path_info_service_client::PathInfoServiceClient::new(channel), - )) + )) } else { // ensure path is empty, not supported with gRPC. if !url.path().is_empty() { @@ -75,14 +71,13 @@ impl PathInfoService for GRPCPathInfoService { let s_stripped = url_str.strip_prefix("grpc+").unwrap(); url::Url::parse(s_stripped).unwrap() }; - let channel = tonic::transport::Endpoint::try_from(url.to_string()) + tonic::transport::Endpoint::try_from(url.to_string()) .unwrap() - .connect_lazy(); - - Ok(Self::from_client( - proto::path_info_service_client::PathInfoServiceClient::new(channel), - )) - } + .connect_lazy() + }; + Ok(Self::from_client( + proto::path_info_service_client::PathInfoServiceClient::new(channel), + )) } } } -- cgit 1.4.1