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 cc77c6421f00424e81f5f622078e440ed99880d7..d04d220ac1ea37e9b6cdeb7e0b165ca6353986f9 100644 (file)
--- 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 27ca2b6ec02a8c59797576549c294d60bc2ff2df..6971b05fdbc58b47e8f0ee24c4eacbdfd66fce54 100644 (file)
--- 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 c24075eea69fe7d9bab15f18ddf7279beb013191..706ca92d160f26b1344d7ea78c3da36c549a7be2 100644 (file)
--- 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 73ba9481da82165eb38bc3b0e0c9db503469df24..dc72417904e4f6954f8629336ad0ba9480b44728 100644 (file)
--- a/test/test.blake2b.mjs
+++ b/test/test.blake2b.mjs
@@ -3,19 +3,10 @@
 \r
 'use strict'\r
 \r
-import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
+import { Blake2b } from 'libnemo'\r
+import { assert, suite, test } from './GLOBALS.mjs'\r
 import { BLAKE2B_TEST_VECTORS } from './VECTORS.mjs'\r
 \r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Blake2b}\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
 \r

diff --git a/test/test.blocks.mjs b/test/test.blocks.mjs
index 9d723d82334667c952506871e4c32c2b0d43978b..ec3899527e27b91e14daf93a3ff2dc1f0803d279 100644 (file)
--- a/test/test.blocks.mjs
+++ b/test/test.blocks.mjs
@@ -3,27 +3,10 @@
 \r
 'use strict'\r
 \r
-import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
+import { Account, Block, Wallet } from 'libnemo'\r
+import { assert, suite, test } from './GLOBALS.mjs'\r
 import { CUSTOM_TEST_VECTORS, NANO_TEST_VECTORS } from './VECTORS.mjs'\r
 \r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Account}\r
