sdk/ts: fix deserializeInterface to read flex_algo_node_segments for V2 (version 1); rustfmt

Author: ben-malbeclabs

sdk/serviceability/typescript/serviceability/state.ts

@@ -534,18 +534,16 @@ function deserializeInterface(r: DefensiveReader): DeviceInterface {
     iface.ipNet = r.readNetworkV4();
     iface.nodeSegmentIdx = r.readU16();
     iface.userTunnelEndpoint = r.readBool();
-    if (iface.version === 2) {
-      // V3
-      const segCount = r.readU32();
-      const flexAlgoNodeSegments: FlexAlgoNodeSegment[] = [];
-      for (let i = 0; i < segCount; i++) {
-        flexAlgoNodeSegments.push({
-          topology: readPubkey(r),
-          nodeSegmentIdx: r.readU16(),
-        });
-      }
-      iface.flexAlgoNodeSegments = flexAlgoNodeSegments;
+    // flex_algo_node_segments is part of V2 (version byte 1) and later
+    const segCount = r.readU32();
+    const flexAlgoNodeSegments: FlexAlgoNodeSegment[] = [];
+    for (let i = 0; i < segCount; i++) {
+      flexAlgoNodeSegments.push({
+        topology: readPubkey(r),
+        nodeSegmentIdx: r.readU16(),
+      });
     }
+    iface.flexAlgoNodeSegments = flexAlgoNodeSegments;
   }
 
   return iface;

smartcontract/programs/doublezero-serviceability/src/instructions.rs

@@ -510,7 +510,7 @@ impl DoubleZeroInstruction {
             Self::SetUserBGPStatus(_) => "SetUserBGPStatus".to_string(), // variant 106
             Self::CreateTopology(_) => "CreateTopology".to_string(), // variant 107
             Self::DeleteTopology(_) => "DeleteTopology".to_string(), // variant 108
-            Self::ClearTopology(_) => "ClearTopology".to_string(),   // variant 109
+            Self::ClearTopology(_) => "ClearTopology".to_string(), // variant 109
             Self::BackfillTopology(_) => "BackfillTopology".to_string(), // variant 110
         }
     }
@@ -644,7 +644,7 @@ impl DoubleZeroInstruction {
             Self::SetUserBGPStatus(args) => format!("{args:?}"), // variant 106
             Self::CreateTopology(args) => format!("{args:?}"), // variant 107
             Self::DeleteTopology(args) => format!("{args:?}"), // variant 108
-            Self::ClearTopology(args) => format!("{args:?}"),  // variant 109
+            Self::ClearTopology(args) => format!("{args:?}"), // variant 109
             Self::BackfillTopology(args) => format!("{args:?}"), // variant 110
         }
     }

smartcontract/programs/doublezero-serviceability/src/pda.rs

@@ -6,11 +6,10 @@ use crate::{
     seeds::{
         SEED_ACCESS_PASS, SEED_ADMIN_GROUP_BITS, SEED_CONFIG, SEED_CONTRIBUTOR, SEED_DEVICE,
         SEED_DEVICE_TUNNEL_BLOCK, SEED_DZ_PREFIX_BLOCK, SEED_EXCHANGE, SEED_GLOBALSTATE,
-        SEED_INDEX, SEED_LINK,
-        SEED_LINK_IDS, SEED_LOCATION, SEED_MULTICASTGROUP_BLOCK, SEED_MULTICAST_GROUP,
-        SEED_MULTICAST_PUBLISHER_BLOCK, SEED_PERMISSION, SEED_PREFIX, SEED_PROGRAM_CONFIG,
-        SEED_SEGMENT_ROUTING_IDS, SEED_TENANT, SEED_TOPOLOGY, SEED_TUNNEL_IDS, SEED_USER,
-        SEED_USER_TUNNEL_BLOCK, SEED_VRF_IDS,
+        SEED_INDEX, SEED_LINK, SEED_LINK_IDS, SEED_LOCATION, SEED_MULTICASTGROUP_BLOCK,
+        SEED_MULTICAST_GROUP, SEED_MULTICAST_PUBLISHER_BLOCK, SEED_PERMISSION, SEED_PREFIX,
+        SEED_PROGRAM_CONFIG, SEED_SEGMENT_ROUTING_IDS, SEED_TENANT, SEED_TOPOLOGY, SEED_TUNNEL_IDS,
+        SEED_USER, SEED_USER_TUNNEL_BLOCK, SEED_VRF_IDS,
     },
     state::user::UserType,
 };

smartcontract/programs/doublezero-serviceability/tests/delete_cyoa_interface_test.rs

@@ -438,7 +438,10 @@ async fn test_update_cyoa_interface_with_invalid_sibling() {
         .unwrap();
 
     let updated_iface = device.find_interface("Ethernet1").unwrap().1;
-    assert_eq!(updated_iface.mtu, 1500, "MTU should remain 1500 for CYOA interface");
+    assert_eq!(
+        updated_iface.mtu, 1500,
+        "MTU should remain 1500 for CYOA interface"
+    );
     assert_eq!(
         updated_iface.ip_net,
         "63.243.225.62/30".parse().unwrap(),