diff options
| author | Florian Klink <flokli@flokli.de> | 2022-11-12T23·23+0000 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2022-12-26T11·38+0000 |
| commit | 3676ce8d6dc30a5439beec4a705a416597124435 (patch) | |
| tree | cef3871ee8ebd3d343b6e831ac29e726900e5d56 /tvix/store | |
| parent | 7fbac93940a44cf6b790aba16d316d9531558187 (diff) | |
feat(tvix/store): use tonic-build for protos r/5492
While prost-build already exposes protobuf message types as structs, we actually need tonic-build too, to be able to get traits for all the RPC services defined in the proto files. Change-Id: I7f4c08454bf0d280d577975c7cdae13ccc2d933b Reviewed-on: https://cl.tvl.fyi/c/depot/+/7320 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/store')
| -rw-r--r-- | tvix/store/Cargo.toml | 2 | ||||
| -rw-r--r-- | tvix/store/build.rs | 35 | ||||
| -rw-r--r-- | tvix/store/src/proto.rs | 2 |
3 files changed, 22 insertions, 17 deletions
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index c807da760a..2e03788067 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -6,6 +6,8 @@ edition = "2021" [dependencies] blake3 = { version = "1.3.1", features = ["rayon", "std"] } prost = "0.11.2" +tonic = "0.8.2" [build-dependencies] prost-build = "0.11.2" +tonic-build = "0.8.2" diff --git a/tvix/store/build.rs b/tvix/store/build.rs index 4d3dc513f6..335e87b6c1 100644 --- a/tvix/store/build.rs +++ b/tvix/store/build.rs @@ -1,21 +1,24 @@ use std::io::Result; fn main() -> Result<()> { - prost_build::compile_protos( - &[ - "tvix/store/protos/castore.proto", - "tvix/store/protos/pathinfo.proto", - "tvix/store/protos/rpc_blobstore.proto", - "tvix/store/protos/rpc_directory.proto", - "tvix/store/protos/rpc_pathinfo.proto", - ], - // If we are in running `cargo build` manually, using `../..` works fine, - // but in case we run inside a nix build, we need to instead point PROTO_ROOT - // to a sparseTree containing that structure. - &[match std::env::var_os(&"PROTO_ROOT") { - Some(proto_root) => proto_root.to_str().unwrap().to_owned(), - None => "../..".to_string(), - }], - )?; + tonic_build::configure() + .build_server(true) + .build_client(true) + .compile( + &[ + "tvix/store/protos/castore.proto", + "tvix/store/protos/pathinfo.proto", + "tvix/store/protos/rpc_blobstore.proto", + "tvix/store/protos/rpc_directory.proto", + "tvix/store/protos/rpc_pathinfo.proto", + ], + // If we are in running `cargo build` manually, using `../..` works fine, + // but in case we run inside a nix build, we need to instead point PROTO_ROOT + // to a sparseTree containing that structure. + &[match std::env::var_os(&"PROTO_ROOT") { + Some(proto_root) => proto_root.to_str().unwrap().to_owned(), + None => "../..".to_string(), + }], + )?; Ok(()) } diff --git a/tvix/store/src/proto.rs b/tvix/store/src/proto.rs index f819d7b4fc..de8095495e 100644 --- a/tvix/store/src/proto.rs +++ b/tvix/store/src/proto.rs @@ -1,6 +1,6 @@ use prost::Message; -include!(concat!(env!("OUT_DIR"), "/tvix.store.v1.rs")); +tonic::include_proto!("tvix.store.v1"); impl Directory { // The size of a directory is the number of all regular and symlink elements, |