From 9118dc8a5056ad0cdb91a0688f50ac5d6e28a1ec Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 17 Oct 2023 23:27:37 +0100 Subject: refactor(tvix/store): move deriver field into narinfo submessage This information is present in the .narinfo files, it should have gone there. Change-Id: Ib43d0cf30c2795bf1fe77c46646174353ade0458 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9794 Autosubmit: flokli Reviewed-by: Connor Brewster Tested-by: BuildkiteCI --- tvix/store/src/proto/tests/pathinfo.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tvix/store/src/proto/tests') diff --git a/tvix/store/src/proto/tests/pathinfo.rs b/tvix/store/src/proto/tests/pathinfo.rs index 03094ed734ce..392d5d8127b4 100644 --- a/tvix/store/src/proto/tests/pathinfo.rs +++ b/tvix/store/src/proto/tests/pathinfo.rs @@ -266,10 +266,11 @@ fn validate_symlink_target_null_byte_invalid() { /// Create a PathInfo with a correct deriver field and ensure it succeeds. #[test] fn validate_valid_deriver() { - let mut path_info = PATH_INFO_WITHOUT_NARINFO.clone(); + let mut path_info = PATH_INFO_WITH_NARINFO.clone(); // add a valid deriver - path_info.deriver = Some(crate::proto::StorePath { + let narinfo = path_info.narinfo.as_mut().unwrap(); + narinfo.deriver = Some(crate::proto::StorePath { name: "foo".to_string(), digest: DUMMY_OUTPUT_HASH.clone(), }); @@ -280,10 +281,11 @@ fn validate_valid_deriver() { /// Create a PathInfo with a broken deriver field and ensure it fails. #[test] fn validate_invalid_deriver() { - let mut path_info = PATH_INFO_WITHOUT_NARINFO.clone(); + let mut path_info = PATH_INFO_WITH_NARINFO.clone(); // add a broken deriver (invalid digest) - path_info.deriver = Some(crate::proto::StorePath { + let narinfo = path_info.narinfo.as_mut().unwrap(); + narinfo.deriver = Some(crate::proto::StorePath { name: "foo".to_string(), digest: vec![].into(), }); -- cgit 1.4.1