clippy

Author: r-birkner

rs/registry/canister/src/invariants/subnet.rs

@@ -110,22 +110,21 @@ pub(crate) fn check_subnet_invariants(
         }
 
         // SEV-enabled subnets consist of SEV-enabled nodes only (i.e. nodes with a chip ID in the node record)
-        if let Some(features) = subnet_record.features.as_ref() {
-            if features.sev_enabled == Some(true) {
-                for &node_id in &subnet_members {
-                    // handle missing node record
-                    let node_record = get_node_record_from_snapshot(node_id, snapshot)?
-                        .ok_or_else(|| InvariantCheckError {
-                            msg: format!("Subnet {subnet_id} has node {node_id} in its membership but the node record does not exist"),
-                            source: None,
-                    })?;
-
-                    // handle missing chip_id
-                    node_record.chip_id.as_ref().ok_or_else(|| InvariantCheckError {
-                        msg: format!("Subnet {subnet_id} is SEV-enabled but at least one of its nodes is not: {node_id} does not have a chip ID in its node record"),
+        if let Some(features) = subnet_record.features.as_ref()
+            && features.sev_enabled == Some(true)
+        {
+            for &node_id in &subnet_members {
+                // handle missing node record
+                let node_record = get_node_record_from_snapshot(node_id, snapshot)?
+                    .ok_or_else(|| InvariantCheckError {
+                        msg: format!("Subnet {subnet_id} has node {node_id} in its membership but the node record does not exist"),
                         source: None,
-                    })?;
-                }
+                })?;
+                // handle missing chip_id
+                node_record.chip_id.as_ref().ok_or_else(|| InvariantCheckError {
+                    msg: format!("Subnet {subnet_id} is SEV-enabled but at least one of its nodes is not: {node_id} does not have a chip ID in its node record"),
+                    source: None,
+                })?;
             }
         }
     }

rs/registry/canister/src/invariants/subnet/tests.rs

@@ -77,8 +77,10 @@ fn only_sev_enabled_subnets_consist_of_sev_enabled_nodes() {
     check_subnet_invariants(&snapshot).unwrap();
 
     // a non SEV-enabled subnet with some nodes with and some without chip IDs is compliant
-    let mut test_node_record = NodeRecord::default();
-    test_node_record.chip_id = Some("a chip id".into());
+    let test_node_record = NodeRecord {
+        chip_id: Some("a chip id".into()),
+        ..Default::default()
+    };
     snapshot.insert(
         make_node_record_key(test_node_id).into_bytes(),
         test_node_record.encode_to_vec(),
@@ -94,8 +96,10 @@ fn only_sev_enabled_subnets_consist_of_sev_enabled_nodes() {
         make_subnet_record_key(test_subnet_id).into_bytes(),
         test_subnet_record.encode_to_vec(),
     );
-    let mut test_node_record = NodeRecord::default();
-    test_node_record.chip_id = None;
+    let test_node_record = NodeRecord {
+        chip_id: None,
+        ..Default::default()
+    };
     snapshot.insert(
         make_node_record_key(test_node_id).into_bytes(),
         test_node_record.encode_to_vec(),
@@ -129,8 +133,10 @@ fn only_sev_enabled_subnets_consist_of_sev_enabled_nodes() {
     check_subnet_invariants(&snapshot).unwrap();
 
     // an SEV-enabled subnet with some nodes with and some without chip ID is NOT compliant
-    let mut test_node_record = NodeRecord::default();
-    test_node_record.chip_id = None;
+    let test_node_record = NodeRecord {
+        chip_id: None,
+        ..Default::default()
+    };
     snapshot.insert(
         make_node_record_key(test_node_id).into_bytes(),
         test_node_record.encode_to_vec(),
@@ -200,7 +206,7 @@ fn setup_minimal_registry_snapshot_for_check_subnet_invariants(
         .collect();
 
     let test_subnet_record = SubnetRecord {
-        membership: membership,
+        membership,
         ..Default::default()
     };
     snapshot.insert(