mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-30 20:57:10 +00:00
Clean up
This commit is contained in:
@@ -306,7 +306,7 @@ impl<E: EthSpec> From<ReadyWork> for WorkEvent<E> {
|
||||
}
|
||||
ReadyWork::DataColumn(QueuedGossipDataColumn { process_fn, .. }) => Self {
|
||||
drop_during_sync: true,
|
||||
work: Work::UnknownBlockAttestation { process_fn },
|
||||
work: Work::UnknownBlockDataColumn { process_fn },
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -373,6 +373,9 @@ pub enum Work<E: EthSpec> {
|
||||
UnknownBlockAttestation {
|
||||
process_fn: BlockingFn,
|
||||
},
|
||||
UnknownBlockDataColumn {
|
||||
process_fn: BlockingFn,
|
||||
},
|
||||
GossipAttestationBatch {
|
||||
attestations: GossipAttestationBatch,
|
||||
process_batch: Box<dyn FnOnce(GossipAttestationBatch) + Send + Sync>,
|
||||
@@ -469,6 +472,7 @@ pub enum WorkType {
|
||||
GossipAttestation,
|
||||
GossipAttestationToConvert,
|
||||
UnknownBlockAttestation,
|
||||
UnknownBlockDataColumn,
|
||||
GossipAttestationBatch,
|
||||
GossipAggregate,
|
||||
UnknownBlockAggregate,
|
||||
@@ -576,6 +580,7 @@ impl<E: EthSpec> Work<E> {
|
||||
Work::LightClientFinalityUpdateRequest(_) => WorkType::LightClientFinalityUpdateRequest,
|
||||
Work::LightClientUpdatesByRangeRequest(_) => WorkType::LightClientUpdatesByRangeRequest,
|
||||
Work::UnknownBlockAttestation { .. } => WorkType::UnknownBlockAttestation,
|
||||
Work::UnknownBlockDataColumn { .. } => WorkType::UnknownBlockDataColumn,
|
||||
Work::UnknownBlockAggregate { .. } => WorkType::UnknownBlockAggregate,
|
||||
Work::UnknownLightClientOptimisticUpdate { .. } => {
|
||||
WorkType::UnknownLightClientOptimisticUpdate
|
||||
@@ -990,6 +995,9 @@ impl<E: EthSpec> BeaconProcessor<E> {
|
||||
} else if let Some(item) = work_queues.unknown_block_aggregate_queue.pop() {
|
||||
Some(item)
|
||||
} else if let Some(item) = work_queues.unknown_block_attestation_queue.pop()
|
||||
{
|
||||
Some(item)
|
||||
} else if let Some(item) = work_queues.unknown_block_data_column_queue.pop()
|
||||
{
|
||||
Some(item)
|
||||
// Check execution payload bids. Most proposers will request bids directly from builders
|
||||
@@ -1250,6 +1258,9 @@ impl<E: EthSpec> BeaconProcessor<E> {
|
||||
Work::UnknownBlockAttestation { .. } => {
|
||||
work_queues.unknown_block_attestation_queue.push(work)
|
||||
}
|
||||
Work::UnknownBlockDataColumn { .. } => work_queues
|
||||
.unknown_block_data_column_queue
|
||||
.push(work, work_id),
|
||||
Work::UnknownBlockAggregate { .. } => {
|
||||
work_queues.unknown_block_aggregate_queue.push(work)
|
||||
}
|
||||
@@ -1300,6 +1311,9 @@ impl<E: EthSpec> BeaconProcessor<E> {
|
||||
WorkType::UnknownBlockAttestation => {
|
||||
work_queues.unknown_block_attestation_queue.len()
|
||||
}
|
||||
WorkType::UnknownBlockDataColumn => {
|
||||
work_queues.unknown_block_data_column_queue.len()
|
||||
}
|
||||
WorkType::GossipAttestationBatch => 0, // No queue
|
||||
WorkType::GossipAggregate => work_queues.aggregate_queue.len(),
|
||||
WorkType::UnknownBlockAggregate => {
|
||||
@@ -1517,6 +1531,7 @@ impl<E: EthSpec> BeaconProcessor<E> {
|
||||
}),
|
||||
Work::UnknownBlockAttestation { process_fn }
|
||||
| Work::UnknownBlockAggregate { process_fn }
|
||||
| Work::UnknownBlockDataColumn { process_fn }
|
||||
| Work::UnknownLightClientOptimisticUpdate { process_fn, .. } => {
|
||||
task_spawner.spawn_blocking(process_fn)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user