vm: fix tests

Author: jochem-brouwer

packages/vm/test/api/EIPs/eip-3855.spec.ts

@@ -1,5 +1,5 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
-import { EVMErrorMessage } from '@ethereumjs/evm'
+import { EVMErrorCode } from '@ethereumjs/evm'
 import { hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
@@ -65,7 +65,7 @@ describe('EIP 3855 tests', () => {
       gasLimit: BigInt(10000),
     })
 
-    assert.equal(result.exceptionError?.error, EVMErrorMessage.STACK_OVERFLOW)
+    assert.equal(result.exceptionError?.type.code, EVMErrorCode.STACK_OVERFLOW)
   })
 
   it('push0 is not available if EIP3855 is not activated', async () => {
@@ -76,6 +76,6 @@ describe('EIP 3855 tests', () => {
       gasLimit: BigInt(10000),
     })
 
-    assert.equal(result.exceptionError!.error, EVMErrorMessage.INVALID_OPCODE)
+    assert.equal(result.exceptionError!.type.code, EVMErrorCode.INVALID_OPCODE)
   })
 })

packages/vm/test/api/EIPs/eip-3860.spec.ts

@@ -40,7 +40,7 @@ describe('EIP 3860 tests', () => {
     ).sign(pkey)
     const result = await runTx(vm, { tx })
     assert.ok(
-      (result.execResult.exceptionError?.error as string) === 'initcode exceeds max initcode size',
+      result.execResult.exceptionError?.type.code === 'initcode exceeds max initcode size',
       'initcode exceeds max size',
     )
   })

packages/vm/test/api/istanbul/eip-1344.spec.ts

@@ -1,13 +1,13 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
-import { EVMErrorMessage } from '@ethereumjs/evm'
+import { EVMErrorCode } from '@ethereumjs/evm'
 import { bytesToBigInt, hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
 import { createVM } from '../../../src/index.js'
 
 const testCases = [
   { chain: Mainnet, hardfork: Hardfork.Istanbul, chainId: BigInt(1) },
-  { chain: Mainnet, hardfork: Hardfork.Constantinople, err: EVMErrorMessage.INVALID_OPCODE },
+  { chain: Mainnet, hardfork: Hardfork.Constantinople, err: EVMErrorCode.INVALID_OPCODE },
 ]
 
 // CHAINID PUSH8 0x00 MSTORE8 PUSH8 0x01 PUSH8 0x00 RETURN
@@ -27,7 +27,7 @@ describe('Istanbul: EIP-1344', () => {
       try {
         const res = await vm.evm.runCode!(runCodeArgs)
         if (testCase.err !== undefined) {
-          assert.equal(res.exceptionError?.error, testCase.err)
+          assert.equal(res.exceptionError?.type.code, testCase.err)
         } else {
           assert.ok(res.exceptionError === undefined)
           assert.equal(testCase.chainId, bytesToBigInt(res.returnValue))

packages/vm/test/api/istanbul/eip-1884.spec.ts

@@ -1,5 +1,5 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
-import { EVMErrorMessage } from '@ethereumjs/evm'
+import { EVMErrorCode } from '@ethereumjs/evm'
 import { Address, bytesToBigInt, hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
@@ -8,7 +8,7 @@ import { createAccountWithDefaults } from '../utils.js'
 
 const testCases = [
   { chain: Mainnet, hardfork: Hardfork.Istanbul, selfbalance: '0xf1' },
-  { chain: Mainnet, hardfork: Hardfork.Constantinople, err: EVMErrorMessage.INVALID_OPCODE },
+  { chain: Mainnet, hardfork: Hardfork.Constantinople, err: EVMErrorCode.INVALID_OPCODE },
 ]
 
 // SELFBALANCE PUSH8 0x00 MSTORE8 PUSH8 0x01 PUSH8 0x00 RETURN
@@ -35,7 +35,7 @@ describe('Istanbul: EIP-1884', () => {
       try {
         const res = await vm.evm.runCode!(runCodeArgs)
         if (testCase.err !== undefined) {
-          assert.equal(res.exceptionError?.error, testCase.err)
+          assert.equal(res.exceptionError?.type.code, testCase.err)
         } else {
           assert.ok(res.exceptionError === undefined)
           assert.ok(BigInt(testCase.selfbalance!) === bytesToBigInt(res.returnValue))

packages/vm/test/api/runTx.spec.ts

@@ -492,7 +492,7 @@ describe('runTx() -> runtime errors', () => {
       const res = await runTx(vm, { tx })
 
       assert.equal(
-        res.execResult!.exceptionError!.error,
+        res.execResult!.exceptionError!.type.code,
         'value overflow',
         `result should have 'value overflow' error set (${txType.name})`,
       )
@@ -520,7 +520,7 @@ describe('runTx() -> runtime errors', () => {
       const res = await runTx(vm, { tx })
 
       assert.equal(
-        res.execResult!.exceptionError!.error,
+        res.execResult!.exceptionError!.type.code,
         'value overflow',
         `result should have 'value overflow' error set (${txType.name})`,
       )