Let SED->load() return None

Author: dirixmjm

plugwise_usb/nodes/scan.py

@@ -108,9 +108,7 @@ async def load(self) -> bool:
             return True
 
         _LOGGER.debug("Loading Scan node %s", self._node_info.mac)
-        if not await super().load():
-            _LOGGER.warning("Load Scan base node failed")
-            return False
+        await super().load()
 
         self._setup_protocol(SCAN_FIRMWARE_SUPPORT, SCAN_FEATURES)
         if await self.initialize():

plugwise_usb/nodes/sed.py

@@ -114,7 +114,7 @@ def __init__(
         self._maintenance_last_awake: datetime | None = None
         self._maintenance_interval_restored_from_cache = False
 
-    async def load(self) -> bool:
+    async def load(self) -> None:
         """Load and activate SED node features."""
         if self._loaded:
             return True
@@ -126,7 +126,6 @@ async def load(self) -> bool:
             self._load_defaults()
         self._loaded = True
         self._features += SED_FEATURES
-        return True
 
     async def unload(self) -> None:
         """Deactivate and unload node features."""

plugwise_usb/nodes/sense.py

@@ -59,9 +59,7 @@ async def load(self) -> bool:
             return True
 
         _LOGGER.debug("Loading Sense node %s", self._node_info.mac)
-        if not await super().load():
-            _LOGGER.warning("Load Sense base node failed")
-            return False
+        await super().load()
 
         self._setup_protocol(SENSE_FIRMWARE_SUPPORT, SENSE_FEATURES)
         if await self.initialize():

plugwise_usb/nodes/switch.py

@@ -52,9 +52,7 @@ async def load(self) -> bool:
             return True
 
         _LOGGER.debug("Loading Switch node %s", self._node_info.mac)
-        if not await super().load():
-            _LOGGER.warning("Load Switch base node failed")
-            return False
+        await super().load()
 
         self._setup_protocol(SWITCH_FIRMWARE_SUPPORT, SWITCH_FEATURES)
         if await self.initialize():

tests/test_usb.py

@@ -1951,7 +1951,7 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
 
         assert test_sed.node_info.is_battery_powered
         assert test_sed.is_battery_powered
-        assert await test_sed.load()
+        assert await test_sed.load() is None
         assert sorted(test_sed.features) == sorted(
             (
                 pw_api.NodeFeature.AVAILABLE,