Skip to content

Update ethereum-tests to v15.0 #3871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jochem-brouwer merged 9 commits into from
Feb 21, 2025
Merged

Update ethereum-tests to v15.0 #3871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ba9b874
Update eth-tests to v15.0
jochem-brouwer Feb 14, 2025
e706027
Use Osaka testdata in test
Feb 17, 2025
36712ff
Update error messages to expected
Feb 17, 2025
792ae4a
remove eip-4200 test
Feb 17, 2025
8ec0a7c
evm: ensure ethereum-tests/EOFTests container tests are being ran
jochem-brouwer Feb 17, 2025
4d37543
evm: exclude eof header validation from browser tests
Feb 18, 2025
6df27dd
revert change error text
Feb 18, 2025
ca2190f
revert direct exception compare
Feb 18, 2025
73cd8dc
Merge branch 'master' into tests-v15
jochem-brouwer Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ethereum-tests
Open in desktop
Submodule ethereum-tests updated 613 files
40 changes: 0 additions & 40 deletions packages/evm/test/eips/eip-4200.spec.ts
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions packages/evm/test/eips/eip-5450.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { hexToBytes } from '@ethereumjs/util'
import { assert, describe, it } from 'vitest'

import { default as testData } from '../../../ethereum-tests/EOFTests/EIP5450/validInvalid.json'
import { default as testData } from '../../../ethereum-tests/EOFTests/EIP5450/validInvalid.json' assert {
type: 'json',
}
import { validateEOF } from '../../src/eof/container.js'
import { createEVM } from '../../src/index.js'

Expand All @@ -23,8 +25,8 @@ describe('EIP 5450 tests', async () => {
const input = testData.validInvalid.vectors[key]
const code = hexToBytes(input.code)

const expected = input.results.Prague.result
const _exception = input.results.Prague.exception
const expected = input.results.Osaka.result
const _exception = input.results.Osaka.exception

if (expected === true) {
validateEOF(code, evm)
Expand Down
2 changes: 1 addition & 1 deletion ...es/evm/test/eips/eof-header-validation.ts → ...m/test/eips/eof-header-validation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { getCommon } from './eof-utils.js'

// Rename this test dir to the location of EOF header tests
// To test, use `npx vitest run ./scripts/eof-header-validation.spec.ts
const testDir = path.resolve('../ethereum-tests/EOFStuff/fixtures/eof_tests')
const testDir = path.resolve('../ethereum-tests/EOFTests')

@jochem-brouwer jochem-brouwer Feb 18, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah right this file should be disabled for browser tests


async function getEVM() {
const common = getCommon()
Expand Down
1 change: 1 addition & 0 deletions packages/evm/vitest.config.browser.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export default mergeConfig(
...configDefaults.exclude,
// readDirSync method not provided fs mock for vite
'test/precompiles/eip-2537-bls.spec.ts',
'test/eips/eof-header-validation.spec.ts',
],
},
}),
Expand Down