Destroy wallets used in tests to free their resources.

diff --git a/test/test.blocks.mjs b/test/test.blocks.mjs
index db876c34c641b5e453f9ff41d756ae1c7046d75a..269ef8a09898bcf8d24816456da6f188b0df9ee0 100644 (file)
--- a/test/test.blocks.mjs
+++ b/test/test.blocks.mjs
@@ -99,6 +99,8 @@ await Promise.all([
                        )\r
                        const signature = await wallet.sign(0, block)\r
                        assert.equal(block.signature, signature)\r
+\r
+                       await wallet.destroy()\r
                })\r
 \r
                await test('fail to sign open block with wallet when locked', async () => {\r
@@ -115,6 +117,8 @@ await Promise.all([
                        await assert.rejects(wallet.sign(0, block))\r
                        assert.equal(block.hash, NANO_TEST_VECTORS.OPEN_BLOCK.hash)\r
                        assert.ok(block.signature === undefined)\r
+\r
+                       await wallet.destroy()\r
                })\r
 \r
                await test('sign open block with private key', async () => {\r

diff --git a/test/test.import-wallet.mjs b/test/test.import-wallet.mjs
index 910f957df98a4a6804327e949b7d59f956016c14..e5b7ff176053d9b137b1c52dde2ed278256fcd53 100644 (file)
--- a/test/test.import-wallet.mjs
+++ b/test/test.import-wallet.mjs
@@ -221,42 +221,44 @@ await Promise.all([
                })\r
 \r
                await test('Import BIP-44 wallet from storage using a wallet-generated ID', async () => {\r
-                       const id = (await Wallet.import('BIP-44', NANO_TEST_VECTORS.PASSWORD, NANO_TEST_VECTORS.MNEMONIC, NANO_TEST_VECTORS.PASSWORD)).id\r
-                       const wallet = await Wallet.restore(id)\r
+                       const wallet = await Wallet.import('BIP-44', NANO_TEST_VECTORS.PASSWORD, NANO_TEST_VECTORS.MNEMONIC, NANO_TEST_VECTORS.PASSWORD)\r
+                       const restored = await Wallet.restore(wallet.id)\r
 \r
-                       assert.ok('mnemonic' in wallet)\r
-                       assert.ok('seed' in wallet)\r
-                       assert.ok(wallet.mnemonic === undefined)\r
-                       assert.ok(wallet.seed === undefined)\r
-                       await assert.rejects(wallet.verify(NANO_TEST_VECTORS.MNEMONIC))\r
-                       await assert.rejects(wallet.verify(NANO_TEST_VECTORS.BIP39_SEED))\r
+                       assert.ok('mnemonic' in restored)\r
+                       assert.ok('seed' in restored)\r
+                       assert.ok(restored.mnemonic === undefined)\r
+                       assert.ok(restored.seed === undefined)\r
+                       await assert.rejects(restored.verify(NANO_TEST_VECTORS.MNEMONIC))\r
+                       await assert.rejects(restored.verify(NANO_TEST_VECTORS.BIP39_SEED))\r
 \r
-                       const unlockResult = await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)\r
+                       const unlockResult = await restored.unlock(NANO_TEST_VECTORS.PASSWORD)\r
 \r
                        assert.equal(unlockResult, true)\r
-                       assert.ok(await wallet.verify(NANO_TEST_VECTORS.MNEMONIC))\r
-                       assert.ok(await wallet.verify(NANO_TEST_VECTORS.BIP39_SEED))\r
+                       assert.ok(await restored.verify(NANO_TEST_VECTORS.MNEMONIC))\r
+                       assert.ok(await restored.verify(NANO_TEST_VECTORS.BIP39_SEED))\r
 \r
+                       await assert.resolves(restored.destroy())\r
                        await assert.resolves(wallet.destroy())\r
                })\r
 \r
                await test('Import BLAKE2B wallet from storage using a wallet-generated ID', async () => {\r
-                       const id = (await Wallet.import('BLAKE2b', NANO_TEST_VECTORS.PASSWORD, TREZOR_TEST_VECTORS.ENTROPY_0)).id\r
-                       const wallet = await Wallet.restore(id)\r
+                       const wallet = await Wallet.import('BLAKE2b', NANO_TEST_VECTORS.PASSWORD, TREZOR_TEST_VECTORS.ENTROPY_0)\r
+                       const restored = await Wallet.restore(wallet.id)\r
 \r
-                       assert.ok('mnemonic' in wallet)\r
-                       assert.ok('seed' in wallet)\r
-                       assert.ok(wallet.mnemonic === undefined)\r
-                       assert.ok(wallet.seed === undefined)\r
-                       await assert.rejects(wallet.verify(TREZOR_TEST_VECTORS.MNEMONIC_0))\r
-                       await assert.rejects(wallet.verify(TREZOR_TEST_VECTORS.ENTROPY_0))\r
+                       assert.ok('mnemonic' in restored)\r
+                       assert.ok('seed' in restored)\r
+                       assert.ok(restored.mnemonic === undefined)\r
+                       assert.ok(restored.seed === undefined)\r
+                       await assert.rejects(restored.verify(TREZOR_TEST_VECTORS.MNEMONIC_0))\r
+                       await assert.rejects(restored.verify(TREZOR_TEST_VECTORS.ENTROPY_0))\r
 \r
-                       const unlockResult = await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)\r
+                       const unlockResult = await restored.unlock(NANO_TEST_VECTORS.PASSWORD)\r
 \r
                        assert.equal(unlockResult, true)\r
-                       assert.ok(await wallet.verify(TREZOR_TEST_VECTORS.MNEMONIC_0))\r
-                       assert.ok(await wallet.verify(TREZOR_TEST_VECTORS.ENTROPY_0))\r
+                       assert.ok(await restored.verify(TREZOR_TEST_VECTORS.MNEMONIC_0))\r
+                       assert.ok(await restored.verify(TREZOR_TEST_VECTORS.ENTROPY_0))\r
 \r
+                       await assert.resolves(restored.destroy())\r
                        await assert.resolves(wallet.destroy())\r
                })\r
 \r