Skip to content

Commit

Permalink
simulators/ethereum/pyspec: Use latest EEST fixture release. (#985)
Browse files Browse the repository at this point in the history
* simulators/ethereum/pyspec: Update dockerfile tests release structure.

* simulators/ethereum/pyspec: Tweak to adhere to fixture format change.
  • Loading branch information
spencer-tb authored Feb 5, 2024
1 parent fcfdd50 commit 58354ff
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions simulators/ethereum/pyspec/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ COPY --from=builder /source/pyspec/pyspec .
# To run locally generated fixtures, comment the following RUN lines and
# uncomment the ADD line.
# Download the latest fixture release.
RUN wget https://github.com/ethereum/execution-spec-tests/releases/latest/download/fixtures_develop_hive.tar.gz
RUN tar -xzvf fixtures_develop_hive.tar.gz
RUN mv fixtures /fixtures
RUN wget https://github.com/ethereum/execution-spec-tests/releases/latest/download/fixtures_develop.tar.gz
RUN tar -xzvf fixtures_develop.tar.gz
RUN mv fixtures/blockchain_tests_hive /fixtures

# ADD ./pyspec/fixtures /fixtures

Expand Down
2 changes: 1 addition & 1 deletion simulators/ethereum/pyspec/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (tc *testcase) run(t *hivesim.T) {
}
// set expected payload return status
expectedStatus := "VALID"
if !engineNewPayload.Valid {
if engineNewPayload.ValidationError != nil {
expectedStatus = "INVALID"
}
// check payload status matches expected
Expand Down
2 changes: 1 addition & 1 deletion simulators/ethereum/pyspec/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ type engineNewPayload struct {
BlobVersionedHashes []common.Hash `json:"expectedBlobVersionedHashes"`
ParentBeaconBlockRoot *common.Hash `json:"parentBeaconBlockRoot"`
Version math.HexOrDecimal64 `json:"version"`
Valid bool `json:"valid"`
ValidationError *string `json:"validationError"`
ErrorCode int64 `json:"errorCode,string"`

HiveExecutionPayload *typ.ExecutableData
Expand Down

0 comments on commit 58354ff

Please sign in to comment.