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

refactor(tvix/store/directorysvc): use [u8; 32] instead of Vec<u8>

Browse source 
Also, simplify the trait interface, only allowing lookups of Directory
objects by their digest.

Change-Id: I6eec28a8cb0557bed9b69df8b8ff99a5e0f8fe35
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8313
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-03-16 00:01:30 +01:00 • committed by flokli
parent 9c08cbc973
commit ee23220564
12 changed files with 126 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tvix/store/src/tests/fixtures.rs
View file

@ -39,7 +39,7 @@ lazy_static! {
pub static ref DIRECTORY_COMPLICATED: proto::Directory = proto::Directory {
directories: vec![DirectoryNode {
name: "keep".to_string(),
digest: DIRECTORY_WITH_KEEP.digest(),
digest: DIRECTORY_WITH_KEEP.digest().to_vec(),
size: DIRECTORY_WITH_KEEP.size(),
}],
files: vec![FileNode {
@ -57,7 +57,7 @@ lazy_static! {
pub static ref DIRECTORY_B: Directory = Directory {
directories: vec![DirectoryNode {
name: "a".to_string(),
digest: DIRECTORY_A.digest(),
digest: DIRECTORY_A.digest().to_vec(),
size: DIRECTORY_A.size(),
}],
..Default::default()
@ -66,12 +66,12 @@ lazy_static! {
directories: vec![
DirectoryNode {
name: "a".to_string(),
digest: DIRECTORY_A.digest(),
digest: DIRECTORY_A.digest().to_vec(),
size: DIRECTORY_A.size(),
},
DirectoryNode {
name: "a'".to_string(),
digest: DIRECTORY_A.digest(),
digest: DIRECTORY_A.digest().to_vec(),
size: DIRECTORY_A.size(),
}
],

10
tvix/store/src/tests/import.rs
View file

@ -106,7 +106,7 @@ fn complicated() {
.unwrap()
.to_string_lossy()
.to_string(),
digest: DIRECTORY_COMPLICATED.digest(),
digest: DIRECTORY_COMPLICATED.digest().to_vec(),
size: DIRECTORY_COMPLICATED.size(),
}),
root_node,
@ -114,15 +114,11 @@ fn complicated() {
// ensure DIRECTORY_WITH_KEEP and DIRECTORY_COMPLICATED have been uploaded
assert!(directory_service
.get(&proto::get_directory_request::ByWhat::Digest(
DIRECTORY_WITH_KEEP.digest()
))
.get(&DIRECTORY_WITH_KEEP.digest())
.unwrap()
.is_some());
assert!(directory_service
.get(&proto::get_directory_request::ByWhat::Digest(
DIRECTORY_COMPLICATED.digest()
))
.get(&DIRECTORY_COMPLICATED.digest())
.unwrap()
.is_some());

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

@ -198,7 +198,7 @@ fn test_complicated() {
&mut buf,
crate::proto::node::Node::Directory(DirectoryNode {
name: "doesntmatter".to_string(),
digest: DIRECTORY_COMPLICATED.digest(),
digest: DIRECTORY_COMPLICATED.digest().to_vec(),
size: DIRECTORY_COMPLICATED.size(),
}),
)