From e3b820d9dbe34367e6db23590f7bbb62897ffe10 Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Sat, 4 Feb 2023 19:20:17 -0500
Subject: [PATCH] Simplify zwave_js code (#87235)

---
 homeassistant/components/zwave_js/__init__.py   | 17 +++++------------
 .../components/zwave_js/device_action.py        |  2 +-
 .../components/zwave_js/device_condition.py     |  2 +-
 .../components/zwave_js/device_trigger.py       |  2 +-
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py
index ee007a95e81..3c3f2b975b2 100644
--- a/homeassistant/components/zwave_js/__init__.py
+++ b/homeassistant/components/zwave_js/__init__.py
@@ -254,17 +254,15 @@ class DriverEvents:
                 self.dev_reg.async_remove_device(device.id)
 
         # run discovery on controller node
-        c_node_id = controller.own_node_id
-        controller_node = controller.nodes.get(c_node_id) if c_node_id else None
-        if controller_node:
-            await self.controller_events.async_on_node_added(controller_node)
+        if controller.own_node:
+            await self.controller_events.async_on_node_added(controller.own_node)
 
         # run discovery on all other ready nodes
         await asyncio.gather(
             *(
                 self.controller_events.async_on_node_added(node)
                 for node in controller.nodes.values()
-                if controller_node is None or node != controller_node
+                if node != controller.own_node
             )
         )
 
@@ -396,13 +394,8 @@ class ControllerEvents:
         via_device_id = None
         controller = driver.controller
         # Get the controller node device ID if this node is not the controller
-        if (
-            controller.own_node_id is not None
-            and controller.own_node_id != node.node_id
-        ):
-            via_device_id = get_device_id(
-                driver, controller.nodes[controller.own_node_id]
-            )
+        if controller.own_node and controller.own_node != node:
+            via_device_id = get_device_id(driver, controller.own_node)
 
         # Replace the device if it can be determined that this node is not the
         # same product as it was previously.
diff --git a/homeassistant/components/zwave_js/device_action.py b/homeassistant/components/zwave_js/device_action.py
index 54dd17b7b83..0172176d756 100644
--- a/homeassistant/components/zwave_js/device_action.py
+++ b/homeassistant/components/zwave_js/device_action.py
@@ -150,7 +150,7 @@ async def async_get_actions(
 
     node = async_get_node_from_device_id(hass, device_id)
 
-    if node.client.driver and node.client.driver.controller.own_node_id == node.node_id:
+    if node.client.driver and node.client.driver.controller.own_node == node:
         return actions
 
     base_action = {
diff --git a/homeassistant/components/zwave_js/device_condition.py b/homeassistant/components/zwave_js/device_condition.py
index 87967c21dd5..3e089362d0b 100644
--- a/homeassistant/components/zwave_js/device_condition.py
+++ b/homeassistant/components/zwave_js/device_condition.py
@@ -134,7 +134,7 @@ async def async_get_conditions(
     }
     node = async_get_node_from_device_id(hass, device_id)
 
-    if node.client.driver and node.client.driver.controller.own_node_id == node.node_id:
+    if node.client.driver and node.client.driver.controller.own_node == node:
         return conditions
 
     # Any value's value condition
diff --git a/homeassistant/components/zwave_js/device_trigger.py b/homeassistant/components/zwave_js/device_trigger.py
index 348346680d7..067551109eb 100644
--- a/homeassistant/components/zwave_js/device_trigger.py
+++ b/homeassistant/components/zwave_js/device_trigger.py
@@ -258,7 +258,7 @@ async def async_get_triggers(
     dev_reg = device_registry.async_get(hass)
     node = async_get_node_from_device_id(hass, device_id, dev_reg)
 
-    if node.client.driver and node.client.driver.controller.own_node_id == node.node_id:
+    if node.client.driver and node.client.driver.controller.own_node == node:
         return triggers
 
     # We can add a node status trigger if the node status sensor is enabled