Simplify lock_state to state

Author: bouwew

plugwise_usb/api.py

@@ -176,7 +176,7 @@ class RelayConfig:
 class RelayLock:
     """Status of relay lock."""
 
-    lock_state: bool | None = None
+    state: bool | None = None
 
 
 @dataclass(frozen=True)

plugwise_usb/nodes/circle.py

@@ -86,7 +86,7 @@ def __init__(
         super().__init__(mac, address, controller, loaded_callback)
 
         # Relay
-        self._relay_lock: RelayLock = RelayLock(lock_state=False)
+        self._relay_lock: RelayLock = RelayLock(state=False)
         self._relay_state: RelayState = RelayState()
         self._relay_config: RelayConfig = RelayConfig()
 
@@ -644,7 +644,7 @@ async def set_relay(self, state: bool) -> bool:
                 f"Changing state of relay is not supported for node {self.mac}"
             )
 
-        if getattr(self._relay_lock, "lock_state"):
+        if getattr(self._relay_lock, "state"):
             raise NodeError("Changing state of relay failed, it is locked")
 
         _LOGGER.debug("set_relay() start")
@@ -722,7 +722,7 @@ async def _relay_update_lock(self, state: bool) -> None:
             if self._relay_lock:
                 state_update = True
 
-        self._relay_lock = replace(self._relay_lock, lock_state=state)
+        self._relay_lock = replace(self._relay_lock, state=state)
         if state_update:
             await self.publish_feature_update_to_subscribers(
                 NodeFeature.RELAY_LOCK, self._relay_lock

tests/test_usb.py

@@ -792,13 +792,13 @@ async def test_node_relay_and_power(self, monkeypatch: pytest.MonkeyPatch) -> No
         # Test blocked async switching due to relay-lock active
         await stick.nodes["0098765432101234"].set_relay_lock(True)
         assert stick.nodes["0098765432101234"].relay_lock
-        assert stick.nodes["0098765432101234"].relay_lock.lock_state
+        assert stick.nodes["0098765432101234"].relay_lock.state
         with pytest.raises(pw_exceptions.NodeError):
             await stick.nodes["0098765432101234"].set_relay(True)
         assert not stick.nodes["0098765432101234"].relay
         # Make sure to turn lock off for further testing
         await stick.nodes["0098765432101234"].set_relay_lock(False)
-        assert not stick.nodes["0098765432101234"].relay_lock.lock_state
+        assert not stick.nodes["0098765432101234"].relay_lock.state
 
         # Test async switching back from off to on
         self.test_relay_state_on = asyncio.Future()
@@ -2513,7 +2513,7 @@ async def test_node_discovery_and_load(
         assert state[pw_api.NodeFeature.INFO].version == "070073"
 
         assert state[pw_api.NodeFeature.RELAY].state
-        assert not state[pw_api.NodeFeature.RELAY_LOCK].lock_state
+        assert not state[pw_api.NodeFeature.RELAY_LOCK].state
 
         # Check 1111111111111111
         get_state_timestamp = dt.now(UTC).replace(minute=0, second=0, microsecond=0)
@@ -2550,7 +2550,7 @@ async def test_node_discovery_and_load(
         )
         assert state[pw_api.NodeFeature.AVAILABLE].state
         assert state[pw_api.NodeFeature.RELAY].state
-        assert not state[pw_api.NodeFeature.RELAY_LOCK].lock_state
+        assert not state[pw_api.NodeFeature.RELAY_LOCK].state
 
 
         # region Scan