Remove reprocessing cache stuff

beacon_node/network/src/beacon_processor/mod.rs

@@ -42,9 +42,7 @@ use crate::sync::manager::BlockProcessType;
 use crate::{metrics, service::NetworkMessage, sync::SyncMessage};
 use beacon_chain::blob_verification::BlockWrapper;
 use beacon_chain::parking_lot::Mutex;
-use beacon_chain::{
-    BeaconChain, BeaconChainTypes, ExecutedBlock, GossipVerifiedBlock, NotifyExecutionLayer,
-};
+use beacon_chain::{BeaconChain, BeaconChainTypes, GossipVerifiedBlock, NotifyExecutionLayer};
 use derivative::Derivative;
 use futures::stream::{Stream, StreamExt};
 use futures::task::Poll;
@@ -85,8 +83,6 @@ mod worker;
 use crate::beacon_processor::work_reprocessing_queue::QueuedGossipBlock;
 pub use worker::{ChainSegmentProcessId, GossipAggregatePackage, GossipAttestationPackage};
 
-use self::work_reprocessing_queue::QueuedExecutedBlock;
-
 /// The maximum size of the channel for work events to the `BeaconProcessor`.
 ///
 /// Setting this too low will cause consensus messages to be dropped.
@@ -223,7 +219,6 @@ pub const GOSSIP_ATTESTATION_BATCH: &str = "gossip_attestation_batch";
 pub const GOSSIP_AGGREGATE: &str = "gossip_aggregate";
 pub const GOSSIP_AGGREGATE_BATCH: &str = "gossip_aggregate_batch";
 pub const GOSSIP_BLOCK: &str = "gossip_block";
-pub const EXECUTED_BLOCK: &str = "executed_block";
 pub const GOSSIP_BLOCK_AND_BLOBS_SIDECAR: &str = "gossip_block_and_blobs_sidecar";
 pub const DELAYED_IMPORT_BLOCK: &str = "delayed_import_block";
 pub const GOSSIP_VOLUNTARY_EXIT: &str = "gossip_voluntary_exit";
@@ -746,18 +741,6 @@ impl<T: BeaconChainTypes> std::convert::From<ReadyWork<T>> for WorkEvent<T> {
                     seen_timestamp,
                 },
             },
-            ReadyWork::ExecutedBlock(QueuedExecutedBlock {
-                peer_id,
-                block,
-                seen_timestamp,
-            }) => Self {
-                drop_during_sync: false,
-                work: Work::ExecutedBlock {
-                    peer_id,
-                    block,
-                    seen_timestamp,
-                },
-            },
             ReadyWork::RpcBlock(QueuedRpcBlock {
                 block_root,
                 block,
@@ -889,11 +872,6 @@ pub enum Work<T: BeaconChainTypes> {
         block: Box<GossipVerifiedBlock<T>>,
         seen_timestamp: Duration,
     },
-    ExecutedBlock {
-        peer_id: PeerId,
-        block: ExecutedBlock<T::EthSpec>,
-        seen_timestamp: Duration,
-    },
     GossipVoluntaryExit {
         message_id: MessageId,
         peer_id: PeerId,
@@ -990,7 +968,6 @@ impl<T: BeaconChainTypes> Work<T> {
             Work::GossipAggregate { .. } => GOSSIP_AGGREGATE,
             Work::GossipAggregateBatch { .. } => GOSSIP_AGGREGATE_BATCH,
             Work::GossipBlock { .. } => GOSSIP_BLOCK,
-            Work::ExecutedBlock { .. } => EXECUTED_BLOCK,
             Work::GossipSignedBlobSidecar { .. } => GOSSIP_BLOCK_AND_BLOBS_SIDECAR,
             Work::DelayedImportBlock { .. } => DELAYED_IMPORT_BLOCK,
             Work::GossipVoluntaryExit { .. } => GOSSIP_VOLUNTARY_EXIT,
@@ -1150,7 +1127,6 @@ impl<T: BeaconChainTypes> BeaconProcessor<T> {
             FifoQueue::new(MAX_GOSSIP_OPTIMISTIC_UPDATE_REPROCESS_QUEUE_LEN);
 
         // Using a FIFO queue since blocks need to be imported sequentially.
-        let mut executed_block_queue = FifoQueue::new(MAX_RPC_BLOCK_QUEUE_LEN);
         let mut rpc_block_queue = FifoQueue::new(MAX_RPC_BLOCK_QUEUE_LEN);
         let mut chain_segment_queue = FifoQueue::new(MAX_CHAIN_SEGMENT_QUEUE_LEN);
         let mut backfill_chain_segment = FifoQueue::new(MAX_CHAIN_SEGMENT_QUEUE_LEN);
@@ -1267,9 +1243,6 @@ impl<T: BeaconChainTypes> BeaconProcessor<T> {
                         // on the delayed ones.
                         } else if let Some(item) = delayed_block_queue.pop() {
                             self.spawn_worker(item, toolbox);
-                        // Check availability pending blocks
-                        } else if let Some(item) = executed_block_queue.pop() {
-                            self.spawn_worker(item, toolbox);
                         // Check gossip blocks before gossip attestations, since a block might be
                         // required to verify some attestations.
                         } else if let Some(item) = gossip_block_queue.pop() {
@@ -1489,9 +1462,6 @@ impl<T: BeaconChainTypes> BeaconProcessor<T> {
                             Work::GossipBlock { .. } => {
                                 gossip_block_queue.push(work, work_id, &self.log)
                             }
-                            Work::ExecutedBlock { .. } => {
-                                gossip_block_queue.push(work, work_id, &self.log)
-                            }
                             Work::GossipSignedBlobSidecar { .. } => {
                                 gossip_block_and_blobs_sidecar_queue.push(work, work_id, &self.log)
                             }
@@ -1772,20 +1742,6 @@ impl<T: BeaconChainTypes> BeaconProcessor<T> {
                     )
                     .await
             }),
-            Work::ExecutedBlock {
-                peer_id,
-                block,
-                seen_timestamp,
-            } => task_spawner.spawn_async(async move {
-                worker
-                    .process_execution_verified_block(
-                        peer_id,
-                        block,
-                        work_reprocessing_tx,
-                        seen_timestamp,
-                    )
-                    .await
-            }),
             /*
              * Verification for blobs sidecars received on gossip.
              */