Fixes after rebase

Author: bouwew

plugwise_usb/nodes/node.py

@@ -475,13 +475,13 @@ async def _node_info_load_from_cache(self) -> bool:
             node_type = NodeType(int(node_type_str))
         relay_state = self._get_cache(CACHE_RELAY) == "True"
         timestamp = self._get_cache_as_datetime(CACHE_NODE_INFO_TIMESTAMP)
+        node_info = NodeInfoMessage(
+            current_logaddress_pointer=None,
             firmware=firmware,
             hardware=hardware,
-            logaddress_pointer=None,
             node_type=node_type,
             relay_state=relay_state,
             timestamp=timestamp,
-            current_logaddress_pointer=None,
         )
         return await self.update_node_details(node_info)
 
@@ -517,6 +517,7 @@ async def update_node_details(
         complete &= self._update_node_details_hardware(node_info.hardware)
         complete &= self._update_node_details_timestamp(node_info.timestamp)
 
+        _LOGGER.debug("Saving Node calibration update to cache for %s" self.mac)
         await self.save_cache()
         if node_info.timestamp is not None and node_info.timestamp > datetime.now(
             tz=UTC
@@ -577,8 +578,6 @@ def _update_node_details_hardware(self, hardware: str | None) -> bool:
             self._set_cache(CACHE_HARDWARE, hardware)
         return True
 
-        _LOGGER.debug("Saving Node calibration update to cache for %s" self.mac)
-
     async def is_online(self) -> bool:
         """Check if node is currently online."""
         if await self.ping_update() is None:

tests/test_usb.py

@@ -2156,12 +2156,12 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
         )
         assert not test_scan.cache_enabled
         node_info = pw_api.NodeInfoMessage(
+            current_logaddress_pointer=None,
             firmware=dt(2011, 6, 27, 8, 55, 44, tzinfo=UTC),
             hardware="080007",
             logaddress_pointer=None,
             node_type=None,
             relay_state=None,
-            current_logaddress_pointer=None,
         )
         await test_scan.update_node_details(node_info)
         assert await test_scan.load()
@@ -2261,12 +2261,12 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
             "1298347650AFBECD", 1, mock_stick_controller, load_callback
         )
         node_info = pw_api.NodeInfoMessage(
+            current_logaddress_pointer=None,
             firmware=dt(2011, 6, 27, 8, 55, 44, tzinfo=UTC),
             hardware="080007",
             logaddress_pointer=None,
             node_type=None,
             relay_state=None,
-            current_logaddress_pointer=None,
         )
         await test_scan.update_node_details(node_info)
         test_scan.cache_enabled = True
@@ -2338,12 +2338,12 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
             )
         )
         node_info = pw_api.NodeInfoMessage(
+            current_logaddress_pointer=None,
             firmware=dt(2011, 6, 27, 9, 4, 10, tzinfo=UTC),
             hardware="070051",
             logaddress_pointer=None,
             node_type=None,
             relay_state=None,
-            current_logaddress_pointer=None,
         )
         await test_switch.update_node_details(node_info)
         assert await test_switch.load()
@@ -2356,12 +2356,12 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
             "1298347650AFBECD", 1, mock_stick_controller, load_callback
         )
         node_info = pw_api.NodeInfoMessage(
+            current_logaddress_pointer=None,
             firmware=dt(2011, 6, 27, 9, 4, 10, tzinfo=UTC),
             hardware="070051",
             logaddress_pointer=None,
             node_type=None,
             relay_state=None,
-            current_logaddress_pointer=None,
         )
         await test_switch.update_node_details(node_info)
         test_switch.cache_enabled = True