Fix conditional dynamic imports in test file to reenable static analysis and type...

diff --git a/test/perf.account.mjs b/test/perf.account.mjs
index e73fcbdc1f13b9ab18caab80d32e50ba68b2a555..15b2d82ea98df5c50608efe9146e7e4d0dc2553d 100644 (file)
--- a/test/perf.account.mjs
+++ b/test/perf.account.mjs
@@ -5,7 +5,13 @@
 
 import { assert, isNode, stats, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
-const { Bip44Wallet, Blake2bWallet } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let Bip44Wallet, Blake2bWallet
+if (isNode) {
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/nodejs.min.js'))
+} else {
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/browser.min.js'))
+}
 
 await Promise.all([
        suite('Account performance', { skip: true }, async () => {

diff --git a/test/perf.block.mjs b/test/perf.block.mjs
index dff70e12d39abbd7464a890ad10436ba2d6ea93a..fa9447342b77a718c1328a1bee4b0c1f44b83d34 100644 (file)
--- a/test/perf.block.mjs
+++ b/test/perf.block.mjs
@@ -5,7 +5,13 @@
 
 import { isNode, stats, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
-const { SendBlock } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let SendBlock
+if (isNode) {
+       ({ SendBlock } = await import('../dist/nodejs.min.js'))
+} else {
+       ({ SendBlock } = await import('../dist/browser.min.js'))
+}
 
 await Promise.all([
        suite('Block performance', { skip: true }, async () => {

diff --git a/test/perf.wallet.mjs b/test/perf.wallet.mjs
index 9a203c023f0056d89d59e8c8269129aab09b5735..20c2d7e651d92c7d96bcbc5c074c9b693f024c3b 100644 (file)
--- a/test/perf.wallet.mjs
+++ b/test/perf.wallet.mjs
@@ -5,7 +5,13 @@
 
 import { isNode, stats, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
-const { Bip44Wallet, Blake2bWallet } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let Bip44Wallet, Blake2bWallet
+if (isNode) {
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/nodejs.min.js'))
+} else {
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/browser.min.js'))
+}
 
 await Promise.all([
        suite(`Wallet performance`, { skip: true }, async () => {

diff --git a/test/test.blake2b.mjs b/test/test.blake2b.mjs
index e6aab8e8a9ee333f2ceaaa9aa4b80eeeb12e5333..626589b7c90b5303f24f75c7668d24cf806cb880 100644 (file)
--- a/test/test.blake2b.mjs
+++ b/test/test.blake2b.mjs
@@ -5,7 +5,13 @@
 \r
 import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
 import { BLAKE2B_TEST_VECTORS } from './VECTORS.mjs'\r
-const { Blake2b } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')\r
+\r
+let Blake2b\r
+if (isNode) {\r
+       ({ Blake2b } = await import('../dist/nodejs.min.js'))\r
+} else {\r
+       ({ Blake2b } = await import('../dist/browser.min.js'))\r
+}\r
 \r
 await Promise.all([\r
        suite('BLAKE2b test vectors', async () => {\r

diff --git a/test/test.blocks.mjs b/test/test.blocks.mjs
index 1ea56e73fe34ac54016e38275246cf6b8b4fe5b5..a4e58aee0e6ed88615d8cbfeef79abedfaa0d1c0 100644 (file)
--- a/test/test.blocks.mjs
+++ b/test/test.blocks.mjs
@@ -5,7 +5,13 @@
 \r
 import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'\r
-const { SendBlock, ReceiveBlock, ChangeBlock } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')\r
+\r
+let SendBlock, ReceiveBlock, ChangeBlock\r
+if (isNode) {\r
+       ({ SendBlock, ReceiveBlock, ChangeBlock } = await import('../dist/nodejs.min.js'))\r
+} else {\r
+       ({ SendBlock, ReceiveBlock, ChangeBlock } = await import('../dist/browser.min.js'))\r
+}\r
 \r
 await Promise.all([\r
        suite('Block format', async () => {\r

diff --git a/test/test.calculate-pow.mjs b/test/test.calculate-pow.mjs
index fb83c08d29e0eff5471a3cb1e0915b31af67bd34..a7f35d8a2884fe7e819f517bdbe6d43ece1f2155 100644 (file)
--- a/test/test.calculate-pow.mjs
+++ b/test/test.calculate-pow.mjs
@@ -5,7 +5,13 @@
 \r
 import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'\r
-const { SendBlock, Blake2b } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')\r
+\r
+let Blake2b, SendBlock\r
+if (isNode) {\r
+       ({ Blake2b, SendBlock } = await import('../dist/nodejs.min.js'))\r
+} else {\r
+       ({ Blake2b, SendBlock } = await import('../dist/browser.min.js'))\r
+}\r
 \r
 await Promise.all([\r
        suite('Calculate proof-of-work', { skip: isNode }, async () => {\r

diff --git a/test/test.create-wallet.mjs b/test/test.create-wallet.mjs
index 8ed47963b0668e32516a2ae8ded41c6d8681e896..ff2a486e857805eddea044b9ca2c55fdf0c9fc9c 100644 (file)
--- a/test/test.create-wallet.mjs
+++ b/test/test.create-wallet.mjs
@@ -5,7 +5,13 @@
 \r
 import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'\r
-const { Bip44Wallet, Blake2bWallet } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')\r
+\r
+let Bip44Wallet, Blake2bWallet\r
+if (isNode) {\r
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/nodejs.min.js'))\r
+} else {\r
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/browser.min.js'))\r
+}\r
 \r
 await Promise.all([\r
        suite('Create wallets', async () => {\r

diff --git a/test/test.derive-accounts.mjs b/test/test.derive-accounts.mjs
index 9e5c5cce350bebd180b7d63d89b26a87747af99d..fb6428ad01db19b5c912f4ae4e1c1e90a3700762 100644 (file)
--- a/test/test.derive-accounts.mjs
+++ b/test/test.derive-accounts.mjs
@@ -5,7 +5,13 @@
 \r
 import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'\r
-const { Bip44Wallet, Blake2bWallet } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')\r
+\r
+let Bip44Wallet, Blake2bWallet\r
+if (isNode) {\r
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/nodejs.min.js'))\r
+} else {\r
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/browser.min.js'))\r
+}\r
 \r
 await Promise.all([\r
        suite('Derive accounts from BIP-44 wallet', async () => {\r

diff --git a/test/test.import-wallet.mjs b/test/test.import-wallet.mjs
index 5f838b5b6cc774ae7a62f8cd4c7a1990fc59682a..b16049124a5c6f67c6595d5e0c8f4303ba63d4a4 100644 (file)
--- a/test/test.import-wallet.mjs
+++ b/test/test.import-wallet.mjs
@@ -5,7 +5,13 @@
 \r
 import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
 import { BIP32_TEST_VECTORS, CUSTOM_TEST_VECTORS, NANO_TEST_VECTORS, TREZOR_TEST_VECTORS } from './VECTORS.mjs'\r
-const { Account, Bip44Wallet, Blake2bWallet } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')\r
+\r
+let Account, Bip44Wallet, Blake2bWallet\r
+if (isNode) {\r
+       ({ Account, Bip44Wallet, Blake2bWallet } = await import('../dist/nodejs.min.js'))\r
+} else {\r
+       ({ Account, Bip44Wallet, Blake2bWallet } = await import('../dist/browser.min.js'))\r
+}\r
 \r
 await Promise.all([\r
        suite('Import wallets', async () => {\r

diff --git a/test/test.ledger.mjs b/test/test.ledger.mjs
index e4a1c19e9202f75d1c0edc618bd8bf063cc95ad8..03980735a2d0a4900ab5eeaf5a962e74dbf5b1d1 100644 (file)
--- a/test/test.ledger.mjs
+++ b/test/test.ledger.mjs
@@ -5,7 +5,13 @@
 
 import { assert, click, env, isNode, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
-const { Account, LedgerWallet, ReceiveBlock, Rpc, SendBlock } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let Account, LedgerWallet, ReceiveBlock, Rpc, SendBlock
+if (isNode) {
+       ({ Account, LedgerWallet, ReceiveBlock, Rpc, SendBlock } = await import('../dist/nodejs.min.js'))
+} else {
+       ({ Account, LedgerWallet, ReceiveBlock, Rpc, SendBlock } = await import('../dist/browser.min.js'))
+}
 
 const rpc = new Rpc(env.NODE_URL ?? '', env.API_KEY_NAME)
 

diff --git a/test/test.lock-unlock.mjs b/test/test.lock-unlock.mjs
index 1943d59d94a5078c41aa509200d50a25e5aa075f..7222b50fd4cba7a52965b05ad875876972b71e46 100644 (file)
--- a/test/test.lock-unlock.mjs
+++ b/test/test.lock-unlock.mjs
@@ -5,7 +5,13 @@
 \r
 import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
 import { NANO_TEST_VECTORS, TREZOR_TEST_VECTORS } from './VECTORS.mjs'\r
-const { Bip44Wallet, Blake2bWallet } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')\r
+\r
+let Bip44Wallet, Blake2bWallet\r
+if (isNode) {\r
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/nodejs.min.js'))\r
+} else {\r
+       ({ Bip44Wallet, Blake2bWallet } = await import('../dist/browser.min.js'))\r
+}\r
 \r
 await Promise.all([\r
        suite('Lock and unlock wallets', async () => {\r

diff --git a/test/test.manage-rolodex.mjs b/test/test.manage-rolodex.mjs
index db52be3793baa2e811935aef19bddf9502eba824..43419fc36168442570eca6a4368f907285965667 100644 (file)
--- a/test/test.manage-rolodex.mjs
+++ b/test/test.manage-rolodex.mjs
@@ -5,7 +5,13 @@
 
 import { assert, isNode, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
-const { Rolodex, Tools } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let Rolodex, Tools
+if (isNode) {
+       ({ Rolodex, Tools } = await import('../dist/nodejs.min.js'))
+} else {
+       ({ Rolodex, Tools } = await import('../dist/browser.min.js'))
+}
 
 await Promise.all([
        suite('Rolodex valid contact management', async () => {

diff --git a/test/test.refresh-accounts.mjs b/test/test.refresh-accounts.mjs
index 1ca7b22864bfa9ed6210b4c0f3f1ee788ee3e1a5..f3ba139facd4a29b4534e27e5cc40cf2208bf468 100644 (file)
--- a/test/test.refresh-accounts.mjs
+++ b/test/test.refresh-accounts.mjs
@@ -5,7 +5,13 @@
 
 import { assert, env, isNode, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
-const { Account, Bip44Wallet, Rpc } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let Account, Bip44Wallet, Rpc
+if (isNode) {
+       ({ Account, Bip44Wallet, Rpc } = await import('../dist/nodejs.min.js'))
+} else {
+       ({ Account, Bip44Wallet, Rpc } = await import('../dist/browser.min.js'))
+}
 
 const rpc = new Rpc(env.NODE_URL ?? '', env.API_KEY_NAME)
 

diff --git a/test/test.tools.mjs b/test/test.tools.mjs
index fe9728110d955405b55171112650c101ebdff1d6..c3318596c641b06b1f59744d987b70b71788efc9 100644 (file)
--- a/test/test.tools.mjs
+++ b/test/test.tools.mjs
@@ -5,7 +5,13 @@
 \r
 import { assert, env, isNode, suite, test } from './GLOBALS.mjs'\r
 import { RAW_MAX, NANO_TEST_VECTORS } from './VECTORS.mjs'\r
-const { Bip44Wallet, Account, SendBlock, Rpc, Tools } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')\r
+\r
+let Account, Bip44Wallet, Rpc, SendBlock, Tools\r
+if (isNode) {\r
+       ({ Account, Bip44Wallet, Rpc, SendBlock, Tools } = await import('../dist/nodejs.min.js'))\r
+} else {\r
+       ({ Account, Bip44Wallet, Rpc, SendBlock, Tools } = await import('../dist/browser.min.js'))\r
+}\r
 \r
 const rpc = new Rpc(env?.NODE_URL ?? '', env?.API_KEY_NAME)\r
 \r