gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-20 22:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-03-31 11:04:23 -07:00
parent 09e9a54314 037b263f17
commit 1eefef610e
62 changed files with 2272 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/beacon_processor/src/lib.rs
View File

@@ -424,7 +424,11 @@ pub enum Work<E: EthSpec> {
IgnoredRpcBlock {
process_fn: BlockingFn,
},
ChainSegment(AsyncFn),
ChainSegment {
process_fn: AsyncFn,
/// (chain_id, batch_epoch) for test observability
process_id: (u32, u64),
},
ChainSegmentBackfill(BlockingFn),
Status(BlockingFn),
BlocksByRangeRequest(AsyncFn),
@@ -1482,7 +1486,7 @@ impl<E: EthSpec> BeaconProcessor<E> {
} => task_spawner.spawn_blocking(move || {
process_batch(aggregates);
}),
Work::ChainSegment(process_fn) => task_spawner.spawn_async(async move {
Work::ChainSegment { process_fn, .. } => task_spawner.spawn_async(async move {
process_fn.await;
}),
Work::UnknownBlockAttestation { process_fn }