Fix wallet imports for performance suite.

diff --git a/test/perf.account.mjs b/test/perf.account.mjs
index ea6e18e69784d1f2486272084f3eaf0dbce25c26..90d8384e8aa564114105710a49dd6335724e0837 100644 (file)
--- a/test/perf.account.mjs
+++ b/test/perf.account.mjs
@@ -7,17 +7,13 @@ import { assert, isNode, stats, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
 /**
-* @type {typeof import('../dist/types.d.ts').Bip44Wallet}
+* @type {typeof import('../dist/types.d.ts').Wallet}
 */
-let Bip44Wallet
-/**
-* @type {typeof import('../dist/types.d.ts').Blake2bWallet}
-*/
-let Blake2bWallet
+let Wallet
 if (isNode) {
-       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/nodejs.min.js'))
+       ({ Wallet } = await import('../dist/nodejs.min.js'))
 } else {
-       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/browser.min.js'))
+       ({ Wallet } = await import('../dist/browser.min.js'))
 }
 
 await Promise.all([
@@ -25,7 +21,7 @@ await Promise.all([
                const COUNT = 0x200
 
                await test(`Time to create ${COUNT} BIP-44 accounts`, async () => {
-                       const wallet = await Bip44Wallet.create(NANO_TEST_VECTORS.PASSWORD)
+                       const wallet = await Wallet.create('BIP-44', NANO_TEST_VECTORS.PASSWORD)
                        await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)
 
                        const start = performance.now()
@@ -39,7 +35,7 @@ await Promise.all([
                })
 
                await test(`Time to create ${COUNT} BLAKE2b accounts`, async () => {
-                       const wallet = await Blake2bWallet.create(NANO_TEST_VECTORS.PASSWORD)
+                       const wallet = await Wallet.create('BLAKE2b', NANO_TEST_VECTORS.PASSWORD)
                        await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)
 
                        const start = performance.now()
@@ -53,7 +49,7 @@ await Promise.all([
                })
 
                await test(`Time to create 1 BIP-44 account ${COUNT} times`, async () => {
-                       const wallet = await Bip44Wallet.create(NANO_TEST_VECTORS.PASSWORD)
+                       const wallet = await Wallet.create('BIP-44', NANO_TEST_VECTORS.PASSWORD)
                        await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)
 
                        const times = []
@@ -69,7 +65,7 @@ await Promise.all([
                })
 
                await test(`Time to create 1 BLAKE2b account ${COUNT} times`, async () => {
-                       const wallet = await Blake2bWallet.create(NANO_TEST_VECTORS.PASSWORD)
+                       const wallet = await Wallet.create('BLAKE2b', NANO_TEST_VECTORS.PASSWORD)
                        await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)
 
                        const times = []

diff --git a/test/perf.wallet.mjs b/test/perf.wallet.mjs
index 956827108fc99c555357f7d2dab94ccc796406b9..6764e9ee58a3ae083ee0c4a7a95399abdb613b03 100644 (file)
--- a/test/perf.wallet.mjs
+++ b/test/perf.wallet.mjs
@@ -7,17 +7,13 @@ import { isNode, stats, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
 /**
-* @type {typeof import('../dist/types.d.ts').Bip44Wallet}
+* @type {typeof import('../dist/types.d.ts').Wallet}
 */
-let Bip44Wallet
-/**
-* @type {typeof import('../dist/types.d.ts').Blake2bWallet}
-*/
-let Blake2bWallet
+let Wallet
 if (isNode) {
-       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/nodejs.min.js'))
+       ({ Wallet } = await import('../dist/nodejs.min.js'))
 } else {
-       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/browser.min.js'))
+       ({ Wallet } = await import('../dist/browser.min.js'))
 }
 
 await Promise.all([
@@ -28,7 +24,7 @@ await Promise.all([
                        const times = []
                        for (let i = 0; i < COUNT; i++) {
                                const start = performance.now()
-                               const wallet = await Bip44Wallet.create(NANO_TEST_VECTORS.PASSWORD)
+                               const wallet = await Wallet.create('BIP-44', NANO_TEST_VECTORS.PASSWORD)
                                const end = performance.now()
                                times.push(end - start)
                                await wallet.destroy()
@@ -40,7 +36,7 @@ await Promise.all([
                        const times = []
                        for (let i = 0; i < COUNT; i++) {
                                const start = performance.now()
-                               const wallet = await Blake2bWallet.create(NANO_TEST_VECTORS.PASSWORD)
+                               const wallet = await Wallet.create('BLAKE2b', NANO_TEST_VECTORS.PASSWORD)
                                const end = performance.now()
                                times.push(end - start)
                                await wallet.destroy()