Minor simplifications

beacon_node/http_api/src/block_id.rs

@@ -305,15 +305,9 @@ impl BlockId {
                     .into_iter()
                     .filter(|blob_sidecar| vec.contains(&blob_sidecar.index))
                     .collect();
-                if let Some(max_len) = list
-                    .first()
-                    .map(|sidecar| chain.spec.max_blobs_per_block(sidecar.epoch()))
-                {
-                    BlobSidecarList::new(list, max_len as usize)
-                        .map_err(|e| warp_utils::reject::custom_server_error(format!("{:?}", e)))?
-                } else {
-                    BlobSidecarList::empty_uninitialized()
-                }
+                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/store/src/hot_cold_store.rs

@@ -2060,7 +2060,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
                 // We insert a VariableList of BlobSidecars into the db, but retrieve
                 // a plain vec since we don't know the length limit of the list without
                 // knowing the slot.
-                // The encoding of a VariableList is same as a regular vec.
+                // The encoding of a VariableList is the same as a regular vec.
                 let blobs: Vec<Arc<BlobSidecar<E>>> = Vec::<_>::from_ssz_bytes(blobs_bytes)?;
                 let blobs = if let Some(max_blobs_per_block) = blobs
                     .first()