Merge remote-tracking branch 'upstream/unstable'

This commit is contained in:
Mark Mackey
2024-05-24 13:24:37 +02:00
103 changed files with 2154 additions and 1595 deletions

View File

@@ -702,6 +702,7 @@ async fn invalidates_all_descendants() {
fork_block.canonical_root(),
fork_block,
NotifyExecutionLayer::Yes,
BlockImportSource::Lookup,
|| Ok(()),
)
.await
@@ -802,6 +803,7 @@ async fn switches_heads() {
fork_block.canonical_root(),
fork_block,
NotifyExecutionLayer::Yes,
BlockImportSource::Lookup,
|| Ok(()),
)
.await
@@ -1061,7 +1063,7 @@ async fn invalid_parent() {
// Ensure the block built atop an invalid payload is invalid for import.
assert!(matches!(
rig.harness.chain.process_block(block.canonical_root(), block.clone(), NotifyExecutionLayer::Yes,
rig.harness.chain.process_block(block.canonical_root(), block.clone(), NotifyExecutionLayer::Yes, BlockImportSource::Lookup,
|| Ok(()),
).await,
Err(BlockError::ParentExecutionPayloadInvalid { parent_root: invalid_root })
@@ -1357,6 +1359,7 @@ async fn build_optimistic_chain(
block.canonical_root(),
block,
NotifyExecutionLayer::Yes,
BlockImportSource::Lookup,
|| Ok(()),
)
.await
@@ -1931,6 +1934,7 @@ async fn recover_from_invalid_head_by_importing_blocks() {
fork_block.canonical_root(),
fork_block.clone(),
NotifyExecutionLayer::Yes,
BlockImportSource::Lookup,
|| Ok(()),
)
.await