Refactor

beacon_node/network/src/sync/block_sidecar_coupling.rs

@@ -490,7 +490,6 @@ mod tests {
 
     use super::RangeBlockComponentsRequest;
     use beacon_chain::custody_context::NodeCustodyType;
-    use beacon_chain::data_availability_router::AvailabilityCache;
     use beacon_chain::test_utils::{
         NumBlobs, generate_rand_block_and_blobs, generate_rand_block_and_data_columns,
         test_da_checker, test_spec,

beacon_node/network/src/sync/network_context.rs

@@ -967,7 +967,6 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
         let imported_blob_indexes = self
             .chain
             .data_availability_checker
-            .v1()
             .cached_blob_indexes(&block_root)
             .unwrap_or_default();
         // Include only the blob indexes not yet imported (received through gossip)
@@ -1371,14 +1370,12 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
         if self
             .chain
             .data_availability_checker
-            .v1()
             .data_columns_required_for_epoch(epoch)
         {
             ByRangeRequestType::BlocksAndColumns
         } else if self
             .chain
             .data_availability_checker
-            .v1()
             .blobs_required_for_epoch(epoch)
         {
             ByRangeRequestType::BlocksAndBlobs

beacon_node/network/src/sync/tests/lookups.rs

@@ -1082,7 +1082,6 @@ impl TestRig {
             .harness
             .chain
             .data_availability_checker
-            .v1()
             .put_executed_block(executed_block)
             .unwrap()
         {
@@ -1098,7 +1097,6 @@ impl TestRig {
             .harness
             .chain
             .data_availability_checker
-            .v1()
             .put_gossip_verified_blobs(
                 blob.block_root(),
                 std::iter::once(GossipVerifiedBlob::<_, Observe>::__assumed_valid(
@@ -1118,7 +1116,6 @@ impl TestRig {
         self.harness
             .chain
             .data_availability_checker
-            .v1()
             .put_pre_execution_block(block.canonical_root(), block, BlockImportSource::Gossip)
             .unwrap();
     }
@@ -1127,7 +1124,6 @@ impl TestRig {
         self.harness
             .chain
             .data_availability_checker
-            .v1()
             .remove_block_on_execution_error(&block_root);
 
         self.send_sync_message(SyncMessage::GossipBlockProcessResult {