Fix more tests and obscure features

Author: fuzzypixelz

zenoh/src/net/routing/dispatcher/pubsub.rs

@@ -312,6 +312,8 @@ pub fn route_data(
                 let ctx = &mut RoutingContext::new(NetworkMessageMut {
                     body: NetworkBodyMut::Push(msg),
                     reliability,
+                    #[cfg(feature = "stats")]
+                    size: None,
                 });
 
                 if !interceptor.intercept(ctx, cache) {
@@ -325,9 +327,9 @@ pub fn route_data(
             let admin = expr.full_expr().starts_with("@/");
             #[cfg(feature = "stats")]
             if !admin {
-                inc_stats!(face, rx, user, msg.payload);
+                inc_stats!(face.state, rx, user, msg.payload);
             } else {
-                inc_stats!(face, rx, admin, msg.payload);
+                inc_stats!(face.state, rx, admin, msg.payload);
             }
 
             if tables
@@ -376,6 +378,8 @@ pub fn route_data(
                                 let ctx = &mut RoutingContext::new(NetworkMessageMut {
                                     body: NetworkBodyMut::Push(msg),
                                     reliability,
+                                    #[cfg(feature = "stats")]
+                                    size: None,
                                 });
 
                                 if !interceptor.intercept(ctx, cache) {
@@ -429,6 +433,8 @@ pub fn route_data(
                                 let ctx = &mut RoutingContext::new(NetworkMessageMut {
                                     body: NetworkBodyMut::Push(msg),
                                     reliability,
+                                    #[cfg(feature = "stats")]
+                                    size: None,
                                 });
 
                                 if !interceptor.intercept(ctx, cache) {

zenoh/src/tests.rs

@@ -16,7 +16,7 @@ use std::str::FromStr;
 
 use zenoh_buffers::ZBuf;
 use zenoh_protocol::{
-    network::{NetworkBody, NetworkMessage, Push},
+    network::{NetworkBodyMut, NetworkMessageMut, Push},
     zenoh::PushBody,
 };
 use zenoh_transport::{multicast::TransportMulticast, unicast::TransportUnicast};
@@ -96,18 +96,18 @@ impl InterceptorTrait for TestInterceptor {
 
     fn intercept(
         &self,
-        mut ctx: RoutingContext<NetworkMessage>,
+        ctx: &mut RoutingContext<NetworkMessageMut<'_>>,
         cache: Option<&Box<dyn Any + Send + Sync>>,
-    ) -> Option<RoutingContext<NetworkMessage>> {
-        if let NetworkBody::Push(Push {
-            payload: PushBody::Put(p),
+    ) -> bool {
+        if let NetworkBodyMut::Push(&mut Push {
+            payload: PushBody::Put(ref mut p),
             ..
         }) = &mut ctx.msg.body
         {
             let out = format!("Cache hit: {}, data: {}", cache.is_some(), &self.data);
             p.payload = ZBuf::from(out.as_bytes().to_owned());
         }
-        Some(ctx)
+        true
     }
 }