From 7a77ec87d3ae774f4ea215b07866c9b3928b16f4 Mon Sep 17 00:00:00 2001 From: fluo10 Date: Sun, 28 Sep 2025 08:39:01 +0900 Subject: [PATCH] Remove duplicated tripod_id.proto --- core/build.rs | 4 ++-- core/proto/tripod_id.proto | 17 ----------------- tripod-id/src/prost/mod.rs | 4 ++-- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 core/proto/tripod_id.proto diff --git a/core/build.rs b/core/build.rs index 473ac92..5294dd5 100644 --- a/core/build.rs +++ b/core/build.rs @@ -1,9 +1,9 @@ fn main() -> Result<(), Box> { tonic_prost_build::configure() - .extern_path(".tripod_id", "::tripod_id::prost::generated") + .extern_path(".tripod_id", "::tripod_id::prost") .compile_protos( &["proto/caretta_sync.proto", "proto/caretta_sync.common.proto"], - &["proto"] + &["proto", "../tripod-id/proto"] )?; Ok(()) } \ No newline at end of file diff --git a/core/proto/tripod_id.proto b/core/proto/tripod_id.proto deleted file mode 100644 index e05c272..0000000 --- a/core/proto/tripod_id.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; -package tripod_id; - -// Single size tripod id message -message Single { - uint32 id = 1; -} - -// Double size tripod id message -message Double { - uint32 id = 1; -} - -// Triple size tripod id message -message Triple { - uint64 id = 1; -} diff --git a/tripod-id/src/prost/mod.rs b/tripod-id/src/prost/mod.rs index ea78db9..455b4a3 100644 --- a/tripod-id/src/prost/mod.rs +++ b/tripod-id/src/prost/mod.rs @@ -1,5 +1,5 @@ pub mod generated { - include!(concat!(env!("OUT_DIR"), "/fireturtle.tripod_id.rs")); + include!(concat!(env!("OUT_DIR"), "/tripod_id.rs")); } mod single; @@ -9,7 +9,7 @@ mod triple; pub use generated::*; use crate::TripodId; -const PACKAGE_NAME: &'static str = "fireturtle.tripod_id"; +const PACKAGE_NAME: &'static str = "tripod_id"; pub type SingleMessage = Single; pub type DoubleMessage = Double; pub type TripleMessage = Triple;