mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/store/tests/fixtures): use [u8; 20]

Browse source 
This makes the fixture more use-able when interacting with the trait,
the Bytes are only useful for the gRPC version.

Change-Id: Iaaea1adc6df18491f236a28c4343f5b4ee5fcfd3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11271
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-03-27 12:22:45 +01:00 committed by flokli
parent bfc5b209a6
commit 93dc5df957
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tvix/store/src/pathinfoservice/grpc.rs
View file

@ -195,7 +195,7 @@ mod tests {
}; };
let path_info = grpc_client let path_info = grpc_client
.get(fixtures::DUMMY_OUTPUT_HASH.to_vec().try_into().unwrap()) .get(fixtures::DUMMY_OUTPUT_HASH)
.await .await
.expect("must not be error"); .expect("must not be error");

5
tvix/store/src/proto/tests/grpc_pathinfoservice.rs
View file

@ -7,6 +7,7 @@ use crate::tests::fixtures::DUMMY_OUTPUT_HASH;
use crate::tests::utils::gen_blob_service; use crate::tests::utils::gen_blob_service;
use crate::tests::utils::gen_directory_service; use crate::tests::utils::gen_directory_service;
use crate::tests::utils::gen_pathinfo_service; use crate::tests::utils::gen_pathinfo_service;
use bytes::Bytes;
use futures::stream::BoxStream; use futures::stream::BoxStream;
use std::sync::Arc; use std::sync::Arc;
use tonic::Request; use tonic::Request;
@ -35,7 +36,7 @@ async fn not_found() {
let resp = service let resp = service
.get(Request::new(GetPathInfoRequest { .get(Request::new(GetPathInfoRequest {
by_what: Some(ByOutputHash(DUMMY_OUTPUT_HASH.clone())), by_what: Some(ByOutputHash(Bytes::from(DUMMY_OUTPUT_HASH.to_vec()))),
})) }))
.await; .await;
@ -65,7 +66,7 @@ async fn put_get() {
let resp = service let resp = service
.get(Request::new(GetPathInfoRequest { .get(Request::new(GetPathInfoRequest {
by_what: Some(ByOutputHash(DUMMY_OUTPUT_HASH.clone())), by_what: Some(ByOutputHash(Bytes::from(DUMMY_OUTPUT_HASH.to_vec()))),
})) }))
.await; .await;

6
tvix/store/src/proto/tests/pathinfo.rs
View file

@ -235,8 +235,8 @@ fn validate_inconsistent_narinfo_reference_name_digest() {
match path_info.validate().expect_err("must fail") { match path_info.validate().expect_err("must fail") {
ValidatePathInfoError::InconsistentNarinfoReferenceNameDigest(0, e_expected, e_actual) => { ValidatePathInfoError::InconsistentNarinfoReferenceNameDigest(0, e_expected, e_actual) => {
assert_eq!(path_info.references[0][..], e_expected); assert_eq!(path_info.references[0][..], e_expected[..]);
assert_eq!(DUMMY_OUTPUT_HASH[..], e_actual); assert_eq!(DUMMY_OUTPUT_HASH, e_actual);
} }
e => panic!("unexpected error: {:?}", e), e => panic!("unexpected error: {:?}", e),
} }
@ -274,7 +274,7 @@ fn validate_valid_deriver() {
let narinfo = path_info.narinfo.as_mut().unwrap(); let narinfo = path_info.narinfo.as_mut().unwrap();
narinfo.deriver = Some(crate::proto::StorePath { narinfo.deriver = Some(crate::proto::StorePath {
name: "foo".to_string(), name: "foo".to_string(),
digest: DUMMY_OUTPUT_HASH.clone(), digest: Bytes::from(DUMMY_OUTPUT_HASH.as_slice()),
}); });
path_info.validate().expect("must validate"); path_info.validate().expect("must validate");

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

@ -5,11 +5,9 @@ use tvix_castore::proto as castorepb;
use crate::proto::{nar_info::ca, nar_info::Ca, NarInfo, PathInfo}; use crate::proto::{nar_info::ca, nar_info::Ca, NarInfo, PathInfo};
pub const DUMMY_NAME: &str = "00000000000000000000000000000000-dummy"; pub const DUMMY_NAME: &str = "00000000000000000000000000000000-dummy";
pub const DUMMY_OUTPUT_HASH: [u8; 20] = [0; 20];
lazy_static! { lazy_static! {
// output hash
pub static ref DUMMY_OUTPUT_HASH: bytes::Bytes = vec![0; 20].into();
/// The NAR representation of a symlink pointing to `/nix/store/somewhereelse` /// The NAR representation of a symlink pointing to `/nix/store/somewhereelse`
pub static ref NAR_CONTENTS_SYMLINK: Vec<u8> = vec![ pub static ref NAR_CONTENTS_SYMLINK: Vec<u8> = vec![
13, 0, 0, 0, 0, 0, 0, 0, b'n', b'i', b'x', b'-', b'a', b'r', b'c', b'h', b'i', b'v', b'e', b'-', b'1', 0, 13, 0, 0, 0, 0, 0, 0, 0, b'n', b'i', b'x', b'-', b'a', b'r', b'c', b'h', b'i', b'v', b'e', b'-', b'1', 0,
@ -104,7 +102,7 @@ lazy_static! {
size: 0, size: 0,
})), })),
}), }),
references: vec![DUMMY_OUTPUT_HASH.clone()], references: vec![DUMMY_OUTPUT_HASH.as_slice().into()],
narinfo: None, narinfo: None,
}; };