diff options
| author | Florian Klink <flokli@flokli.de> | 2024-08-13T17·04+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-08-13T18·39+0000 |
| commit | c7845f3c882d0f1b215813bf0ef8231c2c03d7b6 (patch) | |
| tree | 681774cbfa98e5021aa68b361bc937b88881b5c8 /tvix/store/src/proto | |
| parent | 2f4185ff1a54e1bdbaa062a9e4e1c8137d141762 (diff) | |
refactor(tvix/castore): move *Node and Directory to crate root r/8486
*Node and Directory are types of the tvix-castore model, not the tvix DirectoryService model. A DirectoryService only happens to send Directories. Move types into individual files in a nodes/ subdirectory, as it's gotten too cluttered in a single file, and (re-)export all types from the crate root. This has the effect that we now cannot poke at private fields directly from other files inside `crate::directoryservice` (as it's not all in the same file anymore), but that's a good thing, it now forces us to go through the proper accessors. For the same reasons, we currently also need to introduce the `rename` functions on each *Node directly. A followup is gonna move the names out of the individual enum kinds, so we can better represent "unnamed nodes". Change-Id: Icdb34dcfe454c41c94f2396e8e99973d27db8418 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12199 Reviewed-by: yuka <yuka@yuka.dev> Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/store/src/proto')
| -rw-r--r-- | tvix/store/src/proto/mod.rs | 5 | ||||
| -rw-r--r-- | tvix/store/src/proto/tests/pathinfo.rs | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tvix/store/src/proto/mod.rs b/tvix/store/src/proto/mod.rs index 5434df49daaa..375fb0dcadb8 100644 --- a/tvix/store/src/proto/mod.rs +++ b/tvix/store/src/proto/mod.rs @@ -9,8 +9,7 @@ use nix_compat::{ store_path::{self, StorePathRef}, }; use thiserror::Error; -use tvix_castore::directoryservice::NamedNode; -use tvix_castore::ValidateNodeError; +use tvix_castore::{NamedNode, ValidateNodeError}; mod grpc_pathinfoservice_wrapper; @@ -162,7 +161,7 @@ impl PathInfo { None => Err(ValidatePathInfoError::NoNodePresent)?, Some(node) => { // TODO save result somewhere - let node: tvix_castore::directoryservice::Node = node + let node: tvix_castore::Node = node .try_into() .map_err(ValidatePathInfoError::InvalidRootNode)?; // parse the name of the node itself and return diff --git a/tvix/store/src/proto/tests/pathinfo.rs b/tvix/store/src/proto/tests/pathinfo.rs index 1e4e7199049a..928bb8c8b185 100644 --- a/tvix/store/src/proto/tests/pathinfo.rs +++ b/tvix/store/src/proto/tests/pathinfo.rs @@ -231,7 +231,7 @@ fn validate_symlink_empty_target_invalid() { target: "".into(), }); - tvix_castore::directoryservice::Node::try_from(&node).expect_err("must fail validation"); + tvix_castore::Node::try_from(&node).expect_err("must fail validation"); } /// Create a node with a symlink target including null bytes, and ensure it @@ -243,7 +243,7 @@ fn validate_symlink_target_null_byte_invalid() { target: "foo\0".into(), }); - tvix_castore::directoryservice::Node::try_from(&node).expect_err("must fail validation"); + tvix_castore::Node::try_from(&node).expect_err("must fail validation"); } /// Create a PathInfo with a correct deriver field and ensure it succeeds. |