Fix tests

Author: fuzzypixelz

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

@@ -431,7 +431,7 @@ pub fn route_data(
                                     reliability,
                                 });
 
-                                if !interceptor.intercept(ctx, cache.as_deref()) {
+                                if !interceptor.intercept(ctx, cache) {
                                     continue;
                                 }
                             };

zenoh/src/net/routing/interceptor/qos_overwrite.rs

@@ -246,16 +246,16 @@ impl InterceptorTrait for QosInterceptor {
             NetworkBodyMut::Push(Push {
                 payload: PushBody::Put(_),
                 ..
-            }) => self.filter.put && self.is_ke_affected_from_cache_or_ctx(cache, &ctx),
+            }) => self.filter.put && self.is_ke_affected_from_cache_or_ctx(cache, ctx),
             NetworkBodyMut::Push(Push {
                 payload: PushBody::Del(_),
                 ..
-            }) => self.filter.delete && self.is_ke_affected_from_cache_or_ctx(cache, &ctx),
+            }) => self.filter.delete && self.is_ke_affected_from_cache_or_ctx(cache, ctx),
             NetworkBodyMut::Request(_) => {
-                self.filter.query && self.is_ke_affected_from_cache_or_ctx(cache, &ctx)
+                self.filter.query && self.is_ke_affected_from_cache_or_ctx(cache, ctx)
             }
             NetworkBodyMut::Response(_) => {
-                self.filter.reply && self.is_ke_affected_from_cache_or_ctx(cache, &ctx)
+                self.filter.reply && self.is_ke_affected_from_cache_or_ctx(cache, ctx)
             }
             NetworkBodyMut::ResponseFinal(_) => false,
             NetworkBodyMut::Interest(_) => false,

zenoh/src/net/tests/tables.rs

@@ -32,11 +32,7 @@ use zenoh_protocol::{
 use crate::net::{
     primitives::{DummyPrimitives, EPrimitives, Primitives},
     routing::{
-        dispatcher::{
-            face::{Face, FaceState},
-            pubsub::SubscriberInfo,
-            tables::Tables,
-        },
+        dispatcher::{face::Face, pubsub::SubscriberInfo, tables::Tables},
         router::*,
         RoutingContext,
     },
@@ -593,10 +589,10 @@ fn client_test() {
     let sub_info = SubscriberInfo;
 
     let primitives0 = Arc::new(ClientPrimitives::new());
-    let face0 = Arc::downgrade(&router.new_primitives(primitives0.clone()).state);
+    let face0 = Arc::downgrade(&router.new_primitives(primitives0.clone()));
     register_expr(
         &tables,
-        &mut face0.upgrade().unwrap(),
+        &mut face0.upgrade().unwrap().state.clone(),
         11,
         &"test/client".into(),
     );
@@ -616,7 +612,7 @@ fn client_test() {
     declare_subscription(
         zlock!(tables.ctrl_lock).as_ref(),
         &tables,
-        &mut face0.upgrade().unwrap(),
+        &mut face0.upgrade().unwrap().state.clone(),
         0,
         &WireExpr::from(11).with_suffix("/**"),
         &sub_info,
@@ -625,7 +621,7 @@ fn client_test() {
     );
     register_expr(
         &tables,
-        &mut face0.upgrade().unwrap(),
+        &mut face0.upgrade().unwrap().state.clone(),
         12,
         &WireExpr::from(11).with_suffix("/z1_pub1"),
     );
@@ -644,10 +640,10 @@ fn client_test() {
     );
 
     let primitives1 = Arc::new(ClientPrimitives::new());
-    let face1 = Arc::downgrade(&router.new_primitives(primitives1.clone()).state);
+    let face1 = Arc::downgrade(&router.new_primitives(primitives1.clone()));
     register_expr(
         &tables,
-        &mut face1.upgrade().unwrap(),
+        &mut face1.upgrade().unwrap().state.clone(),
         21,
         &"test/client".into(),
     );
@@ -667,7 +663,7 @@ fn client_test() {
     declare_subscription(
         zlock!(tables.ctrl_lock).as_ref(),
         &tables,
-        &mut face1.upgrade().unwrap(),
+        &mut face1.upgrade().unwrap().state.clone(),
         0,
         &WireExpr::from(21).with_suffix("/**"),
         &sub_info,
@@ -676,7 +672,7 @@ fn client_test() {
     );
     register_expr(
         &tables,
-        &mut face1.upgrade().unwrap(),
+        &mut face1.upgrade().unwrap().state.clone(),
         22,
         &WireExpr::from(21).with_suffix("/z2_pub1"),
     );
@@ -730,7 +726,7 @@ fn client_test() {
     primitives1.clear_data();
     primitives2.clear_data();
 
-    let route_dummy_data = |face: &Weak<FaceState>, wire_expr| {
+    let route_dummy_data = |face: &Weak<Face>, wire_expr| {
         route_data(
             &tables,
             &face.upgrade().unwrap(),