Fix tests compilation

eclipse-zenoh · Mar 8, 2021 · 30a8a65 · 30a8a65
1 parent 53c43a9
commit 30a8a65
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/zenoh/tests/authenticator.rs b/zenoh/tests/authenticator.rs
@@ -16,13 +16,13 @@ use async_std::task;
 use async_trait::async_trait;
 use std::collections::HashMap;
 use std::time::Duration;
-use zenoh_protocol::core::{whatami, PeerId};
-use zenoh_protocol::link::{Link, Locator};
-use zenoh_protocol::proto::ZenohMessage;
-use zenoh_protocol::session::authenticator::{
+use zenoh::net::protocol::core::{whatami, PeerId};
+use zenoh::net::protocol::link::{Link, Locator};
+use zenoh::net::protocol::proto::ZenohMessage;
+use zenoh::net::protocol::session::authenticator::{
     SharedMemoryAuthenticator, UserPasswordAuthenticator,
 };
-use zenoh_protocol::session::{
+use zenoh::net::protocol::session::{
     DummySessionEventHandler, Session, SessionDispatcher, SessionEventHandler, SessionHandler,
     SessionManager, SessionManagerConfig, SessionManagerOptionalConfig,
 };
@@ -310,7 +310,7 @@ async fn authenticator_shared_memory(locator: Locator) {
         version: 0,
         whatami: whatami::ROUTER,
         id: router_id.clone(),
-        handler: router_handler.clone(),
+        handler: SessionDispatcher::SessionHandler(router_handler.clone()),
     };
 
     let peer_authenticator_router = SharedMemoryAuthenticator::new();
@@ -334,7 +334,7 @@ async fn authenticator_shared_memory(locator: Locator) {
         version: 0,
         whatami: whatami::CLIENT,
         id: client_id.clone(),
-        handler: Arc::new(SHClientAuthenticator::new()),
+        handler: SessionDispatcher::SessionHandler(Arc::new(SHClientAuthenticator::new())),
     };
     let peer_authenticator_client = SharedMemoryAuthenticator::new();
     let opt_config = SessionManagerOptionalConfig {

diff --git a/zenoh/tests/shm.rs b/zenoh/tests/shm.rs
@@ -17,13 +17,13 @@ use async_std::task;
 use async_trait::async_trait;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::Duration;
-use zenoh_protocol::core::{whatami, CongestionControl, PeerId, Reliability, ResKey};
-use zenoh_protocol::io::{RBuf, SharedMemoryManager};
-use zenoh_protocol::link::{Link, Locator};
-use zenoh_protocol::proto::{Data, ZenohBody, ZenohMessage};
-use zenoh_protocol::session::authenticator::SharedMemoryAuthenticator;
-use zenoh_protocol::session::{
-    Session, SessionEventHandler, SessionHandler, SessionManager, SessionManagerConfig,
+use zenoh::net::protocol::core::{whatami, CongestionControl, PeerId, Reliability, ResKey};
+use zenoh::net::protocol::io::{RBuf, SharedMemoryManager};
+use zenoh::net::protocol::link::{Link, Locator};
+use zenoh::net::protocol::proto::{Data, ZenohBody, ZenohMessage};
+use zenoh::net::protocol::session::authenticator::SharedMemoryAuthenticator;
+use zenoh::net::protocol::session::{
+    Session, SessionDispatcher, SessionEventHandler, SessionHandler, SessionManager, SessionManagerConfig,
     SessionManagerOptionalConfig,
 };
 use zenoh_util::core::ZResult;
@@ -130,7 +130,7 @@ async fn run(locator: &Locator) {
         version: 0,
         whatami: whatami::PEER,
         id: peer_shm01.clone(),
-        handler: peer_shm01_handler.clone(),
+        handler: SessionDispatcher::SessionHandler(peer_shm01_handler.clone()),
     };
     let opt_config = SessionManagerOptionalConfig {
         lease: None,
@@ -153,7 +153,7 @@ async fn run(locator: &Locator) {
         version: 0,
         whatami: whatami::PEER,
         id: peer_shm02.clone(),
-        handler: peer_shm02_handler.clone(),
+        handler: SessionDispatcher::SessionHandler(peer_shm02_handler.clone()),
     };
     let opt_config = SessionManagerOptionalConfig {
         lease: None,
@@ -176,7 +176,7 @@ async fn run(locator: &Locator) {
         version: 0,
         whatami: whatami::PEER,
         id: peer_net01.clone(),
-        handler: peer_net01_handler.clone(),
+        handler: SessionDispatcher::SessionHandler(peer_net01_handler.clone()),
     };
     let peer_net01_manager = SessionManager::new(config, None);