Skip to content

Commit fb7e623

Browse files
committed
Carry the execution payload through main's new fork-choice-vote test helper
Merging main brought in #552's `signed_block` test helper, written against a `BlockBody` that has no `execution_payload`. This branch adds that field, so the branch compiled and main compiled but their merge did not — a semantic conflict with no textual conflict, which is why git reported the PR mergeable and only the merge-commit build caught it. The helper builds blocks for fork-choice tests that never reach the execution layer, so the default all-zero payload is the right value.
1 parent 8b72f8d commit fb7e623

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

crates/storage/src/store.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,6 +1909,7 @@ mod tests {
19091909
state_root: H256::ZERO,
19101910
body: BlockBody {
19111911
attestations: attestations.try_into().unwrap(),
1912+
execution_payload: Default::default(),
19121913
},
19131914
},
19141915
proof: MultiMessageAggregate::default(),

0 commit comments

Comments
 (0)