From ccc3ca6a983d8a920dab811cd9e76c2a71c40720 Mon Sep 17 00:00:00 2001
From: Luca Cominardi <luca.cominardi@gmail.com>
Date: Mon, 25 Mar 2024 14:52:46 +0100
Subject: [PATCH] Update ZenohId representation (#860)

---
 Cargo.lock          | 4 ++--
 Cargo.toml          | 2 +-
 zenoh/src/sample.rs | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 843f77fabe..4ad3f6f7e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3800,9 +3800,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uhlc"
-version = "0.6.3"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1eadef1fa26cbbae1276c46781e8f4d888bdda434779c18ae6c2a0e69991885"
+checksum = "99b6df3f3e948b40e20c38a6d1fd6d8f91b3573922fc164e068ad3331560487e"
 dependencies = [
  "humantime",
  "lazy_static",
diff --git a/Cargo.toml b/Cargo.toml
index 13b43c8a82..33dd067d63 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -155,7 +155,7 @@ tokio-rustls = "0.25.0"
 # tokio-vsock = see: io/zenoh-links/zenoh-link-vsock/Cargo.toml (workspaces does not support platform dependent dependencies)
 console-subscriber = "0.2"
 typenum = "1.16.0"
-uhlc = { version = "0.6.0", default-features = false } # Default features are disabled due to usage in no_std crates
+uhlc = { version = "0.7.0", default-features = false } # Default features are disabled due to usage in no_std crates
 unzip-n = "0.1.2"
 url = "2.3.1"
 urlencoding = "2.1.2"
diff --git a/zenoh/src/sample.rs b/zenoh/src/sample.rs
index ff867cecee..e94b1a9973 100644
--- a/zenoh/src/sample.rs
+++ b/zenoh/src/sample.rs
@@ -68,7 +68,10 @@ pub struct SourceInfo {
 #[test]
 #[cfg(feature = "unstable")]
 fn source_info_stack_size() {
-    assert_eq!(std::mem::size_of::<SourceInfo>(), 16 * 2);
+    assert_eq!(std::mem::size_of::<ZenohId>(), 16);
+    assert_eq!(std::mem::size_of::<Option<ZenohId>>(), 17);
+    assert_eq!(std::mem::size_of::<Option<SourceSn>>(), 16);
+    assert_eq!(std::mem::size_of::<SourceInfo>(), 17 + 16 + 7);
 }
 
 #[zenoh_macros::unstable]