nuke router

beacon_node/beacon_chain/tests/block_verification.rs

@@ -165,7 +165,7 @@ where
             RangeSyncBlock::new(
                 block,
                 block_data,
-                chain.data_availability_checker.pending_block_cache(),
+                &chain.data_availability_checker,
                 chain.spec.clone(),
             )
             .unwrap()
@@ -180,7 +180,7 @@ where
             RangeSyncBlock::new(
                 block,
                 block_data,
-                chain.data_availability_checker.pending_block_cache(),
+                &chain.data_availability_checker,
                 chain.spec.clone(),
             )
             .unwrap()
@@ -188,7 +188,7 @@ where
         None => RangeSyncBlock::new(
             block,
             AvailableBlockData::NoData,
-            chain.data_availability_checker.pending_block_cache(),
+            &chain.data_availability_checker,
             chain.spec.clone(),
         )
         .unwrap(),
@@ -462,10 +462,7 @@ async fn chain_segment_non_linear_parent_roots() {
     blocks[3] = RangeSyncBlock::new(
         Arc::new(SignedBeaconBlock::from_block(block, signature)),
         blocks[3].block_data().clone(),
-        harness
-            .chain
-            .data_availability_checker
-            .pending_block_cache(),
+        &harness.chain.data_availability_checker,
         harness.spec.clone(),
     )
     .unwrap();
@@ -505,10 +502,7 @@ async fn chain_segment_non_linear_slots() {
     blocks[3] = RangeSyncBlock::new(
         Arc::new(SignedBeaconBlock::from_block(block, signature)),
         blocks[3].block_data().clone(),
-        harness
-            .chain
-            .data_availability_checker
-            .pending_block_cache(),
+        &harness.chain.data_availability_checker,
         harness.spec.clone(),
     )
     .unwrap();
@@ -538,10 +532,7 @@ async fn chain_segment_non_linear_slots() {
     blocks[3] = RangeSyncBlock::new(
         Arc::new(SignedBeaconBlock::from_block(block, signature)),
         blocks[3].block_data().clone(),
-        harness
-            .chain
-            .data_availability_checker
-            .pending_block_cache(),
+        &harness.chain.data_availability_checker,
         harness.chain.spec.clone(),
     )
     .unwrap();
@@ -1723,10 +1714,7 @@ async fn add_base_block_to_altair_chain() {
     let base_range_sync_block = RangeSyncBlock::new(
         Arc::new(base_block.clone()),
         AvailableBlockData::NoData,
-        harness
-            .chain
-            .data_availability_checker
-            .pending_block_cache(),
+        &harness.chain.data_availability_checker,
         harness.spec.clone(),
     )
     .unwrap();
@@ -1757,7 +1745,7 @@ async fn add_base_block_to_altair_chain() {
                     RangeSyncBlock::new(
                         Arc::new(base_block),
                         AvailableBlockData::NoData,
-                        harness.chain.data_availability_checker.v1(),
+                        &harness.chain.pending_block_cache,
                         harness.spec.clone()
                     )
                     .unwrap()
@@ -1902,7 +1890,7 @@ async fn add_altair_block_to_base_chain() {
                     RangeSyncBlock::new(
                         Arc::new(altair_block),
                         AvailableBlockData::NoData,
-                        harness.chain.data_availability_checker.v1(),
+                        &harness.chain.pending_block_cache,
                         harness.spec.clone()
                     )
                     .unwrap()
@@ -1970,10 +1958,7 @@ async fn import_duplicate_block_unrealized_justification() {
     let range_sync_block = RangeSyncBlock::new(
         block.clone(),
         AvailableBlockData::NoData,
-        harness
-            .chain
-            .data_availability_checker
-            .pending_block_cache(),
+        &harness.chain.data_availability_checker,
         harness.spec.clone(),
     )
     .unwrap();
@@ -2107,10 +2092,7 @@ async fn range_sync_block_construction_fails_with_wrong_blob_count() {
             let result = RangeSyncBlock::new(
                 Arc::new(block),
                 block_data,
-                harness
-                    .chain
-                    .data_availability_checker
-                    .pending_block_cache(),
+                &harness.chain.data_availability_checker,
                 harness.chain.spec.clone(),
             );
 
@@ -2188,10 +2170,7 @@ async fn range_sync_block_rejects_missing_custody_columns() {
                 let result = RangeSyncBlock::new(
                     Arc::new(block),
                     block_data,
-                    harness
-                        .chain
-                        .data_availability_checker
-                        .pending_block_cache(),
+                    &harness.chain.data_availability_checker,
                     harness.chain.spec.clone(),
                 );
 
@@ -2267,7 +2246,6 @@ async fn rpc_block_allows_construction_past_da_boundary() {
             // Now verify the block is past the DA boundary
             let da_boundary = harness
                 .chain
-                .data_availability_checker
                 .data_availability_boundary()
                 .expect("DA boundary should be set");
             assert!(
@@ -2282,10 +2260,7 @@ async fn rpc_block_allows_construction_past_da_boundary() {
             let result = RangeSyncBlock::new(
                 Arc::new(block),
                 AvailableBlockData::NoData,
-                harness
-                    .chain
-                    .data_availability_checker
-                    .pending_block_cache(),
+                &harness.chain.data_availability_checker,
                 harness.chain.spec.clone(),
             );
 

beacon_node/beacon_chain/tests/store_tests.rs

@@ -3300,7 +3300,7 @@ async fn weak_subjectivity_sync_test(
             AvailableBlock::new(
                 Arc::new(corrupt_block),
                 data,
-                beacon_chain.data_availability_checker.pending_block_cache(),
+                &beacon_chain.data_availability_checker,
                 Arc::new(spec),
             )
             .expect("available block")