diff options
Diffstat (limited to 'tvix/store')
-rw-r--r-- | tvix/store/src/pathinfoservice/from_addr.rs | 4 | ||||
-rw-r--r-- | tvix/store/src/pathinfoservice/nix_http.rs | 4 | ||||
-rw-r--r-- | tvix/store/src/utils.rs | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tvix/store/src/pathinfoservice/from_addr.rs b/tvix/store/src/pathinfoservice/from_addr.rs index 683457345c6c..2f5c776293cb 100644 --- a/tvix/store/src/pathinfoservice/from_addr.rs +++ b/tvix/store/src/pathinfoservice/from_addr.rs @@ -128,12 +128,12 @@ mod tests { async fn test_from_addr_tokio(#[case] uri_str: &str, #[case] exp_succeed: bool) { let mut comp = Composition::new(®); comp.extend(vec![( - "default".into(), + "root".into(), DeserializeWithRegistry(Box::new(MemoryBlobServiceConfig {}) as Box<dyn ServiceBuilder<Output = dyn BlobService>>), )]); comp.extend(vec![( - "default".into(), + "root".into(), DeserializeWithRegistry(Box::new(MemoryDirectoryServiceConfig {}) as Box<dyn ServiceBuilder<Output = dyn DirectoryService>>), )]); diff --git a/tvix/store/src/pathinfoservice/nix_http.rs b/tvix/store/src/pathinfoservice/nix_http.rs index 6b8960b75c33..af7580b1c61f 100644 --- a/tvix/store/src/pathinfoservice/nix_http.rs +++ b/tvix/store/src/pathinfoservice/nix_http.rs @@ -296,13 +296,13 @@ impl TryFrom<Url> for NixHTTPPathInfoServiceConfig { .into_iter() .find(|(k, _)| k == "blob_service") .map(|(_, v)| v.to_string()) - .unwrap_or("default".to_string()); + .unwrap_or("root".to_string()); let directory_service = url .query_pairs() .into_iter() .find(|(k, _)| k == "directory_service") .map(|(_, v)| v.to_string()) - .unwrap_or("default".to_string()); + .unwrap_or("root".to_string()); Ok(NixHTTPPathInfoServiceConfig { // Stringify the URL and remove the nix+ prefix. diff --git a/tvix/store/src/utils.rs b/tvix/store/src/utils.rs index 86ec367b66ad..49b23bc6b5f3 100644 --- a/tvix/store/src/utils.rs +++ b/tvix/store/src/utils.rs @@ -145,15 +145,15 @@ pub async fn addrs_to_configs( let path_info_service_url = Url::parse(&urls.path_info_service_addr)?; configs.blobservices.insert( - "default".into(), + "root".into(), with_registry(®, || blob_service_url.try_into())?, ); configs.directoryservices.insert( - "default".into(), + "root".into(), with_registry(®, || directory_service_url.try_into())?, ); configs.pathinfoservices.insert( - "default".into(), + "root".into(), with_registry(®, || path_info_service_url.try_into())?, ); @@ -194,9 +194,9 @@ pub async fn construct_services_from_configs( comp.extend(configs.directoryservices); comp.extend(configs.pathinfoservices); - let blob_service: Arc<dyn BlobService> = comp.build("default").await?; - let directory_service: Arc<dyn DirectoryService> = comp.build("default").await?; - let path_info_service: Arc<dyn PathInfoService> = comp.build("default").await?; + let blob_service: Arc<dyn BlobService> = comp.build("root").await?; + let directory_service: Arc<dyn DirectoryService> = comp.build("root").await?; + let path_info_service: Arc<dyn PathInfoService> = comp.build("root").await?; // HACK: The grpc client also implements NarCalculationService, and we // really want to use it (otherwise we'd need to fetch everything again for hashing). |