Update to up-rust 0.2.0 (#81)

Also pinned pre-release version of Zenoh in order to prevent Cargo from using a more recent pre-release which might be incompatible with the required one.
eclipse-uprotocol · Oct 1, 2024 · 1e18a88 · 1e18a88
1 parent 927e2ea
commit 1e18a88
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 342 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,8 +40,8 @@ protobuf = { version = "3.3" }
 tokio = { version = "1.35.1", default-features = false }
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
-up-rust = "0.1.5"
-zenoh = { version = "1.0.0-alpha.6", features = ["unstable", "internal"] }
+up-rust = "0.2.0"
+zenoh = { version = "=1.0.0-beta.3", features = ["unstable", "internal"] }
 
 [dev-dependencies]
 chrono = "0.4.31"

diff --git a/examples/l2_rpc_client.rs b/examples/l2_rpc_client.rs
@@ -36,7 +36,7 @@ async fn main() {
 
     // create uPayload and send request
     let data = String::from("GetCurrentTime");
-    let payload = UPayload::new(data.into(), UPayloadFormat::UPAYLOAD_FORMAT_TEXT);
+    let payload = UPayload::new(data, UPayloadFormat::UPAYLOAD_FORMAT_TEXT);
     let call_options = CallOptions::for_rpc_request(
         5_000,
         Some(UUID::build()),

diff --git a/src/lib.rs b/src/lib.rs
@@ -60,8 +60,8 @@ enum MessageFlag {
     Response,
 }
 
-type SubscriberMap = Arc<Mutex<HashMap<(String, ComparableListener), Subscriber<'static, ()>>>>;
-type QueryableMap = Arc<Mutex<HashMap<(String, ComparableListener), Queryable<'static, ()>>>>;
+type SubscriberMap = Arc<Mutex<HashMap<(String, ComparableListener), Subscriber<()>>>>;
+type QueryableMap = Arc<Mutex<HashMap<(String, ComparableListener), Queryable<()>>>>;
 type QueryMap = Arc<Mutex<HashMap<String, Query>>>;
 type RpcCallbackMap = Arc<Mutex<HashMap<OwnedKeyExpr, Arc<dyn UListener>>>>;
 pub struct UPTransportZenoh {

diff --git a/src/rpc.rs b/src/rpc.rs
@@ -19,7 +19,7 @@ use up_rust::{
     LocalUriProvider, UAttributes, UCode, UMessageType, UPayloadFormat, UPriority, UStatus, UUri,
     UUID,
 };
-use zenoh::{query::QueryTarget, sample::SampleBuilderTrait};
+use zenoh::query::QueryTarget;
 
 pub struct ZenohRpcClient {
     transport: Arc<UPTransportZenoh>,
@@ -125,7 +125,10 @@ impl RpcClient for ZenohRpcClient {
                         ..Default::default()
                     }));
                 };
-                Ok(Some(UPayload::new(sample.payload().into(), payload_format)))
+                Ok(Some(UPayload::new(
+                    sample.payload().into::<Vec<u8>>(),
+                    payload_format,
+                )))
             }
             Err(e) => {
                 let msg = format!("Error while parsing Zenoh reply: {e:?}");

diff --git a/src/utransport.rs b/src/utransport.rs
@@ -29,7 +29,6 @@ use up_rust::{
 };
 use zenoh::{
     key_expr::keyexpr,
-    prelude::*,
     query::{Query, QueryTarget, Reply},
     sample::Sample,
 };

diff --git a/tests/l2_rpc.rs b/tests/l2_rpc.rs
@@ -50,7 +50,7 @@ impl RequestHandler for ExampleHandler {
         assert_eq!(data, self.request_data);
         // return
         let payload = UPayload::new(
-            self.response_data.clone().into(),
+            self.response_data.clone(),
             UPayloadFormat::UPAYLOAD_FORMAT_TEXT,
         );
         Ok(Some(payload))
@@ -91,7 +91,7 @@ async fn test_l2_rpc() {
     // Create L2 RPC client
     let rpc_client = Arc::new(ZenohRpcClient::new(uptransport_client.clone()));
 
-    let payload = UPayload::new(request_data.into(), UPayloadFormat::UPAYLOAD_FORMAT_TEXT);
+    let payload = UPayload::new(request_data, UPayloadFormat::UPAYLOAD_FORMAT_TEXT);
     let call_options = CallOptions::for_rpc_request(5_000, None, None, None);
     let result = rpc_client
         .invoke_method(

diff --git a/tests/rpc.rs b/tests/rpc.rs
@@ -151,10 +151,7 @@ async fn test_rpc_server_client(
     {
         let rpc_client = Arc::new(ZenohRpcClient::new(uptransport_client.clone()));
 
-        let payload = UPayload::new(
-            request_data.clone().into(),
-            UPayloadFormat::UPAYLOAD_FORMAT_TEXT,
-        );
+        let payload = UPayload::new(request_data.clone(), UPayloadFormat::UPAYLOAD_FORMAT_TEXT);
         let call_options = CallOptions::for_rpc_request(
             5_000,
             Some(UUID::build()),
@@ -183,7 +180,7 @@ async fn test_rpc_server_client(
 
         // Send request
         let umessage = UMessageBuilder::request(sink_uuri.clone(), src_uuri.clone(), 1000)
-            .build_with_payload(request_data.clone(), UPayloadFormat::UPAYLOAD_FORMAT_TEXT)
+            .build_with_payload(request_data, UPayloadFormat::UPAYLOAD_FORMAT_TEXT)
             .unwrap();
         uptransport_client.send(umessage).await.unwrap();