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

10 files changed, 18 insertions, 20 deletions

diff --git a/tvix/store/src/import.rs b/tvix/store/src/import.rs
index 7dd4770f4b99..a94ff9f2cdfc 100644
--- a/tvix/store/src/import.rs
+++ b/tvix/store/src/import.rs
@@ -2,8 +2,9 @@ use std::path::Path;
 use tracing::{debug, instrument};
 use tvix_castore::{
     blobservice::BlobService,
-    directoryservice::{DirectoryService, NamedNode, Node},
+    directoryservice::DirectoryService,
     import::fs::ingest_path,
+    {NamedNode, Node},
 };
 
 use nix_compat::{
diff --git a/tvix/store/src/nar/import.rs b/tvix/store/src/nar/import.rs
index 9f3d0e0d74ea..ac50e7e4301f 100644
--- a/tvix/store/src/nar/import.rs
+++ b/tvix/store/src/nar/import.rs
@@ -7,12 +7,12 @@ use tokio::{
 };
 use tvix_castore::{
     blobservice::BlobService,
-    directoryservice::{DirectoryService, NamedNode, Node},
+    directoryservice::DirectoryService,
     import::{
         blobs::{self, ConcurrentBlobUploader},
         ingest_entries, IngestionEntry, IngestionError,
     },
-    PathBuf,
+    PathBuf, {NamedNode, Node},
 };
 
 /// Ingests the contents from a [AsyncRead] providing NAR into the tvix store,
@@ -171,13 +171,12 @@ mod test {
     use rstest::*;
     use tokio_stream::StreamExt;
     use tvix_castore::blobservice::BlobService;
-    use tvix_castore::directoryservice::{
-        Directory, DirectoryNode, DirectoryService, FileNode, Node, SymlinkNode,
-    };
+    use tvix_castore::directoryservice::DirectoryService;
     use tvix_castore::fixtures::{
         DIRECTORY_COMPLICATED, DIRECTORY_WITH_KEEP, EMPTY_BLOB_DIGEST, HELLOWORLD_BLOB_CONTENTS,
         HELLOWORLD_BLOB_DIGEST,
     };
+    use tvix_castore::{Directory, DirectoryNode, FileNode, Node, SymlinkNode};
 
     use crate::tests::fixtures::{
         blob_service, directory_service, NAR_CONTENTS_COMPLICATED, NAR_CONTENTS_HELLOWORLD,
diff --git a/tvix/store/src/nar/mod.rs b/tvix/store/src/nar/mod.rs
index 8a19f6bd6c47..ca2423b5ce59 100644
--- a/tvix/store/src/nar/mod.rs
+++ b/tvix/store/src/nar/mod.rs
@@ -8,7 +8,7 @@ pub use import::ingest_nar_and_hash;
 pub use renderer::calculate_size_and_sha256;
 pub use renderer::write_nar;
 pub use renderer::SimpleRenderer;
-use tvix_castore::directoryservice::Node;
+use tvix_castore::Node;
 
 #[async_trait]
 pub trait NarCalculationService: Send + Sync {
diff --git a/tvix/store/src/nar/renderer.rs b/tvix/store/src/nar/renderer.rs
index bb60f7835810..fefc76956e7e 100644
--- a/tvix/store/src/nar/renderer.rs
+++ b/tvix/store/src/nar/renderer.rs
@@ -10,7 +10,8 @@ use tracing::{instrument, Span};
 use tracing_indicatif::span_ext::IndicatifSpanExt;
 use tvix_castore::{
     blobservice::BlobService,
-    directoryservice::{DirectoryService, NamedNode, Node},
+    directoryservice::DirectoryService,
+    {NamedNode, Node},
 };
 
 pub struct SimpleRenderer<BS, DS> {
diff --git a/tvix/store/src/pathinfoservice/fs/mod.rs b/tvix/store/src/pathinfoservice/fs/mod.rs
index 664cb8bbd54e..9a991a41d28d 100644
--- a/tvix/store/src/pathinfoservice/fs/mod.rs
+++ b/tvix/store/src/pathinfoservice/fs/mod.rs
@@ -1,10 +1,9 @@
 use futures::stream::BoxStream;
 use futures::StreamExt;
 use tonic::async_trait;
-use tvix_castore::directoryservice::Node;
 use tvix_castore::fs::{RootNodes, TvixStoreFs};
 use tvix_castore::{blobservice::BlobService, directoryservice::DirectoryService};
-use tvix_castore::{Error, ValidateNodeError};
+use tvix_castore::{Error, Node, ValidateNodeError};
 
 use super::PathInfoService;
 
diff --git a/tvix/store/src/pathinfoservice/grpc.rs b/tvix/store/src/pathinfoservice/grpc.rs
index 1ba1279ec626..187d9a148472 100644
--- a/tvix/store/src/pathinfoservice/grpc.rs
+++ b/tvix/store/src/pathinfoservice/grpc.rs
@@ -11,8 +11,8 @@ use tonic::{async_trait, Code};
 use tracing::{instrument, Span};
 use tracing_indicatif::span_ext::IndicatifSpanExt;
 use tvix_castore::composition::{CompositionContext, ServiceBuilder};
-use tvix_castore::directoryservice::Node;
 use tvix_castore::Error;
+use tvix_castore::Node;
 
 /// Connects to a (remote) tvix-store PathInfoService over gRPC.
 #[derive(Clone)]
diff --git a/tvix/store/src/pathinfoservice/lru.rs b/tvix/store/src/pathinfoservice/lru.rs
index 5d808cd988aa..3a7f01eb70ac 100644
--- a/tvix/store/src/pathinfoservice/lru.rs
+++ b/tvix/store/src/pathinfoservice/lru.rs
@@ -109,7 +109,7 @@ mod test {
             let root_node = p.node.as_mut().unwrap();
             if let castorepb::Node { node: Some(node) } = root_node {
                 let n = node.to_owned();
-                *node = (&tvix_castore::directoryservice::Node::try_from(&n)
+                *node = (&tvix_castore::Node::try_from(&n)
                     .unwrap()
                     .rename("11111111111111111111111111111111-dummy2".into()))
                     .into();
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.
diff --git a/tvix/store/src/tests/nar_renderer.rs b/tvix/store/src/tests/nar_renderer.rs
index d2ee42f8df18..5c2c60ade410 100644
--- a/tvix/store/src/tests/nar_renderer.rs
+++ b/tvix/store/src/tests/nar_renderer.rs
@@ -9,9 +9,8 @@ use std::io;
 use std::sync::Arc;
 use tokio::io::sink;
 use tvix_castore::blobservice::BlobService;
-use tvix_castore::directoryservice::{
-    DirectoryNode, DirectoryService, FileNode, Node, SymlinkNode,
-};
+use tvix_castore::directoryservice::DirectoryService;
+use tvix_castore::{DirectoryNode, FileNode, Node, SymlinkNode};
 
 #[rstest]
 #[tokio::test]