Fix async testing.

diff --git a/test/GLOBALS.mjs b/test/GLOBALS.mjs
index 410d2ae33d524fbb5ef2f6b220e44c46dcfcf42a..73872f307691e3dba861cab543a9bfdf3ce3bda4 100644 (file)
--- a/test/GLOBALS.mjs
+++ b/test/GLOBALS.mjs
@@ -57,7 +57,7 @@ export const assert = {
        notEqual: (a, b) => {
                return a !== b
        },
-       rejects: (fn, msg) => {
+       rejects: async (fn, msg) => {
                try {
                        if (!(fn instanceof Promise)) throw new Error(msg ?? 'expected async function')
                        fn.then(() => { throw new Error(msg ?? 'expected async function to reject') })
@@ -66,7 +66,7 @@ export const assert = {
                        return true
                }
        },
-       resolves: (fn, msg) => {
+       resolves: async (fn, msg) => {
                try {
                        if (!(fn instanceof Promise)) throw new Error('expected async function')
                        fn.then(() => { return true })
@@ -78,8 +78,8 @@ export const assert = {
        },
        throws: (fn, msg) => {
                try {
-                       const r = fn()
-                       if (r instanceof Promise) throw new Error('expected synchronous function')
+                       if (fn instanceof Promise) throw new Error('expected synchronous function')
+                       fn()
                        throw new Error(msg ?? `expected function to throw an exception`)
                } catch (err) {
                        return true

diff --git a/test/create-wallet.test.mjs b/test/create-wallet.test.mjs
index ec7c448515894597638987020b9fd08fa8604f74..494556c4bfee210ee894d0f96972c5712e1aebf8 100644 (file)
--- a/test/create-wallet.test.mjs
+++ b/test/create-wallet.test.mjs
@@ -35,7 +35,7 @@ test('BIP-44 replace invalid salt with empty string', async () => {
        const invalidArgs = [null, true, false, 0, 1, 2, { "foo": "bar" }]\r
        for (const arg of invalidArgs) {\r
                //@ts-expect-error\r
-               assert.resolves(Bip44Wallet.create(NANO_TEST_VECTORS.PASSWORD, arg))\r
+               await assert.resolves(Bip44Wallet.create(NANO_TEST_VECTORS.PASSWORD, arg))\r
        }\r
 })\r
 \r
@@ -50,9 +50,9 @@ test('fail when using new', () => {
 \r
 test('fail without a password', async () => {\r
        //@ts-expect-error\r
-       assert.rejects(Bip44Wallet.create())\r
+       await assert.rejects(Bip44Wallet.create())\r
        //@ts-expect-error\r
-       assert.rejects(Blake2bWallet.create())\r
+       await assert.rejects(Blake2bWallet.create())\r
 })\r
 \r
 skip('connect to ledger', async () => {\r

diff --git a/test/import-wallet.test.mjs b/test/import-wallet.test.mjs
index 1585620839fe903bc961e2d754d8968b749c1f92..707e2e6825884e577f1aece1ff20a7274c544a79 100644 (file)
--- a/test/import-wallet.test.mjs
+++ b/test/import-wallet.test.mjs
@@ -196,9 +196,9 @@ test('import wallet with test vectors test', () => {
 \r
 test('invalid wallet', async () => {\r
        test('throw when given invalid entropy', async () => {\r
-               assert.rejects(async () => await Bip44Wallet.fromEntropy(NANO_TEST_VECTORS.PASSWORD, '6CAF5A42BB8074314AAE20295975ECE663BE7AAD945A73613D193B0CC41C797'))\r
-               assert.rejects(async () => await Bip44Wallet.fromEntropy(NANO_TEST_VECTORS.PASSWORD, '6CAF5A42BB8074314AAE20295975ECE663BE7AAD945A73613D193B0CC41C79701'))\r
-               assert.rejects(async () => await Bip44Wallet.fromEntropy(NANO_TEST_VECTORS.PASSWORD, TREZOR_TEST_VECTORS.ENTROPY_0.replaceAll(/./g, 'x')))\r
+               await assert.rejects(Bip44Wallet.fromEntropy(NANO_TEST_VECTORS.PASSWORD, '6CAF5A42BB8074314AAE20295975ECE663BE7AAD945A73613D193B0CC41C797'))\r
+               await assert.rejects(Bip44Wallet.fromEntropy(NANO_TEST_VECTORS.PASSWORD, '6CAF5A42BB8074314AAE20295975ECE663BE7AAD945A73613D193B0CC41C79701'))\r
+               await assert.rejects(Bip44Wallet.fromEntropy(NANO_TEST_VECTORS.PASSWORD, TREZOR_TEST_VECTORS.ENTROPY_0.replaceAll(/./g, 'x')))\r
        })\r
 \r
        test('should throw when given a seed with an invalid length', async () => {\r