Treat any failure to load network information as an un-formed network

Author: puddly

zigpy_znp/api.py

@@ -93,35 +93,28 @@ async def detect_zstack_version(self) -> float:
         except CommandNotRecognized:
             return 3.0
 
-    async def load_network_info(self, *, load_devices=False):
+    async def _load_network_info(self, *, load_devices=False):
         """
         Loads low-level network information from NVRAM.
         Loading key data greatly increases the runtime so it not enabled by default.
         """
 
         from zigpy_znp.znp import security
 
-        is_on_network = None
-        nib = None
-
-        try:
-            nib = await self.nvram.osal_read(OsalNvIds.NIB, item_type=t.NIB)
-        except KeyError:
-            is_on_network = False
-        else:
-            is_on_network = nib.nwkLogicalChannel != 0 and nib.nwkKeyLoaded
+        nib = await self.nvram.osal_read(OsalNvIds.NIB, item_type=t.NIB)
 
-            if is_on_network and self.version >= 3.0:
-                # This NVRAM item is the very first thing initialized in `zgInit`
-                is_on_network = (
-                    await self.nvram.osal_read(
-                        OsalNvIds.BDBNODEISONANETWORK, item_type=t.uint8_t
-                    )
-                    == 1
-                )
+        if nib.nwkLogicalChannel == 0 or not nib.nwkKeyLoaded:
+            raise NetworkNotFormed()
 
-        if not is_on_network:
-            raise NetworkNotFormed("Device is not a part of a network")
+        # This NVRAM item is the very first thing initialized in `zgInit`
+        if (
+            self.version >= 3.0
+            and await self.nvram.osal_read(
+                OsalNvIds.BDBNODEISONANETWORK, item_type=t.uint8_t
+            )
+            != 1
+        ):
+            raise NetworkNotFormed()
 
         ieee = await self.nvram.osal_read(OsalNvIds.EXTADDR, item_type=t.EUI64)
         logical_type = await self.nvram.osal_read(
@@ -225,6 +218,17 @@ async def load_network_info(self, *, load_devices=False):
         self.network_info = network_info
         self.node_info = node_info
 
+    async def load_network_info(self, *, load_devices=False):
+        """
+        Loads low-level network information from NVRAM.
+        Loading key data greatly increases the runtime so it not enabled by default.
+        """
+
+        try:
+            await self._load_network_info()
+        except KeyError as e:
+            raise NetworkNotFormed() from e
+
     async def start_network(self):
         # Both startup sequences end with the same callback
         started_as_coordinator = self.wait_for_response(