maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/castore): move *Node and Directory to crate root

Browse source 
*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
This commit is contained in:
Florian Klink 2024-08-13 20:04:58 +03:00 • committed by clbot
parent 2f4185ff1a
commit c7845f3c88
42 changed files with 620 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tvix/store/src/proto/mod.rs
View file

@ -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

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

@ -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.