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

refactor(tvix/store): use Box<dyn DirectoryService>

Browse source 
Once we support configuring services at runtime, we don't know what
DirectoryService we're using at compile time.

This also means, we can't explicitly use the is_closed method from
GRPCPutter, without making it part of the DirectoryPutter itself.

Change-Id: Icd2a1ec4fc5649a6cd15c9cc7db4c2b473630431
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8727
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-06-09 12:26:34 +03:00 • committed by clbot
parent 6f85dbfc06
commit 7725eb53ad
18 changed files with 144 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tvix/store/src/tests/nar_renderer.rs
View file

@ -1,4 +1,3 @@
use crate::directoryservice::DirectoryService;
use crate::nar::calculate_size_and_sha256;
use crate::nar::write_nar;
use crate::proto::DirectoryNode;
@ -21,7 +20,7 @@ fn single_symlink() {
}),
// don't put anything in the stores, as we don't actually do any requests.
&gen_blob_service(),
gen_directory_service(),
&gen_directory_service(),
)
.expect("must succeed");
@ -43,7 +42,7 @@ fn single_file_missing_blob() {
}),
// the blobservice is empty intentionally, to provoke the error.
&gen_blob_service(),
gen_directory_service(),
&gen_directory_service(),
)
.expect_err("must fail");
@ -83,7 +82,7 @@ fn single_file_wrong_blob_size() {
executable: false,
}),
&blob_service,
gen_directory_service(),
&gen_directory_service(),
)
.expect_err("must fail");
@ -108,7 +107,7 @@ fn single_file_wrong_blob_size() {
executable: false,
}),
&blob_service,
gen_directory_service(),
&gen_directory_service(),
)
.expect_err("must fail");
@ -145,7 +144,7 @@ fn single_file() {
executable: false,
}),
&blob_service,
gen_directory_service(),
&gen_directory_service(),
)
.expect("must succeed");
@ -182,7 +181,7 @@ fn test_complicated() {
size: DIRECTORY_COMPLICATED.size(),
}),
&blob_service,
directory_service.clone(),
&directory_service,
)
.expect("must succeed");
@ -196,7 +195,7 @@ fn test_complicated() {
size: DIRECTORY_COMPLICATED.size(),
}),
&blob_service,
directory_service,
&directory_service,
)
.expect("must succeed");