Update account tests to use Map methods.

diff --git a/test/test.derive-accounts.mjs b/test/test.derive-accounts.mjs
index bc0cde775dbd1382b30180a01a829af35ddef29e..e90d28de9a659df955a4465b7bd69ec7f0bd9f85 100644 (file)
--- a/test/test.derive-accounts.mjs
+++ b/test/test.derive-accounts.mjs
@@ -29,8 +29,8 @@ await Promise.all([
                        assert.equal(account.index, 0)\r
 \r
                        const accounts = await wallet.accounts()\r
-                       assert.exists(accounts[0])\r
-                       assert.equal(account, accounts[0])\r
+                       assert.exists(accounts.get(0))\r
+                       assert.equal(account, accounts.get(0))\r
 \r
                        await assert.resolves(wallet.destroy())\r
                })\r
@@ -41,12 +41,18 @@ await Promise.all([
                        const accounts = await wallet.accounts(1, 2)\r
 \r
                        assert.equal(accounts.size, 2)\r
-                       assert.equal(accounts[1].publicKey, NANO_TEST_VECTORS.PUBLIC_1)\r
-                       assert.equal(accounts[1].address, NANO_TEST_VECTORS.ADDRESS_1)\r
-                       assert.equal(accounts[1].index, 1)\r
-                       assert.equal(accounts[2].publicKey, NANO_TEST_VECTORS.PUBLIC_2)\r
-                       assert.equal(accounts[2].address, NANO_TEST_VECTORS.ADDRESS_2)\r
-                       assert.equal(accounts[2].index, 2)\r
+\r
+                       const account1 = accounts.get(1)\r
+                       assert.exists(account1)\r
+                       assert.equal(account1.publicKey, NANO_TEST_VECTORS.PUBLIC_1)\r
+                       assert.equal(account1.address, NANO_TEST_VECTORS.ADDRESS_1)\r
+                       assert.equal(account1.index, 1)\r
+\r
+                       const account2 = accounts.get(2)\r
+                       assert.exists(account2)\r
+                       assert.equal(account2.publicKey, NANO_TEST_VECTORS.PUBLIC_2)\r
+                       assert.equal(account2.address, NANO_TEST_VECTORS.ADDRESS_2)\r
+                       assert.equal(account2.index, 2)\r
 \r
                        await assert.resolves(wallet.destroy())\r
                })\r
