chore(tvix/[ca]store): allow building without tonic-reflection r/6660

 - rename the feature to `tonic-reflection` in both tvix-store and tvix-
   castore.
 - set it to disabled in tvix-castore by default
 - enable it in tvix-store, and pull in tvix-castore with the feature
   enabled.

Change-Id: Ie22833d85569502cae55812f6eeb17a9c15b9e2c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9472
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>

4 files changed, 7 insertions, 7 deletions

diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml
index 202bae1858..da3d23cb30 100644
--- a/tvix/store/Cargo.toml
+++ b/tvix/store/Cargo.toml
@@ -80,7 +80,7 @@ tempfile = "3.3.0"
 tonic-mock = { git = "https://github.com/brainrake/tonic-mock", branch = "bump-dependencies" }
 
 [features]
-default = ["fuse", "virtiofs", "reflection"]
+default = ["fuse", "virtiofs", "tonic-reflection"]
 fs = ["dep:libc", "dep:fuse-backend-rs"]
 virtiofs = [
   "fs",
@@ -94,4 +94,4 @@ virtiofs = [
   "fuse-backend-rs?/virtiofs",
 ]
 fuse = ["fs"]
-reflection = ["tonic-reflection"]
+tonic-reflection = ["dep:tonic-reflection", "tvix-castore/tonic-reflection"]
diff --git a/tvix/store/build.rs b/tvix/store/build.rs
index 9a7356f84e..cfeda59698 100644
--- a/tvix/store/build.rs
+++ b/tvix/store/build.rs
@@ -4,7 +4,7 @@ fn main() -> Result<()> {
     #[allow(unused_mut)]
     let mut builder = tonic_build::configure();
 
-    #[cfg(feature = "reflection")]
+    #[cfg(feature = "tonic-reflection")]
     {
         let out_dir = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap());
         let descriptor_path = out_dir.join("tvix.store.v1.bin");
diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs
index e80014047c..14b38da0a5 100644
--- a/tvix/store/src/bin/tvix-store.rs
+++ b/tvix/store/src/bin/tvix-store.rs
@@ -33,9 +33,9 @@ use tvix_store::fs::fuse::FuseDaemon;
 #[cfg(feature = "virtiofs")]
 use tvix_store::fs::virtiofs::start_virtiofs_daemon;
 
-#[cfg(feature = "reflection")]
+#[cfg(feature = "tonic-reflection")]
 use tvix_castore::proto::FILE_DESCRIPTOR_SET as CASTORE_FILE_DESCRIPTOR_SET;
-#[cfg(feature = "reflection")]
+#[cfg(feature = "tonic-reflection")]
 use tvix_store::proto::FILE_DESCRIPTOR_SET;
 
 use clap::Parser;
@@ -210,7 +210,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     GRPCPathInfoServiceWrapper::from(path_info_service),
                 ));
 
-            #[cfg(feature = "reflection")]
+            #[cfg(feature = "tonic-reflection")]
             {
                 let reflection_svc = tonic_reflection::server::Builder::configure()
                     .register_encoded_file_descriptor_set(CASTORE_FILE_DESCRIPTOR_SET)
diff --git a/tvix/store/src/proto/mod.rs b/tvix/store/src/proto/mod.rs
index 6924b023c9..f2bec10f16 100644
--- a/tvix/store/src/proto/mod.rs
+++ b/tvix/store/src/proto/mod.rs
@@ -10,7 +10,7 @@ pub use grpc_pathinfoservice_wrapper::GRPCPathInfoServiceWrapper;
 
 tonic::include_proto!("tvix.store.v1");
 
-#[cfg(feature = "reflection")]
+#[cfg(feature = "tonic-reflection")]
 /// Compiled file descriptors for implementing [gRPC
 /// reflection](https://github.com/grpc/grpc/blob/master/doc/server-reflection.md) with e.g.
 /// [`tonic_reflection`](https://docs.rs/tonic-reflection).