Undo accidentally removed code.

Author: jimmygchen

beacon_node/beacon_chain/src/test_utils.rs

@@ -2578,6 +2578,7 @@ pub fn generate_rand_block_and_blobs<E: EthSpec>(
     (block, blob_sidecars)
 }
 
+#[allow(clippy::type_complexity)]
 pub fn generate_rand_block_and_data_columns<E: EthSpec>(
     fork_name: ForkName,
     num_blobs: NumBlobs,

beacon_node/network/src/sync/block_sidecar_coupling.rs

@@ -299,7 +299,7 @@ mod tests {
         for block in &blocks {
             for column in &block.1 {
                 if expects_custody_columns.contains(&column.index) {
-                    info.add_data_column(Some(column.clone().into()));
+                    info.add_data_column(Some(column.clone()));
                 }
             }
         }

beacon_node/src/config.rs

@@ -443,6 +443,12 @@ pub fn get_config<E: EthSpec>(
         client_config.store.epochs_per_blob_prune = epochs_per_blob_prune;
     }
 
+    if let Some(blob_prune_margin_epochs) =
+        clap_utils::parse_optional(cli_args, "blob-prune-margin-epochs")?
+    {
+        client_config.store.blob_prune_margin_epochs = blob_prune_margin_epochs;
+    }
+
     if let Some(malicious_withhold_count) =
         clap_utils::parse_optional(cli_args, "malicious-withhold-count")?
     {

testing/ef_tests/check_all_files_accessed.py

@@ -23,7 +23,7 @@
     # TODO(das): remove once electra tests are on unstable
     "tests/.*/electra/",
     # TODO(das): ignore until new spec test release with column subnet count = 64.
-    "tests/.*/.*/.*/get_custody_columns/"
+    "tests/.*/.*/.*/get_custody_columns/",
     # Eth1Block and PowBlock
     #
     # Intentionally omitted, as per https://github.com/sigp/lighthouse/issues/1835