correctly respond without skips on first range response

This commit is contained in:
realbigsean 2022-12-19 19:07:21 -05:00
parent eddfb50c58
commit 7d5db8015d
No known key found for this signature in database
GPG Key ID: B372B64D866BF8CC

View File

@ -433,7 +433,17 @@ impl<T: BeaconChainTypes> Worker<T> {
};
// Pick out the required blocks, ignoring skip-slots.
let mut last_block_root = None;
let mut last_block_root = req
.start_slot
.checked_sub(0)
.map(|prev_slot| {
self.chain
.block_root_at_slot(Slot::new(prev_slot), WhenSlotSkipped::Prev)
})
.transpose()
.ok()
.flatten()
.flatten();
let maybe_block_roots = process_results(forwards_block_root_iter, |iter| {
iter.take_while(|(_, slot)| slot.as_u64() < req.start_slot.saturating_add(req.count))
// map skip slots to None
@ -602,7 +612,17 @@ impl<T: BeaconChainTypes> Worker<T> {
};
// Pick out the required blocks, ignoring skip-slots.
let mut last_block_root = None;
let mut last_block_root = req
.start_slot
.checked_sub(0)
.map(|prev_slot| {
self.chain
.block_root_at_slot(Slot::new(prev_slot), WhenSlotSkipped::Prev)
})
.transpose()
.ok()
.flatten()
.flatten();
let maybe_block_roots = process_results(forwards_block_root_iter, |iter| {
iter.take_while(|(_, slot)| slot.as_u64() < req.start_slot.saturating_add(req.count))
// map skip slots to None