-*/\r
-let Account\r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Block}\r
-*/\r
-let Block\r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Wallet}\r
-*/\r
-let Wallet\r
-if (isNode) {\r
-       ({ Account, Block, Wallet } = await import('../dist/nodejs.min.js'))\r
-} else {\r
-       ({ Account, Block, Wallet } = await import('../dist/browser.min.js'))\r
-}\r
-\r
 await Promise.all([\r
        suite('Block format', async () => {\r
                const { ADDRESS_0, ADDRESS_1, ADDRESS_2, RECEIVE_BLOCK } = NANO_TEST_VECTORS\r

diff --git a/test/test.calculate-pow.mjs b/test/test.calculate-pow.mjs
index b107628fc619b2811f5552d348e6d54d0b7846c0..233a1de6ca787ebe43d1bbe836a4a07d4e11a7b8 100644 (file)
--- a/test/test.calculate-pow.mjs
+++ b/test/test.calculate-pow.mjs
@@ -3,23 +3,10 @@
 \r
 'use strict'\r
 \r
+import { Blake2b, Block } from 'libnemo'\r
 import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'\r
 \r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Blake2b}\r
-*/\r
-let Blake2b\r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Block}\r
-*/\r
-let Block\r
-if (isNode) {\r
-       ({ Blake2b, Block } = await import('../dist/nodejs.min.js'))\r
-} else {\r
-       ({ Blake2b, Block } = await import('../dist/browser.min.js'))\r
-}\r
-\r
 await Promise.all([\r
        suite('Calculate proof-of-work', { skip: isNode }, async () => {\r
 \r

diff --git a/test/test.create-wallet.mjs b/test/test.create-wallet.mjs
index f6ed8ca1b0f6aa1f27f06185b5ced4052f098e30..a7209bc0535f09369bf9faca59ce22f2e88a707b 100644 (file)
--- a/test/test.create-wallet.mjs
+++ b/test/test.create-wallet.mjs
@@ -3,19 +3,10 @@
 \r
 'use strict'\r
 \r
-import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
+import { Wallet } from 'libnemo'\r
+import { assert, suite, test } from './GLOBALS.mjs'\r
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'\r
 \r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Wallet}\r
-*/\r
-let Wallet\r
-if (isNode) {\r
-       ({ Wallet } = await import('../dist/nodejs.min.js'))\r
-} else {\r
-       ({ Wallet } = await import('../dist/browser.min.js'))\r
-}\r
-\r
 await Promise.all([\r
        suite('Create wallets', async () => {\r
                const { PASSWORD } = NANO_TEST_VECTORS\r

diff --git a/test/test.derive-accounts.mjs b/test/test.derive-accounts.mjs
index ec8955793c1c5a623543383ea3d2a396baba81a5..c22fc80e53999883c5f293ecbbcccab66eb74f81 100644 (file)
--- a/test/test.derive-accounts.mjs
+++ b/test/test.derive-accounts.mjs
@@ -3,19 +3,10 @@
 \r
 'use strict'\r
 \r
-import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
+import { Wallet } from 'libnemo'\r
+import { assert, suite, test } from './GLOBALS.mjs'\r
 import { NANO_TEST_VECTORS } from './VECTORS.mjs'\r
 \r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Wallet}\r
-*/\r
-let Wallet\r
-if (isNode) {\r
-       ({ Wallet } = await import('../dist/nodejs.min.js'))\r
-} else {\r
-       ({ Wallet } = await import('../dist/browser.min.js'))\r
-}\r
-\r
 await Promise.all([\r
        suite('Derive accounts from BIP-44 wallet', async () => {\r
 \r

diff --git a/test/test.import-wallet.mjs b/test/test.import-wallet.mjs
index 8c021a13231b1313039621c78fcc9fca02c4c3bb..5eabff4f10e5d72e9b9c6ba177d4ba384b7ecca8 100644 (file)
--- a/test/test.import-wallet.mjs
+++ b/test/test.import-wallet.mjs
@@ -3,23 +3,10 @@
 \r
 'use strict'\r
 \r
-import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
+import { Account, Wallet } from 'libnemo'\r
+import { assert, suite, test } from './GLOBALS.mjs'\r
 import { BIP32_TEST_VECTORS, CUSTOM_TEST_VECTORS, NANO_TEST_VECTORS, TREZOR_TEST_VECTORS } from './VECTORS.mjs'\r
 \r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Account}\r
-*/\r
-let Account\r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Wallet}\r
-*/\r
-let Wallet\r
-if (isNode) {\r
-       ({ Account, Wallet } = await import('../dist/nodejs.min.js'))\r
-} else {\r
-       ({ Account, Wallet } = await import('../dist/browser.min.js'))\r
-}\r
-\r
 await Promise.all([\r
        suite('Import wallets', async () => {\r
 \r

diff --git a/test/test.ledger.mjs b/test/test.ledger.mjs
index aae1bf0b20bb45dcf12b65f165c32e6b6b3c5c25..9bdc8ebf51add01993b9e3a0f06cafb2974802d4 100644 (file)
--- 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 81849597c251ef1875080e025744dad656098c2f..7f99844fe5fbd5a65d7e48ff5ce7254381394d29 100644 (file)
--- a/test/test.lock-unlock.mjs
+++ b/test/test.lock-unlock.mjs
@@ -3,23 +3,10 @@
 \r
 'use strict'\r
 \r
-import { assert, isNode, suite, test } from './GLOBALS.mjs'\r
+import { Account, Wallet } from 'libnemo'\r
+import { assert, suite, test } from './GLOBALS.mjs'\r
 import { NANO_TEST_VECTORS, TREZOR_TEST_VECTORS } from './VECTORS.mjs'\r
 \r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Account}\r
-*/\r
-let Account\r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Wallet}\r
-*/\r
-let Wallet\r
-if (isNode) {\r
-       ({ Account, Wallet } = await import('../dist/nodejs.min.js'))\r
-} else {\r
-       ({ Account, Wallet } = await import('../dist/browser.min.js'))\r
-}\r
-\r
 await Promise.all([\r
        suite('Lock and unlock wallets', async () => {\r
 \r

diff --git a/test/test.manage-rolodex.mjs b/test/test.manage-rolodex.mjs
index c918c88f3fba34ba2c7b9e369e1663e2e92f3e50..920a90c1011000680559e6e20808428e265efb4d 100644 (file)
--- 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 afc113b1fa0a022b6e5897b7b487c1e1b01fd803..d930ef9a34b7ebbb54ef47bda6942ae19e5733fc 100644 (file)
--- 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 f73e3852fcc46fe84d70da8af93079398b3360bd..81ba67da6ae437751537fe8af41aff8c53a52a79 100644 (file)
--- a/test/test.tools.mjs
+++ b/test/test.tools.mjs
@@ -3,35 +3,10 @@
 \r
 'use strict'\r
 \r
-import { assert, env, isNode, suite, test } from './GLOBALS.mjs'\r
+import { Account, Block, Rpc, Tools, Wallet } from 'libnemo'\r
+import { assert, env, suite, test } from './GLOBALS.mjs'\r
 import { MAX_RAW, MAX_SUPPLY, NANO_TEST_VECTORS } from './VECTORS.mjs'\r
 \r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Account}\r
-*/\r
-let Account\r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Block}\r
-*/\r
-let Block\r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Rpc}\r
-*/\r
-let Rpc\r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Tools}\r
-*/\r
-let Tools\r
-/**\r
-* @type {typeof import('../dist/types/main.d.ts').Wallet}\r
-*/\r
-let Wallet\r
-if (isNode) {\r
-       ({ Account, Block, Rpc, Tools, Wallet } = await import('../dist/nodejs.min.js'))\r
-} else {\r
-       ({ Account, Block, Rpc, Tools, Wallet } = await import('../dist/browser.min.js'))\r
-}\r
-\r
 const rpc = new Rpc(env?.NODE_URL ?? '', env?.API_KEY_NAME)\r
 \r
 await Promise.all([\r

diff --git a/test/test.wallet-sign.mjs b/test/test.wallet-sign.mjs
index 7a74744553c0aad578499c0715e45b1fc53ed266..df4ef14fbbde164631fc6ec9338158e1eab3a55d 100644 (file)
--- a/test/test.wallet-sign.mjs
+++ b/test/test.wallet-sign.mjs
@@ -3,31 +3,10 @@
 \r
 'use strict'\r
 \r
-import { assert, env, isNode, suite, test } from './GLOBALS.mjs'\r
+import { Account, Block, Tools, Wallet } from 'libnemo'\r
+import { assert, env, suite, test } from './GLOBALS.mjs'\r
 import { MAX_RAW, MAX_SUPPLY, NANO_TEST_VECTORS } from './VECTORS.mjs'\r
 \r
-/**\r
-* @type {typeof import('../dist/types').Account}\r
-*/\r
-let Account\r
-/**\r
-* @type {typeof import('../dist/types').Block}\r
-*/\r
-let Block\r
-/**\r
-* @type {typeof import('../dist/types').Tools}\r
-*/\r
-let Tools\r
-/**\r
-* @type {typeof import('../dist/types').Wallet}\r
-*/\r
-let Wallet\r
-if (isNode) {\r
-       ({ Account, Block, Tools, Wallet } = await import('../dist/nodejs.min.js'))\r
-} else {\r
-       ({ Account, Block, Tools, Wallet } = await import('../dist/browser.min.js'))\r
-}\r
-\r
 await Promise.all([\r
 \r
        suite('sign with Wallet', async () => {\r