diff options
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. |