everything, everywhere, all at once

beacon_node/beacon_chain/src/builder.rs

@@ -87,7 +87,6 @@ pub struct BeaconChainBuilder<T: BeaconChainTypes> {
     event_handler: Option<ServerSentEventHandler<T::EthSpec>>,
     slot_clock: Option<T::SlotClock>,
     shutdown_sender: Option<Sender<ShutdownReason>>,
-    block_importer_sender: Option<tokio::sync::mpsc::Sender<ExecutedBlock<T::EthSpec>>>,
     head_tracker: Option<HeadTracker>,
     validator_pubkey_cache: Option<ValidatorPubkeyCache<T>>,
     spec: ChainSpec,
@@ -130,7 +129,6 @@ where
             event_handler: None,
             slot_clock: None,
             shutdown_sender: None,
-            block_importer_sender: None,
             head_tracker: None,
             validator_pubkey_cache: None,
             spec: TEthSpec::default_spec(),
@@ -562,14 +560,6 @@ where
         self
     }
 
-    pub fn block_importer_sender(
-        mut self,
-        sender: tokio::sync::mpsc::Sender<ExecutedBlock<TEthSpec>>,
-    ) -> Self {
-        self.block_importer_sender = Some(sender);
-        self
-    }
-
     /// Creates a new, empty operation pool.
     fn empty_op_pool(mut self) -> Self {
         self.op_pool = Some(OperationPool::new());
@@ -653,18 +643,13 @@ where
             slot_clock.now().ok_or("Unable to read slot")?
         };
 
-        let (kzg, data_availability_checker) = if let (Some(tx), Some(trusted_setup)) =
-            (self.block_importer_sender, self.trusted_setup)
-        {
+        let kzg = if let Some(trusted_setup) = self.trusted_setup {
             let kzg = Kzg::new_from_trusted_setup(trusted_setup)
                 .map_err(|e| format!("Failed to load trusted setup: {:?}", e))?;
             let kzg_arc = Arc::new(kzg);
-            (
-                Some(kzg_arc.clone()),
-                Some(DataAvailabilityChecker::new(kzg_arc, tx)),
-            )
+            Some(kzg_arc)
         } else {
-            (None, None)
+            None
         };
 
         let initial_head_block_root = fork_choice
@@ -869,7 +854,7 @@ where
             slasher: self.slasher.clone(),
             validator_monitor: RwLock::new(validator_monitor),
             //TODO(sean) should we move kzg solely to the da checker?
-            data_availability_checker,
+            data_availability_checker: DataAvailabilityChecker::new(kzg.clone()),
             proposal_blob_cache: BlobCache::default(),
             kzg,
         };