Update rejection tests and convert signing tests to synchronous.

diff --git a/test/test.blocks.mjs b/test/test.blocks.mjs
index 62e2d514e0f6cad49641bed86a03e1278ebcd67b..6395db6f869b908c434cea3af905dedbd20781fc 100644 (file)
--- a/test/test.blocks.mjs
+++ b/test/test.blocks.mjs
@@ -206,14 +206,14 @@ await Promise.all([
                                .pow(OPEN_BLOCK.work)\r
 \r
                        //@ts-expect-error\r
-                       await assert.rejects(block.sign())\r
+                       assert.throws(block.sign())\r
                        assert.nullish(block.signature)\r
                        //@ts-expect-error\r
-                       await assert.rejects(block.sign(null))\r
+                       assert.throws(block.sign(null))\r
                        assert.nullish(block.signature)\r
-                       await assert.rejects(block.sign('1'))\r
+                       assert.throws(block.sign('1'))\r
                        assert.nullish(block.signature)\r
-                       await assert.rejects(block.sign('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'))\r
+                       assert.throws(block.sign('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'))\r
                        assert.nullish(block.signature)\r
                })\r
        })\r

diff --git a/test/test.lock-unlock.mjs b/test/test.lock-unlock.mjs
index 0a8ee3ec48f20efa52740ff99c3f9077534fd3ac..873d9564f4d68ea26d6994d3ac53d9c89e4d59cf 100644 (file)
--- a/test/test.lock-unlock.mjs
+++ b/test/test.lock-unlock.mjs
@@ -69,7 +69,7 @@ await Promise.all([
                        assert.ok(wallet.mnemonic === undefined)\r
                        assert.ok(wallet.seed === undefined)\r
 \r
-                       await assert.rejects(wallet.unlock(TREZOR_TEST_VECTORS.PASSWORD), { message: 'Failed to unlock wallet' })\r
+                       await assert.rejects(wallet.unlock(TREZOR_TEST_VECTORS.PASSWORD), 'Failed to unlock wallet')\r
                        assert.ok('mnemonic' in wallet)\r
                        assert.ok('seed' in wallet)\r
                        assert.ok(wallet.mnemonic === undefined)\r
@@ -84,9 +84,9 @@ await Promise.all([
                        const wallet = await Wallet.load('BIP-44', NANO_TEST_VECTORS.PASSWORD, NANO_TEST_VECTORS.MNEMONIC, NANO_TEST_VECTORS.PASSWORD)\r
                        await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)\r
 \r
-                       await assert.rejects(wallet.unlock(), { message: 'Failed to unlock wallet' })\r
+                       await assert.rejects(wallet.unlock(), 'Failed to unlock wallet')\r
                        //@ts-expect-error\r
-                       await assert.rejects(wallet.unlock(1), { message: 'Failed to unlock wallet' })\r
+                       await assert.rejects(wallet.unlock(1), 'Failed to unlock wallet')\r
 \r
                        await assert.resolves(wallet.destroy())\r
                })\r
@@ -110,7 +110,7 @@ await Promise.all([
                await test('fail to unlock a BLAKE2b wallet with different passwords', async () => {\r
                        const wallet = await Wallet.load('BLAKE2b', NANO_TEST_VECTORS.PASSWORD, TREZOR_TEST_VECTORS.ENTROPY_1)\r
 \r
-                       await assert.rejects(wallet.unlock(TREZOR_TEST_VECTORS.PASSWORD), { message: 'Failed to unlock wallet' })\r
+                       await assert.rejects(wallet.unlock(TREZOR_TEST_VECTORS.PASSWORD), 'Failed to unlock wallet')\r
                        assert.ok('mnemonic' in wallet)\r
                        assert.ok('seed' in wallet)\r
                        assert.ok(wallet.mnemonic === undefined)\r
@@ -124,9 +124,9 @@ await Promise.all([
                await test('fail to unlock a BLAKE2b wallet with no input', async () => {\r
                        const wallet = await Wallet.load('BLAKE2b', NANO_TEST_VECTORS.PASSWORD, TREZOR_TEST_VECTORS.ENTROPY_1)\r
 \r
-                       await assert.rejects(wallet.unlock(), { message: 'Failed to unlock wallet' })\r
+                       await assert.rejects(wallet.unlock(), 'Failed to unlock wallet')\r
                        //@ts-expect-error\r
-                       await assert.rejects(wallet.unlock(1), { message: 'Failed to unlock wallet' })\r
+                       await assert.rejects(wallet.unlock(1), 'Failed to unlock wallet')\r
 \r
                        await assert.resolves(wallet.destroy())\r
                })\r

diff --git a/test/test.refresh-accounts.mjs b/test/test.refresh-accounts.mjs
index 2fe0898705a7c58224faadd2db316b9ae66f6d4f..a08750aa02d2674903d8dd1d7cc91a845bc370ca 100644 (file)
--- a/test/test.refresh-accounts.mjs
+++ b/test/test.refresh-accounts.mjs
@@ -42,8 +42,7 @@ await Promise.all([
                        await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)
                        const account = await wallet.account(0x7fffffff)
 
-                       await assert.rejects(account.refresh(rpc),
-                               { message: 'Account not found' })
+                       await assert.rejects(account.refresh(rpc), 'Account not found')
 
                        await assert.resolves(wallet.destroy())
                })
@@ -52,8 +51,7 @@ await Promise.all([
                        const wallet = await Wallet.load('BIP-44', NANO_TEST_VECTORS.PASSWORD, NANO_TEST_VECTORS.BIP39_SEED)
                        await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)
 
-                       await assert.rejects(wallet.account(0x80000000),
-                               { message: 'Invalid child key index 0x80000000' })
+                       await assert.rejects(wallet.account(0x80000000), 'Invalid child key index 0x80000000')
 
                        await assert.resolves(wallet.destroy())
                })
@@ -64,8 +62,7 @@ await Promise.all([
                        const invalidNode = new Rpc('http://invalid.com')
                        const account = await wallet.account()
 
-                       await assert.rejects(account.refresh(invalidNode),
-                               { message: 'Account not found' })
+                       await assert.rejects(account.refresh(invalidNode), 'Account not found')
 
                        await assert.resolves(wallet.destroy())
                })