chore(tvix/store): move protos into separate mod.rs r/5907

This allows adding more stuff into this namespace, from different files.

Also move tests on proto-related code from src/tests to src/proto/tests.

Change-Id: I49e066fce90efbc18e16d68f94497b32ed5625c0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8091
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI

6 files changed, 6 insertions, 3 deletions

diff --git a/tvix/store/src/proto.rs b/tvix/store/src/proto/mod.rs
index 0ca3af321c..12a6bbae90 100644
--- a/tvix/store/src/proto.rs
+++ b/tvix/store/src/proto/mod.rs
@@ -15,6 +15,9 @@ tonic::include_proto!("tvix.store.v1");
 /// [`tonic_reflection`](https://docs.rs/tonic-reflection).
 pub const FILE_DESCRIPTOR_SET: &[u8] = tonic::include_file_descriptor_set!("tvix.store.v1");
 
+#[cfg(test)]
+mod tests;
+
 /// Errors that can occur during the validation of Directory messages.
 #[derive(Debug, PartialEq, Eq, Error)]
 pub enum ValidateDirectoryError {
diff --git a/tvix/store/src/tests/directory.rs b/tvix/store/src/proto/tests/directory.rs
index 890cb2164a..890cb2164a 100644
--- a/tvix/store/src/tests/directory.rs
+++ b/tvix/store/src/proto/tests/directory.rs
diff --git a/tvix/store/src/tests/directory_nodes_iterator.rs b/tvix/store/src/proto/tests/directory_nodes_iterator.rs
index 8f591f0560..8f591f0560 100644
--- a/tvix/store/src/tests/directory_nodes_iterator.rs
+++ b/tvix/store/src/proto/tests/directory_nodes_iterator.rs
diff --git a/tvix/store/src/proto/tests/mod.rs b/tvix/store/src/proto/tests/mod.rs
new file mode 100644
index 0000000000..04631afe40
--- /dev/null
+++ b/tvix/store/src/proto/tests/mod.rs
@@ -0,0 +1,3 @@
+mod directory;
+mod directory_nodes_iterator;
+mod pathinfo;
diff --git a/tvix/store/src/tests/pathinfo.rs b/tvix/store/src/proto/tests/pathinfo.rs
index 35a2771c30..35a2771c30 100644
--- a/tvix/store/src/tests/pathinfo.rs
+++ b/tvix/store/src/proto/tests/pathinfo.rs
diff --git a/tvix/store/src/tests/mod.rs b/tvix/store/src/tests/mod.rs
index 57ae1df9f6..b945763f36 100644
--- a/tvix/store/src/tests/mod.rs
+++ b/tvix/store/src/tests/mod.rs
@@ -1,6 +1,3 @@
-mod directory;
-mod directory_nodes_iterator;
 mod directory_service;
 mod nar;
 mod path_info_service;
-mod pathinfo;