Skip to content

Commit cfc5309

Browse files
jochem-brouwerScottyPoi
andauthored
Update ethereum-tests to v15.0 (#3871)
* Update eth-tests to v15.0 * Use Osaka testdata in test * Update error messages to expected * remove eip-4200 test * evm: ensure ethereum-tests/EOFTests container tests are being ran * evm: exclude eof header validation from browser tests * revert change error text * revert direct exception compare --------- Co-authored-by: ScottyPoi <[email protected]>
1 parent 58ac923 commit cfc5309

File tree

5 files changed

+8
-45
lines changed

5 files changed

+8
-45
lines changed

packages/ethereum-tests

Submodule ethereum-tests updated 613 files

packages/evm/test/eips/eip-4200.spec.ts

Lines changed: 0 additions & 40 deletions
This file was deleted.

packages/evm/test/eips/eip-5450.spec.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { hexToBytes } from '@ethereumjs/util'
22
import { assert, describe, it } from 'vitest'
33

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

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

26-
const expected = input.results.Prague.result
27-
const _exception = input.results.Prague.exception
28+
const expected = input.results.Osaka.result
29+
const _exception = input.results.Osaka.exception
2830

2931
if (expected === true) {
3032
validateEOF(code, evm)

packages/evm/test/eips/eof-header-validation.ts renamed to packages/evm/test/eips/eof-header-validation.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { getCommon } from './eof-utils.js'
1111

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

1616
async function getEVM() {
1717
const common = getCommon()

packages/evm/vitest.config.browser.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export default mergeConfig(
99
...configDefaults.exclude,
1010
// readDirSync method not provided fs mock for vite
1111
'test/precompiles/eip-2537-bls.spec.ts',
12+
'test/eips/eof-header-validation.spec.ts',
1213
],
1314
},
1415
}),

0 commit comments

Comments
 (0)