Fixes after rebasing eip4844

beacon_node/beacon_chain/tests/attestation_production.rs

@@ -1,6 +1,9 @@
 #![cfg(not(debug_assertions))]
 
-use beacon_chain::test_utils::{AttestationStrategy, BeaconChainHarness, BlockStrategy};
+use beacon_chain::{
+    blob_verification::{BlockWrapper, IntoAvailableBlock},
+    test_utils::{AttestationStrategy, BeaconChainHarness, BlockStrategy},
+};
 use beacon_chain::{StateSkipConfig, WhenSlotSkipped};
 use lazy_static::lazy_static;
 use std::sync::Arc;
@@ -131,6 +134,8 @@ async fn produces_attestations() {
             assert_eq!(data.target.epoch, state.current_epoch(), "bad target epoch");
             assert_eq!(data.target.root, target_root, "bad target root");
 
+            let block_wrapper: BlockWrapper<MainnetEthSpec> = Arc::new(block.clone()).into();
+
             let early_attestation = {
                 let proto_block = chain
                     .canonical_head
@@ -141,7 +146,9 @@ async fn produces_attestations() {
                     .early_attester_cache
                     .add_head_block(
                         block_root,
-                        Arc::new(block.clone()).into(),
+                        block_wrapper
+                            .into_available_block(block_root, chain)
+                            .expect("should wrap into available block"),
                         proto_block,
                         &state,
                         &chain.spec,
@@ -192,12 +199,18 @@ async fn early_attester_cache_old_request() {
         .get_block(&head.beacon_block_root)
         .unwrap();
 
+    let block: BlockWrapper<MainnetEthSpec> = head.beacon_block.clone().into();
+
+    let chain = &harness.chain;
     harness
         .chain
         .early_attester_cache
         .add_head_block(
             head.beacon_block_root,
-            head.beacon_block.clone().into(),
+            block
+                .clone()
+                .into_available_block(head.beacon_block_root, &chain)
+                .expect("should wrap into available block"),
             head_proto_block,
             &head.beacon_state,
             &harness.chain.spec,

beacon_node/beacon_chain/tests/block_verification.rs

@@ -1,7 +1,11 @@
 #![cfg(not(debug_assertions))]
 
-use beacon_chain::test_utils::{
-    AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralTestingSlotClockHarnessType,
+use beacon_chain::{
+    blob_verification::{AsBlock, BlockWrapper},
+    test_utils::{
+        AttestationStrategy, BeaconChainHarness, BlockStrategy,
+        EphemeralTestingSlotClockHarnessType,
+    },
 };
 use beacon_chain::{BeaconSnapshot, BlockError, ChainSegmentResult, NotifyExecutionLayer};
 use fork_choice::CountUnrealized;
@@ -16,7 +20,6 @@ use state_processing::{
 use std::marker::PhantomData;
 use std::sync::Arc;
 use tempfile::tempdir;
-use types::signed_block_and_blobs::BlockWrapper;
 use types::{test_utils::generate_deterministic_keypair, *};
 
 type E = MainnetEthSpec;
@@ -173,7 +176,7 @@ async fn chain_segment_full_segment() {
 
     assert_eq!(
         harness.head_block_root(),
-        blocks.last().unwrap().block().canonical_root(),
+        blocks.last().unwrap().canonical_root(),
         "harness should have last block as head"
     );
 }
@@ -210,7 +213,7 @@ async fn chain_segment_varying_chunk_size() {
 
         assert_eq!(
             harness.head_block_root(),
-            blocks.last().unwrap().block().canonical_root(),
+            blocks.last().unwrap().canonical_root(),
             "harness should have last block as head"
         );
     }
@@ -254,7 +257,8 @@ async fn chain_segment_non_linear_parent_roots() {
         .into_iter()
         .map(|block| block.into())
         .collect();
-    let (mut block, signature) = blocks[3].block().clone().deconstruct();
+
+    let (mut block, signature) = blocks[3].as_block().clone().deconstruct();
     *block.parent_root_mut() = Hash256::zero();
     blocks[3] = Arc::new(SignedBeaconBlock::from_block(block, signature)).into();
 
@@ -288,7 +292,7 @@ async fn chain_segment_non_linear_slots() {
         .into_iter()
         .map(|block| block.into())
         .collect();
-    let (mut block, signature) = blocks[3].block().clone().deconstruct();
+    let (mut block, signature) = blocks[3].as_block().clone().deconstruct();
     *block.slot_mut() = Slot::new(0);
     blocks[3] = Arc::new(SignedBeaconBlock::from_block(block, signature)).into();
 
@@ -312,7 +316,7 @@ async fn chain_segment_non_linear_slots() {
         .into_iter()
         .map(|block| block.into())
         .collect();
-    let (mut block, signature) = blocks[3].block().clone().deconstruct();
+    let (mut block, signature) = blocks[3].as_block().clone().deconstruct();
     *block.slot_mut() = blocks[2].slot();
     blocks[3] = Arc::new(SignedBeaconBlock::from_block(block, signature)).into();