From 1e686dbca721cc70b213528f26b24fcbf2e945fb Mon Sep 17 00:00:00 2001
From: Ryan Savino <ryan.savino@amd.com>
Date: Wed, 4 Jun 2025 01:09:44 +0000
Subject: [PATCH] agent: Remove casting and fix Arc declaration

Removed unnecessary dynamic dispatch for services. Properly dereferenced
service Box values and stored in Arc.

Co-authored-by: Ruoqing He <heruoqing@iscas.ac.cn>
Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
Signed-Off-By: Ryan Savino <ryan.savino@amd.com>
---
 src/agent/src/cdh.rs | 5 ++---
 src/agent/src/rpc.rs | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/agent/src/cdh.rs b/src/agent/src/cdh.rs
index 07f734757..46ca3c64f 100644
--- a/src/agent/src/cdh.rs
+++ b/src/agent/src/cdh.rs
@@ -270,9 +270,8 @@ mod tests {
 
     fn start_ttrpc_server(cdh_socket_uri: String) {
         tokio::spawn(async move {
-            let ss = Box::new(TestService {})
-                as Box<dyn confidential_data_hub_ttrpc_async::SealedSecretService + Send + Sync>;
-            let ss = Arc::new(ss);
+            let ss = Box::new(TestService {});
+            let ss = Arc::new(*ss);
             let ss_service = confidential_data_hub_ttrpc_async::create_sealed_secret_service(ss);
 
             remove_if_sock_exist(&cdh_socket_uri).unwrap();
diff --git a/src/agent/src/rpc.rs b/src/agent/src/rpc.rs
index 05c392494..3a1a4bd70 100644
--- a/src/agent/src/rpc.rs
+++ b/src/agent/src/rpc.rs
@@ -1796,11 +1796,11 @@ pub async fn start(
         sandbox: s,
         init_mode,
         oma,
-    }) as Box<dyn agent_ttrpc::AgentService + Send + Sync>;
-    let aservice = agent_ttrpc::create_agent_service(Arc::new(agent_service));
+    });
+    let aservice = agent_ttrpc::create_agent_service(Arc::new(*agent_service));
 
-    let health_service = Box::new(HealthService {}) as Box<dyn health_ttrpc::Health + Send + Sync>;
-    let hservice = health_ttrpc::create_health(Arc::new(health_service));
+    let health_service = Box::new(HealthService {});
+    let hservice = health_ttrpc::create_health(Arc::new(*health_service));
 
     let server = TtrpcServer::new()
         .bind(server_address)?