From 68c00f6403e00c67b12caa29e47e49f19b4c3a01 Mon Sep 17 00:00:00 2001
From: Mahmoud Mazouz <hello@fuzzypixelz.com>
Date: Tue, 8 Oct 2024 09:29:45 +0000
Subject: [PATCH] Sync lockfile with Zenoh `3740564` from `2024-10-08`

---
 Cargo.lock                                    | 52 +++++++++----------
 .../ros_to_zenoh_bridge/aloha_subscription.rs |  8 +--
 .../src/ros_to_zenoh_bridge/test_helpers.rs   |  3 +-
 .../src/ros_to_zenoh_bridge/zenoh_client.rs   |  3 +-
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3542597..5a3393c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5039,7 +5039,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "ahash",
  "async-trait",
@@ -5104,7 +5104,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "zenoh-collections",
 ]
@@ -5112,7 +5112,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "tracing",
  "uhlc",
@@ -5123,12 +5123,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "json5",
  "num_cpus",
@@ -5149,7 +5149,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -5160,7 +5160,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -5173,7 +5173,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -5187,7 +5187,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -5204,7 +5204,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "async-trait",
  "flume",
@@ -5227,7 +5227,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5252,7 +5252,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -5269,7 +5269,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5296,7 +5296,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -5315,7 +5315,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "async-trait",
  "nix",
@@ -5333,7 +5333,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -5353,7 +5353,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5364,7 +5364,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "anyhow",
  "async-std",
@@ -5421,7 +5421,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "git-version",
  "libloading",
@@ -5437,7 +5437,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -5451,7 +5451,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "anyhow",
 ]
@@ -5459,7 +5459,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "lazy_static",
  "ron",
@@ -5472,7 +5472,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "event-listener 5.3.1",
  "futures 0.3.30",
@@ -5485,7 +5485,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "futures 0.3.30",
  "tokio",
@@ -5498,7 +5498,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -5531,7 +5531,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3740564c769492dc9b7fafbe60c2563211ca20c4"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_subscription.rs b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_subscription.rs
index f193147..442e8a2 100644
--- a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_subscription.rs
+++ b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_subscription.rs
@@ -21,11 +21,13 @@ use std::{
     time::Duration,
 };
 
-use flume::Receiver;
 use futures::{join, Future, FutureExt};
 use tokio::sync::Mutex;
 use tracing::error;
-use zenoh::{key_expr::OwnedKeyExpr, sample::Sample, Result as ZResult, Session};
+use zenoh::{
+    handlers::FifoChannelHandler, key_expr::OwnedKeyExpr, sample::Sample, Result as ZResult,
+    Session,
+};
 
 use crate::spawn_runtime;
 
@@ -136,7 +138,7 @@ impl AlohaSubscription {
     async fn listening_task<'a, F>(
         task_running: Arc<AtomicBool>,
         accumulating_resources: &Mutex<HashMap<OwnedKeyExpr, AlohaResource>>,
-        subscriber: &'a zenoh::pubsub::Subscriber<Receiver<Sample>>,
+        subscriber: &'a zenoh::pubsub::Subscriber<FifoChannelHandler<Sample>>,
         on_resource_declared: &F,
     ) where
         F: Fn(zenoh::key_expr::KeyExpr) -> Box<dyn futures::Future<Output = ()> + Unpin + Send>
diff --git a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/test_helpers.rs b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/test_helpers.rs
index 26c9ac8..0207c58 100644
--- a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/test_helpers.rs
+++ b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/test_helpers.rs
@@ -28,6 +28,7 @@ use futures::Future;
 use rosrust::{Client, RawMessage, RawMessageDescription};
 use tracing::error;
 use zenoh::{
+    handlers::FifoChannelHandler,
     internal::{bail, zlock},
     key_expr::OwnedKeyExpr,
     sample::Sample,
@@ -360,7 +361,7 @@ impl BridgeChecker {
         &self,
         name: &str,
         data: Vec<u8>,
-    ) -> flume::Receiver<zenoh::query::Reply> {
+    ) -> FifoChannelHandler<zenoh::query::Reply> {
         self.zenoh_client
             .make_query_sync(Self::make_zenoh_key(&Self::make_topic(name)), data)
             .await
diff --git a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs
index fbfaba2..8925673 100644
--- a/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs
+++ b/zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs
@@ -16,6 +16,7 @@ use std::fmt::Display;
 
 use tracing::debug;
 use zenoh::{
+    handlers::FifoChannelHandler,
     key_expr::KeyExpr,
     qos::{CongestionControl, Reliability},
     query::Selector,
@@ -117,7 +118,7 @@ impl ZenohClient {
         &self,
         selector: IntoSelector,
         data: Vec<u8>,
-    ) -> ZResult<flume::Receiver<zenoh::query::Reply>>
+    ) -> ZResult<FifoChannelHandler<zenoh::query::Reply>>
     where
         IntoSelector: TryInto<Selector<'b>> + Display,
         <IntoSelector as TryInto<Selector<'b>>>::Error: Into<zenoh::Error>,