trac-msb 0.2.9 → 0.2.10

package/tests/helpers/setupApplyTests.js

@@ -82,11 +82,10 @@ export async function fundPeer(admin, toFund, amount) {
 }
 
 export async function initMsbPeer(peerName, peerKeyPair, temporaryDirectory, options = {}) {
-    const peer = await initDirectoryStructure(peerName, peerKeyPair, temporaryDirectory);
-    peer.options = options
-    peer.options.storesDirectory = peer.storesDirectory;
-    peer.options.storeName = peer.storeName;
-    peer.config = createConfig(ENV.DEVELOPMENT, peer.options)
+    const config = createConfig(ENV.DEVELOPMENT, { ...options, storesDirectory: `${temporaryDirectory}/${peerName}` })
+    const peer = await initDirectoryStructure(peerName, peerKeyPair, config.storesFullPath);
+    peer.options = { ...options, storesDirectory: config.storesDirectory }
+    peer.config = config
     const msb = new MainSettlementBus(peer.config);
 
     peer.msb = msb;
@@ -290,9 +289,7 @@ export async function removeTemporaryDirectory(temporaryDirectory) {
 export async function initDirectoryStructure(peerName, keyPair, temporaryDirectory) {
     try {
         await ensureEnvReady();
-        const storesDirectory = temporaryDirectory + '/stores/';
-        const storeName = peerName + '/';
-        const corestoreDbDirectory = path.join(storesDirectory, storeName, 'db');
+        const corestoreDbDirectory = path.join(temporaryDirectory, 'db');
         await fsp.mkdir(corestoreDbDirectory, {recursive: true});
 
         const keypath = path.join(corestoreDbDirectory, 'keypair.json');
@@ -303,8 +300,7 @@ export async function initDirectoryStructure(peerName, keyPair, temporaryDirecto
         await wallet.ready
         await wallet.exportToFile(keypath)
         return {
-            storesDirectory,
-            storeName,
+            storesDirectory: temporaryDirectory,
             corestoreDbDirectory,
             keypath,
         }

package/tests/unit/messages/network/NetworkMessageBuilder.test.js

@@ -1,7 +1,6 @@
 import { test } from 'brittle';
 import b4a from 'b4a';
 import PeerWallet from 'trac-wallet';
-import { TRAC_NETWORK_MSB_MAINNET_PREFIX } from 'trac-wallet/constants.js';
 import { v7 as uuidv7 } from 'uuid';
 import NetworkWalletFactory from '../../../../src/core/network/identity/NetworkWalletFactory.js';
 import NetworkMessageBuilder from '../../../../src/messages/network/v1/NetworkMessageBuilder.js';
@@ -20,6 +19,7 @@ import {
 } from '../../../../src/utils/buffer.js';
 import { addressToBuffer } from '../../../../src/core/state/utils/address.js';
 import { config } from '../../../helpers/config.js';
+import { asAddress } from '../../../helpers/address.js';
 import { testKeyPair1 } from '../../../fixtures/apply.fixtures.js';
 
 function createWallet() {
@@ -30,7 +30,7 @@ function createWallet() {
     return NetworkWalletFactory.provide({
         enableWallet: false,
         keyPair,
-        networkPrefix: TRAC_NETWORK_MSB_MAINNET_PREFIX
+        networkPrefix: config.addressPrefix
     });
 }
 
@@ -79,7 +79,7 @@ test('NetworkMessageBuilder iterates validator connection response ResultCode va
     const wallet = createWallet();
     const builder = new NetworkMessageBuilder(wallet, config);
     const id = uuidv7();
-    const otherAddress = 'trac1xm76l9qaujh7vqktk8302mw9sfrxau3l45w62hqfl4kasswt6yts0autkh';
+    const otherAddress = asAddress('36fdaf941de4afe602cbb1e2f56dc582466ef23fad1da55c09fd6dd841cbd117');
     const caps = ['cap:b', 'cap:a'];
 
     for (const code of uniqueResultCodes()) {

package/tests/unit/messages/network/NetworkMessageDirector.test.js

@@ -1,8 +1,6 @@
 import { test } from 'brittle';
 import b4a from 'b4a';
 import PeerWallet from 'trac-wallet';
-import { TRAC_NETWORK_MSB_MAINNET_PREFIX } from 'trac-wallet/constants.js';
-
 import NetworkWalletFactory from '../../../../src/core/network/identity/NetworkWalletFactory.js';
 import NetworkMessageDirector from '../../../../src/messages/network/v1/NetworkMessageDirector.js';
 import NetworkMessageBuilder from '../../../../src/messages/network/v1/NetworkMessageBuilder.js';
@@ -17,6 +15,7 @@ import {
 } from '../../../../src/utils/buffer.js';
 import { addressToBuffer } from '../../../../src/core/state/utils/address.js';
 import { config } from '../../../helpers/config.js';
+import { asAddress } from '../../../helpers/address.js';
 import { testKeyPair1 } from '../../../fixtures/apply.fixtures.js';
 
 function createWallet() {
@@ -27,7 +26,7 @@ function createWallet() {
     return NetworkWalletFactory.provide({
         enableWallet: false,
         keyPair,
-        networkPrefix: TRAC_NETWORK_MSB_MAINNET_PREFIX
+        networkPrefix: config.addressPrefix
     });
 }
 
@@ -175,8 +174,7 @@ test('NetworkMessageDirector iterates validator connection response ResultCode v
 
     const id = '1';
     const caps = ['cap:b', 'cap:a'];
-    const otherAddress =
-        'trac1xm76l9qaujh7vqktk8302mw9sfrxau3l45w62hqfl4kasswt6yts0autkh';
+    const otherAddress = asAddress('36fdaf941de4afe602cbb1e2f56dc582466ef23fad1da55c09fd6dd841cbd117');
 
     for (const code of uniqueResultCodes()) {
         const payload = await director.buildValidatorConnectionResponse(

package/tests/unit/utils/fileUtils/readAddressesFromWhitelistFile.test.js

@@ -4,6 +4,7 @@ import { errorMessageIncludes } from "../../../helpers/regexHelper.js";
 import fs from 'fs';
 import PeerWallet from 'trac-wallet';
 import { config } from '../../../helpers/config.js';
+import { asAddress } from '../../../helpers/address.js';
 
 const DUMMY_PATH_OK = './dummy_whitelist_ok.csv';
 const DUMMY_PATH_DUP = './dummy_whitelist_dup.csv';
@@ -12,8 +13,8 @@ const DUMMY_PATH_BLANK = './dummy_whitelist_blank.csv';
 const DUMMY_PATH_BOM = './dummy_whitelist_bom.csv';
 const DUMMY_PATH_LARGE = './dummy_whitelist_large.csv';
 
-const ADDR1 = 'trac1dguwzsvcsehslh6dgj2mqlsxdn7s5t5vhem56yd0xlg47aq6exzqymhr6u';
-const ADDR2 = 'trac123z3gfpr2epjwww7ntm3m6ud2fhmq0tvts27p2f5mx3qkecsutlqfys769';
+const ADDR1 = asAddress('6a38e14198866f0fdf4d4495b07e066cfd0a2e8cbe774d11af37d15f741ac984');
+const ADDR2 = asAddress('544514242356432739de9af71deb8d526fb03d6c5c15e0a934d9a20b6710e2fe');
 
 hook('Initialize dummy whitelist files', async t => {
     // Happy path
@@ -91,4 +92,4 @@ hook('Cleanup dummy whitelist files', async t => {
     [DUMMY_PATH_OK, DUMMY_PATH_DUP, DUMMY_PATH_EMPTY, DUMMY_PATH_BLANK, DUMMY_PATH_BOM, DUMMY_PATH_LARGE].forEach(path => {
             if (fs.existsSync(path)) fs.unlinkSync(path);
         });
-});
+});

package/tests/unit/utils/fileUtils/readBalanceMigrationFile.test.js

@@ -4,6 +4,7 @@ import { errorMessageIncludes } from "../../../helpers/regexHelper.js";
 import fs from 'fs';
 import PeerWallet from 'trac-wallet';
 import { config } from '../../../helpers/config.js';
+import { asAddress } from '../../../helpers/address.js';
 
 const DUMMY_PATH_OK = './dummy_balance_ok.csv';
 const DUMMY_PATH_DUP = './dummy_balance_dup.csv';
@@ -19,8 +20,8 @@ const DUMMY_PATH_ZERO = './dummy_balance_zero.csv';
 const DUMMY_PATH_BOM = './dummy_balance_bom.csv';
 const DUMMY_PATH_LARGE = './dummy_balance_large.csv';
 
-const ADDR1 = 'trac1dguwzsvcsehslh6dgj2mqlsxdn7s5t5vhem56yd0xlg47aq6exzqymhr6u';
-const ADDR2 = 'trac123z3gfpr2epjwww7ntm3m6ud2fhmq0tvts27p2f5mx3qkecsutlqfys769';
+const ADDR1 = asAddress('6a38e14198866f0fdf4d4495b07e066cfd0a2e8cbe774d11af37d15f741ac984');
+const ADDR2 = asAddress('544514242356432739de9af71deb8d526fb03d6c5c15e0a934d9a20b6710e2fe');
 
 hook('Initialize dummy balance files', async t => {
     // Happy path

package/tests/unit/utils/migrationUtils/validateAddressFromIncomingFile.test.js

@@ -4,9 +4,10 @@ import { errorMessageIncludes } from "../../../helpers/regexHelper.js";
 import { ZERO_LICENSE } from '../../../../src/core/state/utils/nodeEntry.js';
 import b4a from 'b4a';
 import { config } from '../../../helpers/config.js';
+import { asAddress } from '../../../helpers/address.js';
 
-const VALID_ADDRESS = 'trac1dguwzsvcsehslh6dgj2mqlsxdn7s5t5vhem56yd0xlg47aq6exzqymhr6u';
-const ADMIN_ADDRESS = 'trac1yva2pduhz5yst8jgzmrc9ve0as5mx7tcw6le9srj6xcwqkx9hacqxxhsf9';
+const VALID_ADDRESS = asAddress('6a38e14198866f0fdf4d4495b07e066cfd0a2e8cbe774d11af37d15f741ac984');
+const ADMIN_ADDRESS = asAddress('233aa0b7971509059e4816c782b32fec29b3797876bf92c072d1b0e058c5bf70');
 const INVALID_ADDRESS = 'notanaddress';
 const LICENSE_NUMBER_ONE = b4a.alloc(4, 1);
 

package/tests/unit/utils/type/type.test.js

@@ -0,0 +1,25 @@
+import test from 'brittle';
+import { isDefined } from '../../../../src/utils/type.js';
+
+const assertIsDefined = (t, value, expected, message) => {
+    try {
+        t.is(isDefined(value), expected, message);
+    } catch (err) {
+        t.fail(`${message}. Threw: ${err.message}`);
+    }
+};
+
+test('isDefined returns false for nullish and NaN', t => {
+    assertIsDefined(t, null, false, 'null should be treated as not defined');
+    assertIsDefined(t, void 0, false, 'undefined should be treated as not defined');
+    assertIsDefined(t, NaN, false, 'NaN should be treated as not defined');
+});
+
+test('isDefined returns true for defined non-NaN values', t => {
+    assertIsDefined(t, 0, true, '0 should be treated as defined');
+    assertIsDefined(t, Infinity, true, 'Infinity should be treated as defined');
+    assertIsDefined(t, '', true, 'empty string should be treated as defined');
+    assertIsDefined(t, false, true, 'boolean false should be treated as defined');
+    assertIsDefined(t, {}, true, 'object should be treated as defined');
+    assertIsDefined(t, [], true, 'array should be treated as defined');
+});

package/tests/unit/utils/utils.test.js

@@ -12,6 +12,7 @@ async function runTests() {
 	await import('./fileUtils/readBalanceMigrationFile.test.js');
 	await import('./migrationUtils/validateAddressFromIncomingFile.test.js');
 	await import('./buffer/buffer.test.js')
+	await import('./type/type.test.js');
 	await import('./amountSerialization/amountSerialization.test.js');
 	test.resume();
 }