NodeType::DEFAULT

eclipse-zenoh · Feb 9, 2024 · 665ef02 · 665ef02
1 parent 375fd01
commit 665ef02
Show file tree

Hide file tree

Showing 32 changed files with 97 additions and 95 deletions.
diff --git a/commons/zenoh-codec/benches/codec.rs b/commons/zenoh-codec/benches/codec.rs
@@ -84,7 +84,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         wire_expr: WireExpr::empty(),
         ext_qos: ext::QoSType::DEFAULT,
         ext_tstamp: None,
-        ext_nodeid: ext::NodeIdType::default(),
+        ext_nodeid: ext::NodeIdType::DEFAULT,
         payload: PushBody::Put(Put {
             timestamp: None,
             encoding: Encoding::DEFAULT,
@@ -130,7 +130,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         wire_expr: WireExpr::empty(),
         ext_qos: ext::QoSType::DEFAULT,
         ext_tstamp: None,
-        ext_nodeid: ext::NodeIdType::default(),
+        ext_nodeid: ext::NodeIdType::DEFAULT,
         payload: PushBody::Put(Put {
             timestamp: None,
             encoding: Encoding::DEFAULT,
@@ -171,7 +171,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         wire_expr: WireExpr::empty(),
         ext_qos: ext::QoSType::DEFAULT,
         ext_tstamp: None,
-        ext_nodeid: ext::NodeIdType::default(),
+        ext_nodeid: ext::NodeIdType::DEFAULT,
         payload: PushBody::Put(Put {
             timestamp: None,
             encoding: Encoding::DEFAULT,
@@ -212,7 +212,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         wire_expr: WireExpr::empty(),
         ext_qos: ext::QoSType::DEFAULT,
         ext_tstamp: None,
-        ext_nodeid: ext::NodeIdType::default(),
+        ext_nodeid: ext::NodeIdType::DEFAULT,
         payload: PushBody::Put(Put {
             timestamp: None,
             encoding: Encoding::DEFAULT,
@@ -240,7 +240,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         wire_expr: WireExpr::empty(),
         ext_qos: ext::QoSType::DEFAULT,
         ext_tstamp: None,
-        ext_nodeid: ext::NodeIdType::default(),
+        ext_nodeid: ext::NodeIdType::DEFAULT,
         payload: PushBody::Put(Put {
             timestamp: None,
             encoding: Encoding::DEFAULT,
@@ -279,7 +279,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         wire_expr: WireExpr::empty(),
         ext_qos: ext::QoSType::DEFAULT,
         ext_tstamp: None,
-        ext_nodeid: ext::NodeIdType::default(),
+        ext_nodeid: ext::NodeIdType::DEFAULT,
         payload: PushBody::Put(Put {
             timestamp: None,
             encoding: Encoding::DEFAULT,

diff --git a/commons/zenoh-codec/src/network/declare.rs b/commons/zenoh-codec/src/network/declare.rs
@@ -104,7 +104,7 @@ where
         let mut header = id::DECLARE;
         let mut n_exts = ((ext_qos != &declare::ext::QoSType::DEFAULT) as u8)
             + (ext_tstamp.is_some() as u8)
-            + ((ext_nodeid != &declare::ext::NodeIdType::default()) as u8);
+            + ((ext_nodeid != &declare::ext::NodeIdType::DEFAULT) as u8);
         if n_exts != 0 {
             header |= declare::flag::Z;
         }
@@ -119,7 +119,7 @@ where
             n_exts -= 1;
             self.write(&mut *writer, (ts, n_exts != 0))?;
         }
-        if ext_nodeid != &declare::ext::NodeIdType::default() {
+        if ext_nodeid != &declare::ext::NodeIdType::DEFAULT {
             n_exts -= 1;
             self.write(&mut *writer, (*ext_nodeid, n_exts != 0))?;
         }
@@ -159,7 +159,7 @@ where
         // Extensions
         let mut ext_qos = declare::ext::QoSType::DEFAULT;
         let mut ext_tstamp = None;
-        let mut ext_nodeid = declare::ext::NodeIdType::default();
+        let mut ext_nodeid = declare::ext::NodeIdType::DEFAULT;
 
         let mut has_ext = imsg::has_flag(self.header, declare::flag::Z);
         while has_ext {

diff --git a/commons/zenoh-codec/src/network/push.rs b/commons/zenoh-codec/src/network/push.rs
@@ -46,7 +46,7 @@ where
         let mut header = id::PUSH;
         let mut n_exts = ((ext_qos != &ext::QoSType::DEFAULT) as u8)
             + (ext_tstamp.is_some() as u8)
-            + ((ext_nodeid != &ext::NodeIdType::default()) as u8);
+            + ((ext_nodeid != &ext::NodeIdType::DEFAULT) as u8);
         if n_exts != 0 {
             header |= flag::Z;
         }
@@ -70,7 +70,7 @@ where
             n_exts -= 1;
             self.write(&mut *writer, (ts, n_exts != 0))?;
         }
-        if ext_nodeid != &ext::NodeIdType::default() {
+        if ext_nodeid != &ext::NodeIdType::DEFAULT {
             n_exts -= 1;
             self.write(&mut *writer, (*ext_nodeid, n_exts != 0))?;
         }
@@ -118,7 +118,7 @@ where
         // Extensions
         let mut ext_qos = ext::QoSType::DEFAULT;
         let mut ext_tstamp = None;
-        let mut ext_nodeid = ext::NodeIdType::default();
+        let mut ext_nodeid = ext::NodeIdType::DEFAULT;
 
         let mut has_ext = imsg::has_flag(self.header, flag::Z);
         while has_ext {

diff --git a/commons/zenoh-codec/src/network/request.rs b/commons/zenoh-codec/src/network/request.rs
@@ -98,7 +98,7 @@ where
             + ((ext_target != &ext::TargetType::DEFAULT) as u8)
             + (ext_budget.is_some() as u8)
             + (ext_timeout.is_some() as u8)
-            + ((ext_nodeid != &ext::NodeIdType::default()) as u8);
+            + ((ext_nodeid != &ext::NodeIdType::DEFAULT) as u8);
         if n_exts != 0 {
             header |= flag::Z;
         }
@@ -137,7 +137,7 @@ where
             let e = ext::Timeout::new(to.as_millis() as u64);
             self.write(&mut *writer, (&e, n_exts != 0))?;
         }
-        if ext_nodeid != &ext::NodeIdType::default() {
+        if ext_nodeid != &ext::NodeIdType::DEFAULT {
             n_exts -= 1;
             self.write(&mut *writer, (*ext_nodeid, n_exts != 0))?;
         }
@@ -187,7 +187,7 @@ where
         // Extensions
         let mut ext_qos = ext::QoSType::DEFAULT;
         let mut ext_tstamp = None;
-        let mut ext_nodeid = ext::NodeIdType::default();
+        let mut ext_nodeid = ext::NodeIdType::DEFAULT;
         let mut ext_target = ext::TargetType::DEFAULT;
         let mut ext_limit = None;
         let mut ext_timeout = None;

diff --git a/commons/zenoh-protocol/src/network/mod.rs b/commons/zenoh-protocol/src/network/mod.rs
@@ -359,6 +359,9 @@ pub mod ext {
     }
 
     impl<const ID: u8> NodeIdType<{ ID }> {
+        // node_id == 0 means the message has been generated by the node itself
+        pub const DEFAULT: Self = Self { node_id: 0 };
+
         #[cfg(feature = "test")]
         pub fn rand() -> Self {
             use rand::Rng;
@@ -370,8 +373,7 @@ pub mod ext {
 
     impl<const ID: u8> Default for NodeIdType<{ ID }> {
         fn default() -> Self {
-            // node_id == 0 means the message has been generated by the node itself
-            Self { node_id: 0 }
+            Self::DEFAULT
         }
     }
 

diff --git a/io/zenoh-transport/src/common/batch.rs b/io/zenoh-transport/src/common/batch.rs
@@ -576,7 +576,7 @@ mod tests {
             wire_expr: WireExpr::empty(),
             ext_qos: ext::QoSType::new(Priority::DEFAULT, CongestionControl::Block, false),
             ext_tstamp: None,
-            ext_nodeid: ext::NodeIdType::default(),
+            ext_nodeid: ext::NodeIdType::DEFAULT,
             payload: PushBody::Put(Put {
                 timestamp: None,
                 encoding: Encoding::DEFAULT,

diff --git a/io/zenoh-transport/src/common/pipeline.rs b/io/zenoh-transport/src/common/pipeline.rs
@@ -751,7 +751,7 @@ mod tests {
                 wire_expr: key,
                 ext_qos: ext::QoSType::new(Priority::Control, CongestionControl::Block, false),
                 ext_tstamp: None,
-                ext_nodeid: ext::NodeIdType::default(),
+                ext_nodeid: ext::NodeIdType::DEFAULT,
                 payload: PushBody::Put(Put {
                     timestamp: None,
                     encoding: Encoding::DEFAULT,
@@ -881,7 +881,7 @@ mod tests {
                 wire_expr: key,
                 ext_qos: ext::QoSType::new(Priority::Control, CongestionControl::Block, false),
                 ext_tstamp: None,
-                ext_nodeid: ext::NodeIdType::default(),
+                ext_nodeid: ext::NodeIdType::DEFAULT,
                 payload: PushBody::Put(Put {
                     timestamp: None,
                     encoding: Encoding::DEFAULT,
@@ -993,7 +993,7 @@ mod tests {
                             false,
                         ),
                         ext_tstamp: None,
-                        ext_nodeid: ext::NodeIdType::default(),
+                        ext_nodeid: ext::NodeIdType::DEFAULT,
                         payload: PushBody::Put(Put {
                             timestamp: None,
                             encoding: Encoding::DEFAULT,

diff --git a/io/zenoh-transport/tests/multicast_compression.rs b/io/zenoh-transport/tests/multicast_compression.rs
@@ -269,7 +269,7 @@ mod tests {
             wire_expr: "test".into(),
             ext_qos: QoSType::new(channel.priority, CongestionControl::Block, false),
             ext_tstamp: None,
-            ext_nodeid: NodeIdType::default(),
+            ext_nodeid: NodeIdType::DEFAULT,
             payload: Put {
                 payload: vec![0u8; msg_size].into(),
                 timestamp: None,

diff --git a/io/zenoh-transport/tests/multicast_transport.rs b/io/zenoh-transport/tests/multicast_transport.rs
@@ -265,7 +265,7 @@ mod tests {
             wire_expr: "test".into(),
             ext_qos: QoSType::new(channel.priority, CongestionControl::Block, false),
             ext_tstamp: None,
-            ext_nodeid: NodeIdType::default(),
+            ext_nodeid: NodeIdType::DEFAULT,
             payload: Put {
                 payload: vec![0u8; msg_size].into(),
                 timestamp: None,

diff --git a/io/zenoh-transport/tests/unicast_compression.rs b/io/zenoh-transport/tests/unicast_compression.rs
@@ -297,7 +297,7 @@ mod tests {
             wire_expr: "test".into(),
             ext_qos: QoSType::new(channel.priority, cctrl, false),
             ext_tstamp: None,
-            ext_nodeid: NodeIdType::default(),
+            ext_nodeid: NodeIdType::DEFAULT,
             payload: Put {
                 payload: vec![0u8; msg_size].into(),
                 timestamp: None,

diff --git a/io/zenoh-transport/tests/unicast_concurrent.rs b/io/zenoh-transport/tests/unicast_concurrent.rs
@@ -196,7 +196,7 @@ async fn transport_concurrent(endpoint01: Vec<EndPoint>, endpoint02: Vec<EndPoin
             wire_expr: "test".into(),
             ext_qos: QoSType::new(Priority::DEFAULT, CongestionControl::Block, false),
             ext_tstamp: None,
-            ext_nodeid: NodeIdType::default(),
+            ext_nodeid: NodeIdType::DEFAULT,
             payload: Put {
                 payload: vec![0u8; MSG_SIZE].into(),
                 timestamp: None,
@@ -301,7 +301,7 @@ async fn transport_concurrent(endpoint01: Vec<EndPoint>, endpoint02: Vec<EndPoin
             wire_expr: "test".into(),
             ext_qos: QoSType::new(Priority::DEFAULT, CongestionControl::Block, false),
             ext_tstamp: None,
-            ext_nodeid: NodeIdType::default(),
+            ext_nodeid: NodeIdType::DEFAULT,
             payload: Put {
                 payload: vec![0u8; MSG_SIZE].into(),
                 timestamp: None,

diff --git a/io/zenoh-transport/tests/unicast_defragmentation.rs b/io/zenoh-transport/tests/unicast_defragmentation.rs
@@ -81,7 +81,7 @@ async fn run(endpoint: &EndPoint, channel: Channel, msg_size: usize) {
         wire_expr: "test".into(),
         ext_qos: QoSType::new(channel.priority, CongestionControl::Block, false),
         ext_tstamp: None,
-        ext_nodeid: NodeIdType::default(),
+        ext_nodeid: NodeIdType::DEFAULT,
         payload: Put {
             payload: vec![0u8; msg_size].into(),
             timestamp: None,

diff --git a/io/zenoh-transport/tests/unicast_intermittent.rs b/io/zenoh-transport/tests/unicast_intermittent.rs
@@ -299,7 +299,7 @@ async fn transport_intermittent(endpoint: &EndPoint, lowlatency_transport: bool)
             wire_expr: "test".into(),
             ext_qos: QoSType::new(Priority::DEFAULT, CongestionControl::Block, false),
             ext_tstamp: None,
-            ext_nodeid: NodeIdType::default(),
+            ext_nodeid: NodeIdType::DEFAULT,
             payload: Put {
                 payload: vec![0u8; MSG_SIZE].into(),
                 timestamp: None,

diff --git a/io/zenoh-transport/tests/unicast_priorities.rs b/io/zenoh-transport/tests/unicast_priorities.rs
@@ -297,7 +297,7 @@ async fn single_run(router_handler: Arc<SHRouter>, client_transport: TransportUn
                 wire_expr: "test".into(),
                 ext_qos: QoSType::new(*p, CongestionControl::Block, false),
                 ext_tstamp: None,
-                ext_nodeid: NodeIdType::default(),
+                ext_nodeid: NodeIdType::DEFAULT,
                 payload: Put {
                     payload: vec![0u8; *ms].into(),
                     timestamp: None,

diff --git a/io/zenoh-transport/tests/unicast_shm.rs b/io/zenoh-transport/tests/unicast_shm.rs
@@ -273,7 +273,7 @@ mod tests {
                 wire_expr: "test".into(),
                 ext_qos: QoSType::new(Priority::DEFAULT, CongestionControl::Block, false),
                 ext_tstamp: None,
-                ext_nodeid: NodeIdType::default(),
+                ext_nodeid: NodeIdType::DEFAULT,
                 payload: Put {
                     payload: sbuf.into(),
                     timestamp: None,
@@ -321,7 +321,7 @@ mod tests {
                 wire_expr: "test".into(),
                 ext_qos: QoSType::new(Priority::DEFAULT, CongestionControl::Block, false),
                 ext_tstamp: None,
-                ext_nodeid: NodeIdType::default(),
+                ext_nodeid: NodeIdType::DEFAULT,
                 payload: Put {
                     payload: sbuf.into(),
                     timestamp: None,

diff --git a/io/zenoh-transport/tests/unicast_simultaneous.rs b/io/zenoh-transport/tests/unicast_simultaneous.rs
@@ -78,7 +78,7 @@ mod tests {
                 wire_expr: "test".into(),
                 ext_qos: QoSType::new(Priority::Control, CongestionControl::Block, false),
                 ext_tstamp: None,
-                ext_nodeid: NodeIdType::default(),
+                ext_nodeid: NodeIdType::DEFAULT,
                 payload: Put {
                     payload: vec![0u8; MSG_SIZE].into(),
                     timestamp: None,

diff --git a/io/zenoh-transport/tests/unicast_transport.rs b/io/zenoh-transport/tests/unicast_transport.rs
@@ -468,7 +468,7 @@ async fn test_transport(
         wire_expr: "test".into(),
         ext_qos: QoSType::new(channel.priority, cctrl, false),
         ext_tstamp: None,
-        ext_nodeid: NodeIdType::default(),
+        ext_nodeid: NodeIdType::DEFAULT,
         payload: Put {
             payload: vec![0u8; msg_size].into(),
             timestamp: None,

diff --git a/zenoh/src/key_expr.rs b/zenoh/src/key_expr.rs
@@ -635,7 +635,7 @@ impl SyncResolve for KeyExprUndeclaration<'_> {
         primitives.send_declare(zenoh_protocol::network::Declare {
             ext_qos: declare::ext::QoSType::DECLARE,
             ext_tstamp: None,
-            ext_nodeid: declare::ext::NodeIdType::default(),
+            ext_nodeid: declare::ext::NodeIdType::DEFAULT,
             body: DeclareBody::UndeclareKeyExpr(UndeclareKeyExpr { id: expr_id }),
         });
 

diff --git a/zenoh/src/net/routing/dispatcher/pubsub.rs b/zenoh/src/net/routing/dispatcher/pubsub.rs
@@ -586,7 +586,7 @@ pub fn pull_data(tables_ref: &RwLock<Tables>, face: &Arc<FaceState>, expr: WireE
                                     wire_expr: key_expr,
                                     ext_qos: ext::QoSType::PUSH,
                                     ext_tstamp: None,
-                                    ext_nodeid: ext::NodeIdType::default(),
+                                    ext_nodeid: ext::NodeIdType::DEFAULT,
                                     payload,
                                 });
                             }

diff --git a/zenoh/src/net/routing/dispatcher/resource.rs b/zenoh/src/net/routing/dispatcher/resource.rs
@@ -468,7 +468,7 @@ impl Resource {
                         Declare {
                             ext_qos: ext::QoSType::DECLARE,
                             ext_tstamp: None,
-                            ext_nodeid: ext::NodeIdType::default(),
+                            ext_nodeid: ext::NodeIdType::DEFAULT,
                             body: DeclareBody::DeclareKeyExpr(DeclareKeyExpr {
                                 id: expr_id,
                                 wire_expr: nonwild_prefix.expr().into(),

diff --git a/zenoh/src/net/routing/hat/client/pubsub.rs b/zenoh/src/net/routing/hat/client/pubsub.rs
@@ -51,7 +51,7 @@ fn propagate_simple_subscription_to(
             Declare {
                 ext_qos: ext::QoSType::DECLARE,
                 ext_tstamp: None,
-                ext_nodeid: ext::NodeIdType::default(),
+                ext_nodeid: ext::NodeIdType::DEFAULT,
                 body: DeclareBody::DeclareSubscriber(DeclareSubscriber {
                     id: 0, // @TODO use proper SubscriberId (#703)
                     wire_expr: key_expr,
@@ -139,7 +139,7 @@ fn declare_client_subscription(
                 Declare {
                     ext_qos: ext::QoSType::DECLARE,
                     ext_tstamp: None,
-                    ext_nodeid: ext::NodeIdType::default(),
+                    ext_nodeid: ext::NodeIdType::DEFAULT,
                     body: DeclareBody::DeclareSubscriber(DeclareSubscriber {
                         id: 0, // @TODO use proper SubscriberId (#703)
                         wire_expr: res.expr().into(),
@@ -173,7 +173,7 @@ fn propagate_forget_simple_subscription(tables: &mut Tables, res: &Arc<Resource>
                 Declare {
                     ext_qos: ext::QoSType::DECLARE,
                     ext_tstamp: None,
-                    ext_nodeid: ext::NodeIdType::default(),
+                    ext_nodeid: ext::NodeIdType::DEFAULT,
                     body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber {
                         id: 0, // @TODO use proper SubscriberId (#703)
                         ext_wire_expr: WireExprType { wire_expr },
@@ -211,7 +211,7 @@ pub(super) fn undeclare_client_subscription(
                 Declare {
                     ext_qos: ext::QoSType::DECLARE,
                     ext_tstamp: None,
-                    ext_nodeid: ext::NodeIdType::default(),
+                    ext_nodeid: ext::NodeIdType::DEFAULT,
                     body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber {
                         id: 0, // @TODO use proper SubscriberId (#703)
                         ext_wire_expr: WireExprType { wire_expr },

diff --git a/zenoh/src/net/routing/hat/client/queries.rs b/zenoh/src/net/routing/hat/client/queries.rs
@@ -98,7 +98,7 @@ fn propagate_simple_queryable(
                 Declare {
                     ext_qos: ext::QoSType::DECLARE,
                     ext_tstamp: None,
-                    ext_nodeid: ext::NodeIdType::default(),
+                    ext_nodeid: ext::NodeIdType::DEFAULT,
                     body: DeclareBody::DeclareQueryable(DeclareQueryable {
                         id: 0, // @TODO use proper QueryableId (#703)
                         wire_expr: key_expr,
@@ -168,7 +168,7 @@ fn propagate_forget_simple_queryable(tables: &mut Tables, res: &mut Arc<Resource
                 Declare {
                     ext_qos: ext::QoSType::DECLARE,
                     ext_tstamp: None,
-                    ext_nodeid: ext::NodeIdType::default(),
+                    ext_nodeid: ext::NodeIdType::DEFAULT,
                     body: DeclareBody::UndeclareQueryable(UndeclareQueryable {
                         id: 0, // @TODO use proper QueryableId (#703)
                         ext_wire_expr: WireExprType { wire_expr },
@@ -209,7 +209,7 @@ pub(super) fn undeclare_client_queryable(
                 Declare {
                     ext_qos: ext::QoSType::DECLARE,
                     ext_tstamp: None,
-                    ext_nodeid: ext::NodeIdType::default(),
+                    ext_nodeid: ext::NodeIdType::DEFAULT,
                     body: DeclareBody::UndeclareQueryable(UndeclareQueryable {
                         id: 0, // @TODO use proper QueryableId (#703)
                         ext_wire_expr: WireExprType { wire_expr },