test: fix ecmul_0-3_5616_28000_96 (ethereumjs#473)

s1na · web-flow · commit 664369c765c5 · 2019-03-13T14:45:15.000+01:00
diff --git a/tests/GeneralStateTestsRunner.js b/tests/GeneralStateTestsRunner.js
@@ -2,6 +2,7 @@ const async = require('async')
 const testUtil = require('./util')
 const Trie = require('merkle-patricia-tree/secure')
 const ethUtil = require('ethereumjs-util')
+const Account = require('ethereumjs-account')
 const BN = ethUtil.BN
 const { getRequiredForkConfigAlias } = require('./util')
 
@@ -100,8 +101,31 @@ function runTestCase (options, testData, t, cb) {
           tx: tx,
           block: block
         }, function (err, r) {
-          err = null
-          done()
+          // If tx is invalid and coinbase is empty, the test harness
+          // expects the coinbase account to be deleted from state.
+          // Without this ecmul_0-3_5616_28000_96 would fail.
+          if (err) {
+            vm.stateManager.getAccount(block.header.coinbase, function (err, account) {
+              if (err) {
+                done()
+                return
+              }
+              if (new BN(account.balance).isZero()) {
+                async.series([
+                  (cb) => vm.stateManager.putAccount(block.header.coinbase, new Account(), cb),
+                  (cb) => vm.stateManager.cleanupTouchedAccounts(cb),
+                  (cb) => vm.stateManager._cache.flush(cb)
+                ], (err) => {
+                  err = null
+                  done()
+                })
+              } else {
+                done()
+              }
+            })
+          } else {
+            done()
+          }
         })
       } else {
         done()
diff --git a/tests/tester.js b/tests/tester.js
@@ -9,7 +9,6 @@ const {
 } = require('./util')
 // tests which should be fixed
 const skipBroken = [
-  'ecmul_0-3_5616_28000_96', // temporary till fixed (2018-09-20)
   'dynamicAccountOverwriteEmpty' // temporary till fixed (2019-01-30), skipped along constantinopleFix work time constraints
 ]
 // tests skipped due to system specifics / design considerations

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ const {`
`9`	`9`	`} = require('./util')`
`10`	`10`	`// tests which should be fixed`
`11`	`11`	`const skipBroken = [`
`12`		`- 'ecmul_0-3_5616_28000_96', // temporary till fixed (2018-09-20)`
`13`	`12`	`'dynamicAccountOverwriteEmpty' // temporary till fixed (2019-01-30), skipped along constantinopleFix work time constraints`
`14`	`13`	`]`
`15`	`14`	`// tests skipped due to system specifics / design considerations`