Remove network_key and network_key_seq properties

Author: puddly

tests/application/test_startup.py

@@ -71,8 +71,7 @@ async def test_info(
     assert app.extended_pan_id == t.EUI64.convert("ff:ff:ff:ff:ff:ff:ff:ff")
     assert app.channel is None
     assert app.channels is None
-    assert app.network_key is None
-    assert app.network_key_seq is None
+    assert app.state.network_information.network_key is None
 
     await app.startup(auto_form=False)
 
@@ -85,8 +84,8 @@ async def test_info(
     assert app.extended_pan_id == ext_pan_id
     assert app.channel == channel
     assert app.channels == channels
-    assert app.network_key == network_key
-    assert app.network_key_seq == 0
+    assert app.state.network_information.network_key.key == network_key
+    assert app.state.network_information.network_key.seq == 0
 
     assert app.zigpy_device.manufacturer == "Texas Instruments"
     assert app.zigpy_device.model == model

zigpy_znp/zigbee/application.py

@@ -131,20 +131,6 @@ def __init__(self, config: conf.ConfigType):
     # Implementation of the core zigpy ControllerApplication methods #
     ##################################################################
 
-    @property
-    def network_key(self) -> t.KeyData | None:
-        # This is not a standard Zigpy property
-        if self.state.network_information.network_key:
-            return self.state.network_information.network_key.key
-        return None
-
-    @property
-    def network_key_seq(self) -> t.uint8_t | None:
-        # This is not a standard Zigpy property
-        if self.state.network_information.network_key:
-            return self.state.network_information.network_key.seq
-        return None
-
     @classmethod
     async def probe(cls, device_config: conf.ConfigType) -> bool:
         """
@@ -336,10 +322,13 @@ async def _startup(self, auto_form=False, force_form=False, read_only=False):
         LOGGER.info("  Device IEEE: %s", self.ieee)
         LOGGER.info("  Device NWK: 0x%04X", self.nwk)
         LOGGER.debug(
-            "  Network key: %s", ":".join(f"{c:02x}" for c in self.network_key)
+            "  Network key: %s",
+            ":".join(
+                f"{c:02x}" for c in self.state.network_information.network_key.key
+            ),
         )
 
-        if self.network_key == Z2M_NETWORK_KEY:
+        if self.state.network_information.network_key.key == Z2M_NETWORK_KEY:
             LOGGER.warning(
                 "Your network is using the insecure Zigbee2MQTT network key!"
             )