From b025ebb2a1ae989afc5ee3ae69cb920e97a4efdc Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 16 Mar 2023 23:54:29 +0100 Subject: refactor(tvix/store/nar): pass in &proto::node::Node 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 Autosubmit: flokli --- tvix/store/src/tests/nar_renderer.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tvix/store/src/tests/nar_renderer.rs') diff --git a/tvix/store/src/tests/nar_renderer.rs b/tvix/store/src/tests/nar_renderer.rs index 056cfaf5fb11..2d612d9c273f 100644 --- a/tvix/store/src/tests/nar_renderer.rs +++ b/tvix/store/src/tests/nar_renderer.rs @@ -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(), -- cgit 1.4.1