@@ -58,7 +64,7 @@ await Promise.all([
 \r
                        assert.equal(accounts.size, 0x10)\r
                        for (let i = 0x70000000; i < 0x7000000f; i++) {\r
-                               const a = accounts[i]\r
+                               const a = accounts.get(i)\r
                                assert.exists(a)\r
                                assert.equal(a.index, i)\r
                                assert.exists(a.address)\r
@@ -81,10 +87,11 @@ await Promise.all([
                        assert.equal(account.index, 1)\r
 \r
                        const accounts = await wallet.accounts(1)\r
-                       assert.exists(accounts[1])\r
-                       assert.exists(accounts[1].publicKey)\r
-                       assert.exists(accounts[1].address)\r
-                       assert.equal(account, accounts[1])\r
+                       const account1 = accounts.get(1)\r
+                       assert.exists(account1)\r
+                       assert.exists(account1.publicKey)\r
+                       assert.exists(account1.address)\r
+                       assert.equal(account, account1)\r
 \r
                        await assert.resolves(wallet.destroy())\r
                })\r
@@ -95,12 +102,18 @@ await Promise.all([
                        const accounts = await wallet.accounts(2, 3)\r
 \r
                        assert.equal(accounts.size, 2)\r
-                       assert.exists(accounts[2].publicKey)\r
-                       assert.exists(accounts[2].address)\r
-                       assert.equal(accounts[2].index, 2)\r
-                       assert.exists(accounts[3].publicKey)\r
-                       assert.exists(accounts[3].address)\r
-                       assert.equal(accounts[3].index, 3)\r
+\r
+                       const account2 = accounts.get(2)\r
+                       assert.exists(account2)\r
+                       assert.exists(account2.publicKey)\r
+                       assert.exists(account2.address)\r
+                       assert.equal(account2.index, 2)\r
+\r
+                       const account3 = accounts.get(3)\r
+                       assert.exists(account3)\r
+                       assert.exists(account3.publicKey)\r
+                       assert.exists(account3.address)\r
+                       assert.equal(account3.index, 3)\r
 \r
                        await assert.resolves(wallet.destroy())\r
                })\r
@@ -112,7 +125,7 @@ await Promise.all([
 \r
                        assert.equal(accounts.size, 0x10)\r
                        for (let i = 0x70000000; i < 0x7000000f; i++) {\r
-                               const a = accounts[i]\r
+                               const a = accounts.get(i)\r
                                assert.exists(a)\r
                                assert.equal(a.index, i)\r
                                assert.exists(a.address)\r

diff --git a/test/test.import-wallet.mjs b/test/test.import-wallet.mjs
index b5fdf770c4db59058dd615b59d48b9b24cc2c771..3fd9f57ea6ffefd9ae93c3338b3ce59f6e20eb62 100644 (file)
--- a/test/test.import-wallet.mjs
+++ b/test/test.import-wallet.mjs
@@ -117,9 +117,10 @@ await Promise.all([
                        assert.equal(accounts.size, 4)\r
 \r
                        for (let i = 0; i < accounts.size; i++) {\r
-                               assert.exists(accounts[i])\r
-                               assert.exists(accounts[i].address)\r
-                               assert.exists(accounts[i].publicKey)\r
+                               const account = accounts.get(i)\r
+                               assert.exists(account)\r
+                               assert.exists(account.address)\r
+                               assert.exists(account.publicKey)\r
                        }\r
 \r
                        await assert.resolves(wallet.destroy())\r
@@ -139,9 +140,10 @@ await Promise.all([
                        assert.equal(accounts.size, 4)\r
 \r
                        for (let i = 0; i < accounts.size; i++) {\r
-                               assert.exists(accounts[i])\r
-                               assert.exists(accounts[i].address)\r
-                               assert.exists(accounts[i].publicKey)\r
+                               const account = accounts.get(i)\r
+                               assert.exists(account)\r
+                               assert.exists(account.address)\r
+                               assert.exists(account.publicKey)\r
                        }\r
 \r
                        await assert.resolves(wallet.destroy())\r
@@ -155,13 +157,17 @@ await Promise.all([
                        assert.ok(await wallet.verify(TREZOR_TEST_VECTORS.MNEMONIC_1))\r
                        assert.ok(await wallet.verify(TREZOR_TEST_VECTORS.ENTROPY_1))\r
 \r
-                       assert.ok(accounts[0] instanceof Account)\r
-                       assert.equal(accounts[0].publicKey, TREZOR_TEST_VECTORS.BLAKE2B_1_PUBLIC_0)\r
-                       assert.equal(accounts[0].address, TREZOR_TEST_VECTORS.BLAKE2B_1_ADDRESS_0)\r
-\r
-                       assert.ok(accounts[1] instanceof Account)\r
-                       assert.equal(accounts[1].publicKey, TREZOR_TEST_VECTORS.BLAKE2B_1_PUBLIC_1)\r
-                       assert.equal(accounts[1].address, TREZOR_TEST_VECTORS.BLAKE2B_1_ADDRESS_1)\r
+                       const account0 = accounts.get(0)\r
+                       assert.exists(account0)\r
+                       assert.ok(account0 instanceof Account)\r
+                       assert.equal(account0.publicKey, TREZOR_TEST_VECTORS.BLAKE2B_1_PUBLIC_0)\r
+                       assert.equal(account0.address, TREZOR_TEST_VECTORS.BLAKE2B_1_ADDRESS_0)\r
+\r
+                       const account1 = accounts.get(1)\r
+                       assert.exists(account1)\r
+                       assert.ok(account1 instanceof Account)\r
+                       assert.equal(account1.publicKey, TREZOR_TEST_VECTORS.BLAKE2B_1_PUBLIC_1)\r
+                       assert.equal(account1.address, TREZOR_TEST_VECTORS.BLAKE2B_1_ADDRESS_1)\r
 \r
                        await assert.resolves(wallet.destroy())\r
                })\r

diff --git a/test/test.refresh-accounts.mjs b/test/test.refresh-accounts.mjs
index 65443402f28120582663e6b493160559a4fcfabc..56d3f4e0fa5597616ba4a7e55f268921a5f47824 100644 (file)
--- a/test/test.refresh-accounts.mjs
+++ b/test/test.refresh-accounts.mjs
@@ -168,7 +168,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)
                        const accounts = await wallet.refresh(rpc)
-                       const account = accounts[0]
+                       const account = accounts.get(0)
 
                        assert.ok(account instanceof Account)
                        assert.equal(typeof account.balance, 'bigint')
@@ -192,9 +192,9 @@ await Promise.all([
                                assert.equal(account.balance, 0n)
                                assert.equal(account.receivable, 0n)
                        }
-                       assert.equal(accounts[0].address, 'nano_1pu7p5n3ghq1i1p4rhmek41f5add1uh34xpb94nkbxe8g4a6x1p69emk8y1d')
-                       assert.equal(accounts[1].address, 'nano_3phqgrqbso99xojkb1bijmfryo7dy1k38ep1o3k3yrhb7rqu1h1k47yu78gz')
-                       assert.equal(accounts[2].address, 'nano_3b5fnnerfrkt4me4wepqeqggwtfsxu8fai4n473iu6gxprfq4xd8pk9gh1dg')
+                       assert.equal(accounts.get(0)?.address, 'nano_1pu7p5n3ghq1i1p4rhmek41f5add1uh34xpb94nkbxe8g4a6x1p69emk8y1d')
+                       assert.equal(accounts.get(1)?.address, 'nano_3phqgrqbso99xojkb1bijmfryo7dy1k38ep1o3k3yrhb7rqu1h1k47yu78gz')
+                       assert.equal(accounts.get(2)?.address, 'nano_3b5fnnerfrkt4me4wepqeqggwtfsxu8fai4n473iu6gxprfq4xd8pk9gh1dg')
 
                        await assert.resolves(wallet.destroy())
                })