diff options
| author | Florian Klink <flokli@flokli.de> | 2023-07-19T15·52+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-07-22T09·03+0000 |
| commit | 432222f098bfceb033e63e9a63687e35574457f9 (patch) | |
| tree | 43a5e38cf79827dd63aa2adbd841da6aa62cf1de /tvix/store/src/tests/nar_renderer.rs | |
| parent | 7971d7d9ff42ed00f6f70121f372dd744f45915b (diff) | |
feat(tvix/store/proto): use Bytes instead of Vec<u8> r/6439
Makes use of https://github.com/tokio-rs/prost/pull/341, which makes our bytes field cheaper to clone. It's a bit annoying to configure due to https://github.com/hyperium/tonic/issues/908, but the workaround does get the job done. Change-Id: I25714600b041bb5432d3adf5859b151e72b12778 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8975 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to '')
| -rw-r--r-- | tvix/store/src/tests/nar_renderer.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tvix/store/src/tests/nar_renderer.rs b/tvix/store/src/tests/nar_renderer.rs index 055538376b..75dab76a95 100644 --- a/tvix/store/src/tests/nar_renderer.rs +++ b/tvix/store/src/tests/nar_renderer.rs @@ -36,7 +36,7 @@ fn single_file_missing_blob() { &mut buf, &crate::proto::node::Node::File(FileNode { name: "doesntmatter".into(), - digest: HELLOWORLD_BLOB_DIGEST.to_vec(), + digest: HELLOWORLD_BLOB_DIGEST.clone().into(), size: HELLOWORLD_BLOB_CONTENTS.len() as u32, executable: false, }), @@ -77,7 +77,7 @@ fn single_file_wrong_blob_size() { &mut buf, &crate::proto::node::Node::File(FileNode { name: "doesntmatter".into(), - digest: HELLOWORLD_BLOB_DIGEST.to_vec(), + digest: HELLOWORLD_BLOB_DIGEST.clone().into(), size: 42, // <- note the wrong size here! executable: false, }), @@ -102,7 +102,7 @@ fn single_file_wrong_blob_size() { &mut buf, &crate::proto::node::Node::File(FileNode { name: "doesntmatter".into(), - digest: HELLOWORLD_BLOB_DIGEST.to_vec(), + digest: HELLOWORLD_BLOB_DIGEST.clone().into(), size: 2, // <- note the wrong size here! executable: false, }), @@ -127,7 +127,7 @@ fn single_file() { // insert blob into the store let mut writer = blob_service.open_write(); io::copy( - &mut io::Cursor::new(HELLOWORLD_BLOB_CONTENTS.to_vec()), + &mut io::Cursor::new(HELLOWORLD_BLOB_CONTENTS.clone()), &mut writer, ) .unwrap(); @@ -139,7 +139,7 @@ fn single_file() { &mut buf, &crate::proto::node::Node::File(FileNode { name: "doesntmatter".into(), - digest: HELLOWORLD_BLOB_DIGEST.to_vec(), + digest: HELLOWORLD_BLOB_DIGEST.clone().into(), size: HELLOWORLD_BLOB_CONTENTS.len() as u32, executable: false, }), @@ -160,7 +160,7 @@ fn test_complicated() { // insert blob into the store let mut writer = blob_service.open_write(); io::copy( - &mut io::Cursor::new(EMPTY_BLOB_CONTENTS.to_vec()), + &mut io::Cursor::new(EMPTY_BLOB_CONTENTS.clone()), &mut writer, ) .unwrap(); @@ -177,7 +177,7 @@ fn test_complicated() { &mut buf, &crate::proto::node::Node::Directory(DirectoryNode { name: "doesntmatter".into(), - digest: DIRECTORY_COMPLICATED.digest().to_vec(), + digest: DIRECTORY_COMPLICATED.digest().clone().into(), size: DIRECTORY_COMPLICATED.size(), }), blob_service.clone(), @@ -191,7 +191,7 @@ fn test_complicated() { let (nar_size, nar_digest) = calculate_size_and_sha256( &crate::proto::node::Node::Directory(DirectoryNode { name: "doesntmatter".into(), - digest: DIRECTORY_COMPLICATED.digest().to_vec(), + digest: DIRECTORY_COMPLICATED.digest().clone().into(), size: DIRECTORY_COMPLICATED.size(), }), blob_service, |