From: Chris Duncan <chris@zoso.dev>
Date: Wed, 23 Jul 2025 17:36:31 +0000 (-0700)
Subject: Fix conditional dynamic imports in test file to reenable static analysis and type... 
X-Git-Tag: v0.10.5~55^2~11
X-Git-Url: https://git.codecow.com/?a=commitdiff_plain;h=b5c9d194384cbb6555266b3c7ac0782153145e1c;p=libnemo.git

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

diff --git a/test/perf.account.mjs b/test/perf.account.mjs
index e73fcbd..15b2d82 100644
--- 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 dff70e1..fa94473 100644
--- 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 9a203c0..20c2d7e 100644
--- 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 e6aab8e..626589b 100644
--- a/test/test.blake2b.mjs
+++ b/test/test.blake2b.mjs
@@ -5,7 +5,13 @@
 
 import { assert, isNode, suite, test } from './GLOBALS.mjs'
 import { BLAKE2B_TEST_VECTORS } from './VECTORS.mjs'
-const { Blake2b } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let Blake2b
+if (isNode) {
+	({ Blake2b } = await import('../dist/nodejs.min.js'))
+} else {
+	({ Blake2b } = await import('../dist/browser.min.js'))
+}
 
 await Promise.all([
 	suite('BLAKE2b test vectors', async () => {
diff --git a/test/test.blocks.mjs b/test/test.blocks.mjs
index 1ea56e7..a4e58ae 100644
--- a/test/test.blocks.mjs
+++ b/test/test.blocks.mjs
@@ -5,7 +5,13 @@
 
 import { assert, isNode, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
-const { SendBlock, ReceiveBlock, ChangeBlock } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let SendBlock, ReceiveBlock, ChangeBlock
+if (isNode) {
+	({ SendBlock, ReceiveBlock, ChangeBlock } = await import('../dist/nodejs.min.js'))
+} else {
+	({ SendBlock, ReceiveBlock, ChangeBlock } = await import('../dist/browser.min.js'))
+}
 
 await Promise.all([
 	suite('Block format', async () => {
diff --git a/test/test.calculate-pow.mjs b/test/test.calculate-pow.mjs
index fb83c08..a7f35d8 100644
--- a/test/test.calculate-pow.mjs
+++ b/test/test.calculate-pow.mjs
@@ -5,7 +5,13 @@
 
 import { assert, isNode, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
-const { SendBlock, Blake2b } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let Blake2b, SendBlock
+if (isNode) {
+	({ Blake2b, SendBlock } = await import('../dist/nodejs.min.js'))
+} else {
+	({ Blake2b, SendBlock } = await import('../dist/browser.min.js'))
+}
 
 await Promise.all([
 	suite('Calculate proof-of-work', { skip: isNode }, async () => {
diff --git a/test/test.create-wallet.mjs b/test/test.create-wallet.mjs
index 8ed4796..ff2a486 100644
--- a/test/test.create-wallet.mjs
+++ b/test/test.create-wallet.mjs
@@ -5,7 +5,13 @@
 
 import { assert, isNode, 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('Create wallets', async () => {
diff --git a/test/test.derive-accounts.mjs b/test/test.derive-accounts.mjs
index 9e5c5cc..fb6428a 100644
--- a/test/test.derive-accounts.mjs
+++ b/test/test.derive-accounts.mjs
@@ -5,7 +5,13 @@
 
 import { assert, isNode, 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('Derive accounts from BIP-44 wallet', async () => {
diff --git a/test/test.import-wallet.mjs b/test/test.import-wallet.mjs
index 5f838b5..b160491 100644
--- a/test/test.import-wallet.mjs
+++ b/test/test.import-wallet.mjs
@@ -5,7 +5,13 @@
 
 import { assert, isNode, suite, test } from './GLOBALS.mjs'
 import { BIP32_TEST_VECTORS, CUSTOM_TEST_VECTORS, NANO_TEST_VECTORS, TREZOR_TEST_VECTORS } from './VECTORS.mjs'
-const { Account, Bip44Wallet, Blake2bWallet } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let Account, Bip44Wallet, Blake2bWallet
+if (isNode) {
+	({ Account, Bip44Wallet, Blake2bWallet } = await import('../dist/nodejs.min.js'))
+} else {
+	({ Account, Bip44Wallet, Blake2bWallet } = await import('../dist/browser.min.js'))
+}
 
 await Promise.all([
 	suite('Import wallets', async () => {
diff --git a/test/test.ledger.mjs b/test/test.ledger.mjs
index e4a1c19..0398073 100644
--- 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 1943d59..7222b50 100644
--- a/test/test.lock-unlock.mjs
+++ b/test/test.lock-unlock.mjs
@@ -5,7 +5,13 @@
 
 import { assert, isNode, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS, TREZOR_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('Lock and unlock wallets', async () => {
diff --git a/test/test.manage-rolodex.mjs b/test/test.manage-rolodex.mjs
index db52be3..43419fc 100644
--- 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 1ca7b22..f3ba139 100644
--- 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 fe97281..c331859 100644
--- a/test/test.tools.mjs
+++ b/test/test.tools.mjs
@@ -5,7 +5,13 @@
 
 import { assert, env, isNode, suite, test } from './GLOBALS.mjs'
 import { RAW_MAX, NANO_TEST_VECTORS } from './VECTORS.mjs'
-const { Bip44Wallet, Account, SendBlock, Rpc, Tools } = await import(isNode ? '../dist/nodejs.min.js' : '../dist/browser.min.js')
+
+let Account, Bip44Wallet, Rpc, SendBlock, Tools
+if (isNode) {
+	({ Account, Bip44Wallet, Rpc, SendBlock, Tools } = await import('../dist/nodejs.min.js'))
+} else {
+	({ Account, Bip44Wallet, Rpc, SendBlock, Tools } = await import('../dist/browser.min.js'))
+}
 
 const rpc = new Rpc(env?.NODE_URL ?? '', env?.API_KEY_NAME)