misc. fixes

ethereumjs · Aug 9, 2021 · 23a07b6 · 23a07b6
1 parent 666d223
commit 23a07b6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json
@@ -1,8 +1,6 @@
 {
   "extends": "../../config/tsconfig.json",
   "compilerOptions": {
-    "rootDir": "./src",
-    "composite": true
   },
   "include": ["src/**/*.ts", "src/**/*.json", "tests/*.ts", "tests/*.json"],
   "references": [{ "path": "../util/tsconfig.prod.json" }]

diff --git a/packages/vm/karma.conf.js b/packages/vm/karma.conf.js
@@ -8,7 +8,12 @@ module.exports = function (config) {
     frameworks: ['karma-typescript', 'tap'],
 
     // list of files / patterns to load in the browser
-    files: ['./tests/**/*.ts', './src/**/*.ts'],
+    files: [
+      './src/**/*.ts',
+      './tests/api/**/*.ts',
+      './tests/util.ts',
+      './tests/testLoader.ts',
+    ],
 
     // list of files / patterns to exclude
     exclude: [],

diff --git a/packages/vm/tests/tester.ts b/packages/vm/tests/tester.ts
@@ -159,7 +159,7 @@ async function runTests() {
 
       const dirs = config.getTestDirs(FORK_CONFIG_VM, name)
       for (const dir of dirs) {
-        await new Promise((resolve, reject) => {
+        await new Promise<void>((resolve, reject) => {
           testLoader
             .getTestsFromArgs(
               dir,

diff --git a/packages/vm/tests/util.ts b/packages/vm/tests/util.ts
@@ -122,7 +122,7 @@ export function makeTx(txData: any, opts?: TxOptions) {
 }
 
 export async function verifyPostConditions(state: any, testData: any, t: tape.Test) {
-  return new Promise((resolve) => {
+  return new Promise<void>((resolve) => {
     const hashedAccounts: any = {}
     const keyMap: any = {}
 
@@ -178,7 +178,7 @@ export function verifyAccountPostConditions(
   acctData: any,
   t: tape.Test
 ) {
-  return new Promise((resolve) => {
+  return new Promise<void>((resolve) => {
     t.comment('Account: ' + address)
     t.ok(format(account.balance, true).equals(format(acctData.balance, true)), 'correct balance')
     t.ok(format(account.nonce, true).equals(format(acctData.nonce, true)), 'correct nonce')