Commit fb7e623
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
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1909 | 1909 | | |
1910 | 1910 | | |
1911 | 1911 | | |
| 1912 | + | |
1912 | 1913 | | |
1913 | 1914 | | |
1914 | 1915 | | |
| |||
0 commit comments