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

refactor(tvix/store/nar): pass in &proto::node::Node

Browse source 
Passing in a &proto::node::Node into all this allows us consumers to
keep ownership of the proto::node::Node.

Change-Id: I44882a86c46826b06a8a8a0b24c18adfc7052662
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8316
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-03-16 23:54:29 +01:00 • committed by clbot
parent 985f842e32
commit b025ebb2a1
5 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ fn single_symlink() {
renderer
.write_nar(
&mut buf,
crate::proto::node::Node::Symlink(SymlinkNode {
&crate::proto::node::Node::Symlink(SymlinkNode {
name: "doesntmatter".to_string(),
target: "/nix/store/somewhereelse".to_string(),
}),
@ -47,7 +47,7 @@ fn single_file_missing_blob() {
let e = renderer
.write_nar(
&mut buf,
crate::proto::node::Node::File(FileNode {
&crate::proto::node::Node::File(FileNode {
name: "doesntmatter".to_string(),
digest: HELLOWORLD_BLOB_DIGEST.to_vec(),
size: HELLOWORLD_BLOB_CONTENTS.len() as u32,
@ -94,7 +94,7 @@ fn single_file_wrong_blob_size() {
let e = renderer
.write_nar(
&mut buf,
crate::proto::node::Node::File(FileNode {
&crate::proto::node::Node::File(FileNode {
name: "doesntmatter".to_string(),
digest: HELLOWORLD_BLOB_DIGEST.to_vec(),
size: 42, // <- note the wrong size here!
@ -151,7 +151,7 @@ fn single_file() {
renderer
.write_nar(
&mut buf,
crate::proto::node::Node::File(FileNode {
&crate::proto::node::Node::File(FileNode {
name: "doesntmatter".to_string(),
digest: HELLOWORLD_BLOB_DIGEST.to_vec(),
size: HELLOWORLD_BLOB_CONTENTS.len() as u32,
@ -196,7 +196,7 @@ fn test_complicated() {
renderer
.write_nar(
&mut buf,
crate::proto::node::Node::Directory(DirectoryNode {
&crate::proto::node::Node::Directory(DirectoryNode {
name: "doesntmatter".to_string(),
digest: DIRECTORY_COMPLICATED.digest().to_vec(),
size: DIRECTORY_COMPLICATED.size(),