resolve merge conflicts

beacon_node/http_api/src/block_id.rs

@@ -296,16 +296,17 @@ impl BlockId {
                     ))
                 })?
         } else {
-            BlobSidecarList::default()
+            BlobSidecarList::empty_uninitialized()
         };
 
         let blob_sidecar_list_filtered = match indices.indices {
             Some(vec) => {
-                let list = blob_sidecar_list
+                let list: Vec<_> = blob_sidecar_list
                     .into_iter()
                     .filter(|blob_sidecar| vec.contains(&blob_sidecar.index))
                     .collect();
-                BlobSidecarList::new(list)
+                let max_len = chain.spec.max_blobs_per_block(block.epoch());
+                BlobSidecarList::new(list, max_len as usize)
                     .map_err(|e| warp_utils::reject::custom_server_error(format!("{:?}", e)))?
             }
             None => blob_sidecar_list,

beacon_node/http_api/tests/broadcast_validation_tests.rs

@@ -1460,7 +1460,8 @@ pub async fn block_seen_on_gossip_with_some_blobs() {
     let blobs = blobs.expect("should have some blobs");
     assert!(
         blobs.0.len() >= 2,
-        "need at least 2 blobs for partial reveal"
+        "need at least 2 blobs for partial reveal, got: {}",
+        blobs.0.len()
     );
 
     let partial_kzg_proofs = vec![*blobs.0.first().unwrap()];