From 931f89f73dfed2dd10609af16e0ed1a380242cef Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 6 Aug 2024 18:18:42 +0200 Subject: [PATCH] Remove redundant `WhatAmI` tests in `HatBaseTrait::init` (#1299) --- zenoh/src/net/routing/hat/linkstate_peer/mod.rs | 4 ++-- zenoh/src/net/routing/hat/router/mod.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zenoh/src/net/routing/hat/linkstate_peer/mod.rs b/zenoh/src/net/routing/hat/linkstate_peer/mod.rs index f861e1bed3..e5303bbc77 100644 --- a/zenoh/src/net/routing/hat/linkstate_peer/mod.rs +++ b/zenoh/src/net/routing/hat/linkstate_peer/mod.rs @@ -190,8 +190,8 @@ impl HatBaseTrait for HatCode { WhatAmIMatcher::empty() }; - let peer_full_linkstate = whatami != WhatAmI::Client - && unwrap_or_default!(config.routing().peer().mode()) == *"linkstate"; + let peer_full_linkstate = + unwrap_or_default!(config.routing().peer().mode()) == *"linkstate"; let router_peers_failover_brokering = unwrap_or_default!(config.routing().router().peers_failover_brokering()); drop(config); diff --git a/zenoh/src/net/routing/hat/router/mod.rs b/zenoh/src/net/routing/hat/router/mod.rs index cf7d1d14b6..df1729c087 100644 --- a/zenoh/src/net/routing/hat/router/mod.rs +++ b/zenoh/src/net/routing/hat/router/mod.rs @@ -320,9 +320,9 @@ impl HatBaseTrait for HatCode { WhatAmIMatcher::empty() }; - let router_full_linkstate = whatami == WhatAmI::Router; - let peer_full_linkstate = whatami != WhatAmI::Client - && unwrap_or_default!(config.routing().peer().mode()) == *"linkstate"; + let router_full_linkstate = true; + let peer_full_linkstate = + unwrap_or_default!(config.routing().peer().mode()) == *"linkstate"; let router_peers_failover_brokering = unwrap_or_default!(config.routing().router().peers_failover_brokering()); drop(config);