Merge remote-tracking branch 'sigp/unstable' into gloas-lookup-sync-fixes

# Conflicts:
#	beacon_node/network/src/sync/manager.rs
This commit is contained in:
dapplion
2026-05-19 03:50:37 -06:00
66 changed files with 2686 additions and 927 deletions

View File

@@ -2160,8 +2160,7 @@ async fn too_many_processing_failures(depth: usize) {
r.build_chain_and_trigger_last_block(depth).await;
// Simulate that a peer always returns empty
r.simulate(
SimulateConfig::new()
.with_process_result(|| BlockProcessingResult::Err(BlockError::BlockSlotLimitReached)),
SimulateConfig::new().with_process_result(|| BlockError::BlockSlotLimitReached.into()),
)
.await;
// We register multiple penalties, the lookup fails and sync does not progress
@@ -2229,9 +2228,10 @@ async fn test_single_block_lookup_duplicate_response() {
let mut r = TestRig::default();
r.build_chain_and_trigger_last_block(1).await;
// Send a DuplicateFullyImported response, the lookup should complete successfully
r.simulate(SimulateConfig::new().with_process_result(|| {
BlockProcessingResult::Err(BlockError::DuplicateFullyImported(Hash256::ZERO))
}))
r.simulate(
SimulateConfig::new()
.with_process_result(|| BlockError::DuplicateFullyImported(Hash256::ZERO).into()),
)
.await;
// The block was not actually imported
r.assert_head_slot(0);