Skip to content

Commit 27d6433

Browse files
authored
Merge pull request #1116 from ethereumjs/update-ethereum-tests
VM: Update Ethereum/tests Submodule
2 parents e1ffc7f + 6325042 commit 27d6433

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

packages/ethereum-tests

Submodule ethereum-tests updated 10878 files

packages/vm/developer.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
### Running Tests
66

7-
Tests can be found in the `tests` directory. There are test runners for [State tests](http://www.ethdocs.org/en/latest/contracts-and-transactions/ethereum-tests/state_tests/index.html) and [Blockchain tests](http://www.ethdocs.org/en/latest/contracts-and-transactions/ethereum-tests/blockchain_tests/index.html). VM tests are disabled since Frontier gas costs are not supported any more. Tests are then executed by the [ethereumjs-testing](https://github.com/ethereumjs/ethereumjs-testing) utility library using the official client-independent [Ethereum tests](https://github.com/ethereum/tests).
7+
Tests can be found in the `tests` directory. There are test runners for [State tests](http://www.ethdocs.org/en/latest/contracts-and-transactions/ethereum-tests/state_tests/index.html) and [Blockchain tests](http://www.ethdocs.org/en/latest/contracts-and-transactions/ethereum-tests/blockchain_tests/index.html). VM tests are disabled since Frontier gas costs are not supported any more.
8+
9+
Tests are then executed against a snapshot of the official client-independent [Ethereum tests](https://github.com/ethereum/tests) integrated in the monorepo as a submodule in [packages/ethereum-tests](./../ethereum-tests/) pointing towards a specific commit or tag from the `ethereum/tests` `develop` branch.
810

911
For a wider picture about how to use tests to implement EIPs you can have a look at this [Reddit post](https://www.reddit.com/r/ethereum/comments/6kc5g3/ethereumjs_team_is_seeking_contributors/)
1012
or the associated YouTube video introduction to [Core Development with Ethereumjs-vm](https://www.youtube.com/watch?v=L0BVDl6HZzk).

packages/vm/tests/BlockchainTestsRunner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default async function runBlockchainTest(options: any, testData: any, t:
3232
// Only run with block validation when sealEngine present in test file
3333
// and being set to Ethash PoW validation
3434
if (testData.sealEngine && testData.sealEngine === 'Ethash') {
35-
if (common.consensusType() !== 'ethash') {
35+
if (common.consensusAlgorithm() !== 'ethash') {
3636
t.skip('SealEngine setting is not matching chain consensus type, skip test.')
3737
}
3838
validatePow = true

packages/vm/tests/config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ export function getCommon(network: string) {
322322
const expectedTestsFull: any = {
323323
BlockchainTests: {
324324
Chainstart: 4385,
325-
Homestead: 6997,
325+
Homestead: 7004,
326326
Dao: 0,
327327
TangerineWhistle: 4255,
328328
SpuriousDragon: 4305,
@@ -347,8 +347,8 @@ const expectedTestsFull: any = {
347347
Byzantium: 4754,
348348
Constantinople: 10530,
349349
Petersburg: 10525,
350-
Istanbul: 10759,
351-
MuirGlacier: 10759,
350+
Istanbul: 10715,
351+
MuirGlacier: 10715,
352352
Berlin: 1414,
353353
ByzantiumToConstantinopleFixAt5: 0,
354354
EIP158ToByzantiumAt5: 0,

0 commit comments

Comments
 (0)