Remove unnecessary changes to reduce diff.

Author: jimmygchen

beacon_node/beacon_chain/src/custody_context.rs

@@ -574,10 +574,6 @@ mod tests {
 
     type E = MainnetEthSpec;
 
-    // ============================================================================
-    // Test Helpers and Utilities
-    // ============================================================================
-
     fn setup_custody_context(
         spec: &ChainSpec,
         current_epoch: Epoch,
@@ -616,31 +612,6 @@ mod tests {
         }
     }
 
-    /// Helper function to test default CGC initialization for different node custody types.
-    /// Verifies custody_group_count_at_head and num_of_custody_groups_to_sample match expectations.
-    fn assert_default_cgc_for_node_custody_type(
-        node_custody_type: NodeCustodyType,
-        expected_cgc_at_head: u64,
-        expected_sampling_size: u64,
-        spec: &ChainSpec,
-    ) {
-        let custody_context = CustodyContext::<E>::new(node_custody_type, spec);
-
-        assert_eq!(
-            custody_context.custody_group_count_at_head(spec),
-            expected_cgc_at_head,
-            "custody_group_count_at_head should be {}",
-            expected_cgc_at_head
-        );
-
-        assert_eq!(
-            custody_context.num_of_custody_groups_to_sample(Epoch::new(0), spec),
-            expected_sampling_size,
-            "num_of_custody_groups_to_sample should be {}",
-            expected_sampling_size
-        );
-    }
-
     /// Helper function to test CGC increases when switching node custody types.
     /// Verifies that CustodyCountChanged is returned with correct values and
     /// that custody_group_count_at_epoch returns appropriate values for current and next epoch.
@@ -686,20 +657,15 @@ mod tests {
             "old_custody_group_count should be {}",
             persisted_cgc
         );
-
-        // Verify effective epoch is next epoch
-        let expected_effective_epoch = current_epoch + 1;
         assert_eq!(
-            cgc_changed.effective_epoch, expected_effective_epoch,
+            cgc_changed.effective_epoch,
+            current_epoch + 1,
             "effective epoch should be current_epoch + 1"
         );
-
-        // Verify sampling count
-        let expected_sampling_count = spec
-            .sampling_size_custody_groups(expected_new_cgc)
-            .expect("should compute sampling size");
         assert_eq!(
-            cgc_changed.sampling_count, expected_sampling_count,
+            cgc_changed.sampling_count,
+            spec.sampling_size_custody_groups(expected_new_cgc)
+                .expect("should compute sampling size"),
             "sampling_count should match expected value"
         );
 
@@ -755,47 +721,49 @@ mod tests {
         );
     }
 
-    // ============================================================================
-    // Default Initialization Tests
-    // ============================================================================
-
     #[test]
     fn no_validators_supernode_default() {
         let spec = E::default_spec();
-        assert_default_cgc_for_node_custody_type(
-            NodeCustodyType::Supernode,
-            spec.number_of_custody_groups,
-            spec.number_of_custody_groups,
-            &spec,
+        let custody_context = CustodyContext::<E>::new(NodeCustodyType::Supernode, &spec);
+        assert_eq!(
+            custody_context.custody_group_count_at_head(&spec),
+            spec.number_of_custody_groups
+        );
+        assert_eq!(
+            custody_context.num_of_custody_groups_to_sample(Epoch::new(0), &spec),
+            spec.number_of_custody_groups
         );
     }
 
     #[test]
     fn no_validators_semi_supernode_default() {
         let spec = E::default_spec();
-        assert_default_cgc_for_node_custody_type(
-            NodeCustodyType::SemiSupernode,
-            spec.number_of_custody_groups / 2,
-            spec.number_of_custody_groups / 2,
-            &spec,
+        let custody_context = CustodyContext::<E>::new(NodeCustodyType::SemiSupernode, &spec);
+        assert_eq!(
+            custody_context.custody_group_count_at_head(&spec),
+            spec.number_of_custody_groups / 2
+        );
+        assert_eq!(
+            custody_context.num_of_custody_groups_to_sample(Epoch::new(0), &spec),
+            spec.number_of_custody_groups / 2
         );
     }
 
     #[test]
     fn no_validators_fullnode_default() {
         let spec = E::default_spec();
-        assert_default_cgc_for_node_custody_type(
-            NodeCustodyType::Fullnode,
+        let custody_context = CustodyContext::<E>::new(NodeCustodyType::Fullnode, &spec);
+        assert_eq!(
+            custody_context.custody_group_count_at_head(&spec),
             spec.custody_requirement,
-            spec.samples_per_slot,
-            &spec,
+            "head custody count should be minimum spec custody requirement"
+        );
+        assert_eq!(
+            custody_context.num_of_custody_groups_to_sample(Epoch::new(0), &spec),
+            spec.samples_per_slot
         );
     }
 
-    // ============================================================================
-    // Validator Registration and CGC Updates
-    // ============================================================================
-
     #[test]
     fn register_single_validator_should_update_cgc() {
         let spec = E::default_spec();
@@ -926,10 +894,6 @@ mod tests {
         );
     }
 
-    // ============================================================================
-    // Validator Expiry Tests
-    // ============================================================================
-
     #[test]
     fn validator_dropped_after_no_registrations_within_expiry_should_not_reduce_cgc() {
         let spec = E::default_spec();
@@ -1022,10 +986,6 @@ mod tests {
         );
     }
 
-    // ============================================================================
-    // Custody Columns and Data Column Initialization
-    // ============================================================================
-
     #[test]
     fn should_init_ordered_data_columns_and_return_sampling_columns() {
         let spec = E::default_spec();
@@ -1157,10 +1117,6 @@ mod tests {
         );
     }
 
-    // ============================================================================
-    // Persistence and Restoration Tests
-    // ============================================================================
-
     #[test]
     fn restore_from_persisted_fullnode_no_validators() {
         let spec = E::default_spec();
@@ -1184,10 +1140,6 @@ mod tests {
         );
     }
 
-    // ============================================================================
-    // Node Custody Type Switching Tests
-    // ============================================================================
-
     /// Tests CLI flag change: Fullnode (CGC=0) → Supernode (CGC=128)
     /// CGC should increase and trigger backfill via CustodyCountChanged.
     #[test]
@@ -1340,10 +1292,6 @@ mod tests {
         );
     }
 
-    // ============================================================================
-    // Historical Custody and Backfill Tests
-    // ============================================================================
-
     #[test]
     fn restore_with_validator_custody_history_across_epochs() {
         let spec = E::default_spec();