From 9d05428bdd2aa8108fb8c564a571770acbf2131c Mon Sep 17 00:00:00 2001 From: Noor Date: Wed, 19 Mar 2025 00:23:56 +0530 Subject: [PATCH] Update detee-shared and reorganize proto imports --- Cargo.lock | 2 +- src/grpc.rs | 6 +++--- src/main.rs | 11 ++++------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e45a6a..852c898 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -411,7 +411,7 @@ dependencies = [ [[package]] name = "detee-shared" version = "0.1.0" -source = "git+ssh://git@gitea.detee.cloud/testnet/proto?branch=main#099f0a0488bce8e59c9c9e9a5e9b1f24998f1633" +source = "git+ssh://git@gitea.detee.cloud/testnet/proto?branch=main#cf0c9a2c0d2edf9254f25c6faa7494afcfa00d64" dependencies = [ "base64", "prost", diff --git a/src/grpc.rs b/src/grpc.rs index 49a60bf..faaa0ef 100644 --- a/src/grpc.rs +++ b/src/grpc.rs @@ -1,6 +1,6 @@ use anyhow::Result; -use detee_shared::sgx::pb::brain::brain_app_daemon_client::BrainAppDaemonClient; -use detee_shared::sgx::pb::brain::{ +use detee_shared::app_proto::brain_app_daemon_client::BrainAppDaemonClient; +use detee_shared::app_proto::{ AppContract, BrainMessageApp, DaemonAuth, DaemonMessageApp, RegisterAppNodeReq, }; use tokio::sync::mpsc::Receiver; @@ -139,7 +139,7 @@ pub async fn send_messages( ) -> Result<()> { let rx_stream = ReceiverStream::new(rx); tx.send(DaemonMessageApp { - msg: Some(detee_shared::sgx::pb::brain::daemon_message_app::Msg::Auth( + msg: Some(detee_shared::app_proto::daemon_message_app::Msg::Auth( sign_stream_auth(contracts)?, )), }) diff --git a/src/main.rs b/src/main.rs index e9d38bb..94837f9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,13 +8,10 @@ pub mod utils; use anyhow::anyhow; use anyhow::Result; use data::App; -use detee_shared::sgx::pb::brain::brain_message_app; -use detee_shared::sgx::pb::brain::AppContract; -use detee_shared::sgx::pb::brain::AppNodeResources; -use detee_shared::sgx::pb::brain::BrainMessageApp; -use detee_shared::sgx::pb::brain::DaemonMessageApp; -use detee_shared::sgx::pb::brain::MappedPort; -use detee_shared::sgx::pb::brain::NewAppRes; +use detee_shared::app_proto::{ + brain_message_app, AppContract, AppNodeResources, BrainMessageApp, DaemonMessageApp, + MappedPort, NewAppRes, +}; use detee_shared::sgx::types::brain::AppDeployConfig; use global::PUBLIC_KEY; use log::info;