Update tests to cover petersburg hardfork

ethereumjs · Feb 1, 2019 · 270ff43 · 270ff43
1 parent 0e77f8a
commit 270ff43
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
     "testVM": "node ./tests/tester -v",
     "testStateByzantium": "npm run build:dist && node ./tests/tester -s --fork='Byzantium' --dist",
     "testStateConstantinople": "npm run build:dist && node ./tests/tester -s --fork='Constantinople' --dist",
+    "testStatePetersburg": "npm run build:dist && node ./tests/tester -s --fork='Petersburg' --dist",
     "testBuildIntegrity": "npm run build:dist && node ./tests/tester -s --dist --test='stackOverflow'",
     "testBlockchain": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --fork='Constantinople' --dist --excludeDir='GeneralStateTests'",
     "testBlockchainGeneralStateTests": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --dir='GeneralStateTests'",

diff --git a/tests/GeneralStateTestsRunner.js b/tests/GeneralStateTestsRunner.js
@@ -126,7 +126,11 @@ function runTestCase (options, testData, t, cb) {
 
 module.exports = function runStateTest (options, testData, t, cb) {
   try {
-    const testCases = parseTestCases(options.forkConfig, testData, options.data, options.gasLimit, options.value)
+    let aliasForkConfig
+    if (options.forkConfig === 'Petersburg') {
+      aliasForkConfig = 'ConstantinopleFix'
+    }
+    const testCases = parseTestCases(aliasForkConfig || options.forkConfig, testData, options.data, options.gasLimit, options.value)
     if (testCases.length > 0) {
       async.eachSeries(testCases,
                       (testCase, done) => runTestCase(options, testCase, t, done),

diff --git a/tests/tester.js b/tests/tester.js
@@ -178,7 +178,7 @@ function runTests (name, runnerArgs, cb) {
   testGetterArgs.skipTests = getSkipTests(argv.skip, argv.runSkipped ? 'NONE' : 'ALL')
   testGetterArgs.runSkipped = getSkipTests(argv.runSkipped, 'NONE')
   testGetterArgs.skipVM = skipVM
-  testGetterArgs.forkConfig = FORK_CONFIG
+  testGetterArgs.forkConfig = FORK_CONFIG === 'Petersburg' ? 'ConstantinopleFix' : FORK_CONFIG
   testGetterArgs.file = argv.file
   testGetterArgs.test = argv.test
   testGetterArgs.dir = argv.dir