Make handling of petersburg fork names case agnostic and abstract fork alias handling logic in tests.

Author: danjm

tests/GeneralStateTestsRunner.js

@@ -3,6 +3,7 @@ const testUtil = require('./util')
 const Trie = require('merkle-patricia-tree/secure')
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
+const { getRequiredForkConfigAlias } = require('./util')
 
 function parseTestCases (forkConfig, testData, data, gasLimit, value) {
   let testCases = []
@@ -125,22 +126,19 @@ function runTestCase (options, testData, t, cb) {
 }
 
 module.exports = function runStateTest (options, testData, t, cb) {
+  const forkConfig = getRequiredForkConfigAlias(options.forkConfig)
   try {
-    let aliasForkConfig
-    if (options.forkConfig === 'Petersburg') {
-      aliasForkConfig = 'ConstantinopleFix'
-    }
-    const testCases = parseTestCases(aliasForkConfig || options.forkConfig, testData, options.data, options.gasLimit, options.value)
+    const testCases = parseTestCases(forkConfig, testData, options.data, options.gasLimit, options.value)
     if (testCases.length > 0) {
       async.eachSeries(testCases,
                       (testCase, done) => runTestCase(options, testCase, t, done),
                       cb)
     } else {
-      t.comment(`No ${options.forkConfig} post state defined, skip test`)
+      t.comment(`No ${forkConfig} post state defined, skip test`)
       cb()
     }
   } catch (e) {
-    t.fail('error running test case for fork: ' + options.forkConfig)
+    t.fail('error running test case for fork: ' + forkConfig)
     console.log('error:', e)
     cb()
   }

tests/tester.js

@@ -4,7 +4,9 @@ const argv = require('minimist')(process.argv.slice(2))
 const async = require('async')
 const tape = require('tape')
 const testing = require('ethereumjs-testing')
-const FORK_CONFIG = argv.fork || 'Byzantium'
+const {
+  getRequiredForkConfigAlias
+} = require('./util')
 // tests which should be fixed
 const skipBroken = [
   'ExtCodeCopyTargetRangeLongerThanCodeTests', // temporary till fixed (2018-11-14)
@@ -178,7 +180,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 === 'Petersburg' ? 'ConstantinopleFix' : FORK_CONFIG
+  testGetterArgs.forkConfig = getRequiredForkConfigAlias(FORK_CONFIG)
   testGetterArgs.file = argv.file
   testGetterArgs.test = argv.test
   testGetterArgs.dir = argv.dir

tests/util.js

@@ -393,3 +393,15 @@ exports.setupPreConditions = function (state, testData, done) {
     ], callback)
   }, done)
 }
+
+/**
+ * Returns an alias for specified hardforks to meet test dependencies requirements/assumptions.
+ * @param {String} forkConfig - the name of the hardfork for which an alias should be returned
+ * @returns {String} Either an alias of the forkConfig param, or the forkConfig param itself
+ */
+exports.getRequiredForkConfigAlias = function (forkConfig) {
+  if (String(forkConfig).match(/^petersburg$/i)) {
+    return 'ConstantinopleFix'
+  }
+  return forkConfig
+}