Fix semantic conflicts

sigp · Sep 27, 2024 · 4639146 · 4639146
1 parent a6fbb3c
commit 4639146
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -3110,7 +3110,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             .fork_choice_read_lock()
             .contains_block(&block_root)
         {
-            return Err(BlockError::BlockIsAlreadyKnown(block_root));
+            return Err(BlockError::DuplicateFullyImported(block_root));
         }
 
         self.emit_sse_blob_sidecar_events(&block_root, blobs.iter().flatten().map(Arc::as_ref));

diff --git a/beacon_node/beacon_chain/src/block_verification.rs b/beacon_node/beacon_chain/src/block_verification.rs
@@ -750,7 +750,8 @@ pub fn build_blob_data_column_sidecars<T: BeaconChainTypes>(
         &metrics::DATA_COLUMN_SIDECAR_COMPUTATION,
         &[&blobs.len().to_string()],
     );
-    let sidecars = blobs_to_data_column_sidecars(&blobs, block, &chain.kzg, &chain.spec)
+    let blob_refs = blobs.iter().collect::<Vec<_>>();
+    let sidecars = blobs_to_data_column_sidecars(&blob_refs, block, &chain.kzg, &chain.spec)
         .discard_timer_on_break(&mut timer)?;
     drop(timer);
     Ok(sidecars)

diff --git a/beacon_node/beacon_chain/src/fetch_blobs.rs b/beacon_node/beacon_chain/src/fetch_blobs.rs
@@ -127,7 +127,7 @@ pub async fn fetch_and_process_engine_blobs<T: BeaconChainTypes>(
 
         let logger = chain.log.clone();
         let block_cloned = block.clone();
-        let kzg = chain.kzg.clone().expect("KZG not initialized");
+        let kzg = chain.kzg.clone();
         let spec = chain.spec.clone();
         let blobs_cloned = fixed_blob_sidecar_list.clone();
         let chain_cloned = chain.clone();