diff options
Diffstat (limited to 'tvix/store')
| -rw-r--r-- | tvix/store/src/nar/import.rs | 15 | ||||
| -rw-r--r-- | tvix/store/src/pathinfoservice/from_addr.rs | 7 | ||||
| -rw-r--r-- | tvix/store/src/pathinfoservice/grpc.rs | 4 | ||||
| -rw-r--r-- | tvix/store/src/proto/tests/grpc_pathinfoservice.rs | 4 | ||||
| -rw-r--r-- | tvix/store/src/tests/nar_renderer.rs | 33 |
5 files changed, 41 insertions, 22 deletions
diff --git a/tvix/store/src/nar/import.rs b/tvix/store/src/nar/import.rs index 9be42aeafa0f..cda5b4e05a61 100644 --- a/tvix/store/src/nar/import.rs +++ b/tvix/store/src/nar/import.rs @@ -220,8 +220,11 @@ where mod test { use crate::nar::read_nar; use std::io::Cursor; + use std::sync::Arc; use tokio_stream::StreamExt; + use tvix_castore::blobservice::BlobService; + use tvix_castore::directoryservice::DirectoryService; use tvix_castore::fixtures::{ DIRECTORY_COMPLICATED, DIRECTORY_WITH_KEEP, EMPTY_BLOB_DIGEST, HELLOWORLD_BLOB_CONTENTS, HELLOWORLD_BLOB_DIGEST, @@ -235,8 +238,8 @@ mod test { #[tokio::test] async fn single_symlink() { - let blob_service = gen_blob_service(); - let directory_service = gen_directory_service(); + let blob_service: Arc<dyn BlobService> = gen_blob_service().into(); + let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into(); let handle = tokio::runtime::Handle::current(); @@ -263,8 +266,8 @@ mod test { #[tokio::test] async fn single_file() { - let blob_service = gen_blob_service(); - let directory_service = gen_directory_service(); + let blob_service: Arc<dyn BlobService> = gen_blob_service().into(); + let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into(); let handle = tokio::runtime::Handle::current(); @@ -299,8 +302,8 @@ mod test { #[tokio::test] async fn complicated() { - let blob_service = gen_blob_service(); - let directory_service = gen_directory_service(); + let blob_service: Arc<dyn BlobService> = gen_blob_service().into(); + let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into(); let handle = tokio::runtime::Handle::current(); diff --git a/tvix/store/src/pathinfoservice/from_addr.rs b/tvix/store/src/pathinfoservice/from_addr.rs index 922cd3351548..73bb61bf2cbc 100644 --- a/tvix/store/src/pathinfoservice/from_addr.rs +++ b/tvix/store/src/pathinfoservice/from_addr.rs @@ -170,7 +170,12 @@ mod tests { #[test_case("grpc+http://localhost/some-path", false; "grpc valid invalid host and path")] #[tokio::test] async fn test_from_addr_tokio(uri_str: &str, is_ok: bool) { - let resp = from_addr(uri_str, gen_blob_service(), gen_directory_service()).await; + let resp = from_addr( + uri_str, + gen_blob_service().into(), + gen_directory_service().into(), + ) + .await; assert_eq!(resp.is_ok(), is_ok); } diff --git a/tvix/store/src/pathinfoservice/grpc.rs b/tvix/store/src/pathinfoservice/grpc.rs index 9a8599bce26c..f05fe2c04d43 100644 --- a/tvix/store/src/pathinfoservice/grpc.rs +++ b/tvix/store/src/pathinfoservice/grpc.rs @@ -151,8 +151,8 @@ mod tests { let router = server.add_service( crate::proto::path_info_service_server::PathInfoServiceServer::new( GRPCPathInfoServiceWrapper::new(Box::new(MemoryPathInfoService::new( - gen_blob_service(), - gen_directory_service(), + gen_blob_service().into(), + gen_directory_service().into(), )) as Box<dyn PathInfoService>), ), diff --git a/tvix/store/src/proto/tests/grpc_pathinfoservice.rs b/tvix/store/src/proto/tests/grpc_pathinfoservice.rs index e8da7792cdb1..66c0f0147615 100644 --- a/tvix/store/src/proto/tests/grpc_pathinfoservice.rs +++ b/tvix/store/src/proto/tests/grpc_pathinfoservice.rs @@ -22,8 +22,8 @@ fn gen_grpc_service( let blob_service = gen_blob_service(); let directory_service = gen_directory_service(); Arc::new(GRPCPathInfoServiceWrapper::new(gen_pathinfo_service( - blob_service, - directory_service, + blob_service.into(), + directory_service.into(), ))) } diff --git a/tvix/store/src/tests/nar_renderer.rs b/tvix/store/src/tests/nar_renderer.rs index 811b572b6e5c..65059fe9c025 100644 --- a/tvix/store/src/tests/nar_renderer.rs +++ b/tvix/store/src/tests/nar_renderer.rs @@ -4,11 +4,16 @@ use crate::tests::fixtures::*; use crate::tests::utils::*; use sha2::{Digest, Sha256}; use std::io; +use std::sync::Arc; use tokio::io::sink; +use tvix_castore::blobservice::BlobService; +use tvix_castore::directoryservice::DirectoryService; use tvix_castore::proto as castorepb; #[tokio::test] async fn single_symlink() { + let blob_service: Arc<dyn BlobService> = gen_blob_service().into(); + let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into(); let mut buf: Vec<u8> = vec![]; write_nar( @@ -18,8 +23,8 @@ async fn single_symlink() { target: "/nix/store/somewhereelse".into(), }), // don't put anything in the stores, as we don't actually do any requests. - gen_blob_service(), - gen_directory_service(), + blob_service, + directory_service, ) .await .expect("must succeed"); @@ -30,6 +35,9 @@ async fn single_symlink() { /// Make sure the NARRenderer fails if a referred blob doesn't exist. #[tokio::test] async fn single_file_missing_blob() { + let blob_service: Arc<dyn BlobService> = gen_blob_service().into(); + let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into(); + let e = write_nar( sink(), &castorepb::node::Node::File(castorepb::FileNode { @@ -39,8 +47,8 @@ async fn single_file_missing_blob() { executable: false, }), // the blobservice is empty intentionally, to provoke the error. - gen_blob_service(), - gen_directory_service(), + blob_service, + directory_service, ) .await .expect_err("must fail"); @@ -57,7 +65,7 @@ async fn single_file_missing_blob() { /// than specified in the proto node. #[tokio::test] async fn single_file_wrong_blob_size() { - let blob_service = gen_blob_service(); + let blob_service: Arc<dyn BlobService> = gen_blob_service().into(); // insert blob into the store let mut writer = blob_service.open_write().await; @@ -75,6 +83,7 @@ async fn single_file_wrong_blob_size() { let bs = blob_service.clone(); // Test with a root FileNode of a too big size { + let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into(); let e = write_nar( sink(), &castorepb::node::Node::File(castorepb::FileNode { @@ -84,7 +93,7 @@ async fn single_file_wrong_blob_size() { executable: false, }), bs, - gen_directory_service(), + directory_service, ) .await .expect_err("must fail"); @@ -100,6 +109,7 @@ async fn single_file_wrong_blob_size() { let bs = blob_service.clone(); // Test with a root FileNode of a too small size { + let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into(); let e = write_nar( sink(), &castorepb::node::Node::File(castorepb::FileNode { @@ -109,7 +119,7 @@ async fn single_file_wrong_blob_size() { executable: false, }), bs, - gen_directory_service(), + directory_service, ) .await .expect_err("must fail"); @@ -125,7 +135,8 @@ async fn single_file_wrong_blob_size() { #[tokio::test] async fn single_file() { - let blob_service = gen_blob_service(); + let blob_service: Arc<dyn BlobService> = gen_blob_service().into(); + let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into(); // insert blob into the store let mut writer = blob_service.open_write().await; @@ -149,7 +160,7 @@ async fn single_file() { executable: false, }), blob_service, - gen_directory_service(), + directory_service, ) .await .expect("must succeed"); @@ -159,8 +170,8 @@ async fn single_file() { #[tokio::test] async fn test_complicated() { - let blob_service = gen_blob_service(); - let directory_service = gen_directory_service(); + let blob_service: Arc<dyn BlobService> = gen_blob_service().into(); + let directory_service: Arc<dyn DirectoryService> = gen_directory_service().into(); // put all data into the stores. // insert blob into the store |