Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
spencer-tb committed Aug 8, 2024
2 parents 06a123d + 1376f8c commit 81dbe1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Test fixtures for use by clients are available for each release on the [Github r
- ✨ A metadata folder `.meta/` now stores all fixture metadata files by default ([#721](https://github.com/ethereum/execution-spec-tests/pull/721)).
- 🐞 Fixed `fill` command index generation issue due to concurrency ([#725](https://github.com/ethereum/execution-spec-tests/pull/725)).
- 🐞 Fixed fixture index generation on EOF tests ([#728](https://github.com/ethereum/execution-spec-tests/pull/728)).
- 🐞 Fixes consume genesis mismatch exception for hive based simulators ([#734](https://github.com/ethereum/execution-spec-tests/pull/734)).

### 🔧 EVM Tools

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Each `engine_newPayloadVX` is verified against the appropriate VALID/INVALID responses.
"""

from ethereum_test_fixtures import BlockchainEngineFixture, FixtureFormats
from ethereum_test_fixtures.blockchain import FixtureHeader
from ethereum_test_tools.rpc import EngineRPC, EthRPC
from ethereum_test_tools.rpc.types import ForkchoiceState, PayloadStatusEnum
from pytest_plugins.consume.hive_simulators.exceptions import GenesisBlockMismatchException
Expand Down Expand Up @@ -45,7 +45,7 @@ def test_via_engine(
if genesis_block["hash"] != str(blockchain_fixture.genesis.block_hash):
raise GenesisBlockMismatchException(
expected_header=blockchain_fixture.genesis,
got_header=FixtureHeader(**genesis_block),
got_genesis_block=genesis_block,
)

with timing_data.time("Payloads execution") as total_payload_timing:
Expand Down

0 comments on commit 81dbe1b

Please sign in to comment.