From: Chris Duncan <chris@zoso.dev>
Date: Mon, 22 Sep 2025 20:02:02 +0000 (-0700)
Subject: Use normal static imports now that importmap is implemented for browser test webpage.
X-Git-Tag: v0.10.5~12^2~13
X-Git-Url: https://git.codecow.com/?a=commitdiff_plain;h=260cf0ad6e6ef0a40ef819e30ccc0b617a4b9d72;p=libnemo.git

Use normal static imports now that importmap is implemented for browser test webpage.
---

diff --git a/test/perf.account.mjs b/test/perf.account.mjs
index cc77c64..d04d220 100644
--- a/test/perf.account.mjs
+++ b/test/perf.account.mjs
@@ -3,19 +3,10 @@
 
 'use strict'
 
-import { assert, isNode, stats, suite, test } from './GLOBALS.mjs'
+import { Wallet } from 'libnemo'
+import { assert, stats, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Wallet } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Wallet } = await import('../dist/browser.min.js'))
-}
-
 await Promise.all([
 	suite('Account performance', { skip: true }, async () => {
 		const COUNT = 0x200
diff --git a/test/perf.block.mjs b/test/perf.block.mjs
index 27ca2b6..6971b05 100644
--- a/test/perf.block.mjs
+++ b/test/perf.block.mjs
@@ -3,19 +3,10 @@
 
 'use strict'
 
-import { isNode, stats, suite, test } from './GLOBALS.mjs'
+import { Block } from 'libnemo'
+import { stats, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Block}
-*/
-let Block
-if (isNode) {
-	({ Block } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Block } = await import('../dist/browser.min.js'))
-}
-
 await Promise.all([
 	suite('Block performance', { skip: true }, async () => {
 		const COUNT = 0x200
diff --git a/test/perf.wallet.mjs b/test/perf.wallet.mjs
index c24075e..706ca92 100644
--- a/test/perf.wallet.mjs
+++ b/test/perf.wallet.mjs
@@ -3,19 +3,10 @@
 
 'use strict'
 
-import { isNode, stats, suite, test } from './GLOBALS.mjs'
+import { Wallet } from 'libnemo'
+import { stats, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Wallet } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Wallet } = await import('../dist/browser.min.js'))
-}
-
 await Promise.all([
 	suite(`Wallet performance`, { skip: true }, async () => {
 		const COUNT = 0x20
diff --git a/test/test.blake2b.mjs b/test/test.blake2b.mjs
index 73ba948..dc72417 100644
--- a/test/test.blake2b.mjs
+++ b/test/test.blake2b.mjs
@@ -3,19 +3,10 @@
 
 'use strict'
 
-import { assert, isNode, suite, test } from './GLOBALS.mjs'
+import { Blake2b } from 'libnemo'
+import { assert, suite, test } from './GLOBALS.mjs'
 import { BLAKE2B_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Blake2b}
-*/
-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 9d723d8..ec38995 100644
--- a/test/test.blocks.mjs
+++ b/test/test.blocks.mjs
@@ -3,27 +3,10 @@
 
 'use strict'
 
-import { assert, isNode, suite, test } from './GLOBALS.mjs'
+import { Account, Block, Wallet } from 'libnemo'
+import { assert, suite, test } from './GLOBALS.mjs'
 import { CUSTOM_TEST_VECTORS, NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Account}
-*/
-let Account
-/**
-* @type {typeof import('../dist/types/main.d.ts').Block}
-*/
-let Block
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Account, Block, Wallet } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Account, Block, Wallet } = await import('../dist/browser.min.js'))
-}
-
 await Promise.all([
 	suite('Block format', async () => {
 		const { ADDRESS_0, ADDRESS_1, ADDRESS_2, RECEIVE_BLOCK } = NANO_TEST_VECTORS
diff --git a/test/test.calculate-pow.mjs b/test/test.calculate-pow.mjs
index b107628..233a1de 100644
--- a/test/test.calculate-pow.mjs
+++ b/test/test.calculate-pow.mjs
@@ -3,23 +3,10 @@
 
 'use strict'
 
+import { Blake2b, Block } from 'libnemo'
 import { assert, isNode, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Blake2b}
-*/
-let Blake2b
-/**
-* @type {typeof import('../dist/types/main.d.ts').Block}
-*/
-let Block
-if (isNode) {
-	({ Blake2b, Block } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Blake2b, Block } = 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 f6ed8ca..a7209bc 100644
--- a/test/test.create-wallet.mjs
+++ b/test/test.create-wallet.mjs
@@ -3,19 +3,10 @@
 
 'use strict'
 
-import { assert, isNode, suite, test } from './GLOBALS.mjs'
+import { Wallet } from 'libnemo'
+import { assert, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Wallet } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Wallet } = await import('../dist/browser.min.js'))
-}
-
 await Promise.all([
 	suite('Create wallets', async () => {
 		const { PASSWORD } = NANO_TEST_VECTORS
diff --git a/test/test.derive-accounts.mjs b/test/test.derive-accounts.mjs
index ec89557..c22fc80 100644
--- a/test/test.derive-accounts.mjs
+++ b/test/test.derive-accounts.mjs
@@ -3,19 +3,10 @@
 
 'use strict'
 
-import { assert, isNode, suite, test } from './GLOBALS.mjs'
+import { Wallet } from 'libnemo'
+import { assert, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Wallet } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Wallet } = 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 8c021a1..5eabff4 100644
--- a/test/test.import-wallet.mjs
+++ b/test/test.import-wallet.mjs
@@ -3,23 +3,10 @@
 
 'use strict'
 
-import { assert, isNode, suite, test } from './GLOBALS.mjs'
+import { Account, Wallet } from 'libnemo'
+import { assert, suite, test } from './GLOBALS.mjs'
 import { BIP32_TEST_VECTORS, CUSTOM_TEST_VECTORS, NANO_TEST_VECTORS, TREZOR_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Account}
-*/
-let Account
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Account, Wallet } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Account, Wallet } = 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 aae1bf0..9bdc8eb 100644
--- a/test/test.ledger.mjs
+++ b/test/test.ledger.mjs
@@ -3,32 +3,10 @@
 
 'use strict'
 
+import { Account, Block, Ledger, Rpc, Wallet } from 'libnemo'
 import { assert, click, env, isNode, suite, test } from './GLOBALS.mjs'
 import { CUSTOM_TEST_VECTORS, NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Account}
-*/
-let Account
-/**
-* @type {typeof import('../dist/types/main.d.ts').Block}
-*/
-let Block
-/**
-* @type {typeof import('../dist/types/main.d.ts').Ledger}
-*/
-let Ledger
-/**
-* @type {typeof import('../dist/types/main.d.ts').Rpc}
-*/
-let Rpc
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-
-{ ({ Account, Block, Ledger, Rpc, Wallet } = await import('libnemo')) }
-
 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 8184959..7f99844 100644
--- a/test/test.lock-unlock.mjs
+++ b/test/test.lock-unlock.mjs
@@ -3,23 +3,10 @@
 
 'use strict'
 
-import { assert, isNode, suite, test } from './GLOBALS.mjs'
+import { Account, Wallet } from 'libnemo'
+import { assert, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS, TREZOR_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Account}
-*/
-let Account
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Account, Wallet } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Account, Wallet } = 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 c918c88..920a90c 100644
--- a/test/test.manage-rolodex.mjs
+++ b/test/test.manage-rolodex.mjs
@@ -3,23 +3,10 @@
 
 'use strict'
 
-import { assert, isNode, suite, test } from './GLOBALS.mjs'
+import { Rolodex, Tools } from 'libnemo'
+import { assert, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Rolodex}
-*/
-let Rolodex
-/**
-* @type {import('../dist/types.d.ts').Tools}
-*/
-let 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 afc113b..d930ef9 100644
--- a/test/test.refresh-accounts.mjs
+++ b/test/test.refresh-accounts.mjs
@@ -3,27 +3,10 @@
 
 'use strict'
 
-import { assert, env, isNode, suite, test } from './GLOBALS.mjs'
+import { Account, Wallet, Rpc } from 'libnemo'
+import { assert, env, suite, test } from './GLOBALS.mjs'
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Account}
-*/
-let Account
-/**
-* @type {typeof import('../dist/types/main.d.ts').Rpc}
-*/
-let Rpc
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Account, Wallet, Rpc } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Account, Wallet, Rpc } = await import('../dist/browser.min.js'))
-}
-
 const rpc = new Rpc(env.NODE_URL ?? '', env.API_KEY_NAME)
 
 await Promise.all([
diff --git a/test/test.tools.mjs b/test/test.tools.mjs
index f73e385..81ba67d 100644
--- a/test/test.tools.mjs
+++ b/test/test.tools.mjs
@@ -3,35 +3,10 @@
 
 'use strict'
 
-import { assert, env, isNode, suite, test } from './GLOBALS.mjs'
+import { Account, Block, Rpc, Tools, Wallet } from 'libnemo'
+import { assert, env, suite, test } from './GLOBALS.mjs'
 import { MAX_RAW, MAX_SUPPLY, NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types/main.d.ts').Account}
-*/
-let Account
-/**
-* @type {typeof import('../dist/types/main.d.ts').Block}
-*/
-let Block
-/**
-* @type {typeof import('../dist/types/main.d.ts').Rpc}
-*/
-let Rpc
-/**
-* @type {typeof import('../dist/types/main.d.ts').Tools}
-*/
-let Tools
-/**
-* @type {typeof import('../dist/types/main.d.ts').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Account, Block, Rpc, Tools, Wallet } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Account, Block, Rpc, Tools, Wallet } = await import('../dist/browser.min.js'))
-}
-
 const rpc = new Rpc(env?.NODE_URL ?? '', env?.API_KEY_NAME)
 
 await Promise.all([
diff --git a/test/test.wallet-sign.mjs b/test/test.wallet-sign.mjs
index 7a74744..df4ef14 100644
--- a/test/test.wallet-sign.mjs
+++ b/test/test.wallet-sign.mjs
@@ -3,31 +3,10 @@
 
 'use strict'
 
-import { assert, env, isNode, suite, test } from './GLOBALS.mjs'
+import { Account, Block, Tools, Wallet } from 'libnemo'
+import { assert, env, suite, test } from './GLOBALS.mjs'
 import { MAX_RAW, MAX_SUPPLY, NANO_TEST_VECTORS } from './VECTORS.mjs'
 
-/**
-* @type {typeof import('../dist/types').Account}
-*/
-let Account
-/**
-* @type {typeof import('../dist/types').Block}
-*/
-let Block
-/**
-* @type {typeof import('../dist/types').Tools}
-*/
-let Tools
-/**
-* @type {typeof import('../dist/types').Wallet}
-*/
-let Wallet
-if (isNode) {
-	({ Account, Block, Tools, Wallet } = await import('../dist/nodejs.min.js'))
-} else {
-	({ Account, Block, Tools, Wallet } = await import('../dist/browser.min.js'))
-}
-
 await Promise.all([
 
 	suite('sign with Wallet', async () => {