trac-msb 0.2.2 → 0.2.3

package/.github/workflows/CI.yml

@@ -30,12 +30,10 @@ jobs:
           cache: 'npm'
       - name: Install dependencies
         run: npm ci
-      - name: Run node tests
-        run: npm run test:node
       - name: Install bare
         run: npm i -g bare
-      - name: Run bare tests
-        run: npm run test:bare
+      - name: Run all tests
+        run: npm run test:unit:all
 # For now acceptance tests should be disable due to instability of the running MSB instance in the github actions environment
 # Github machines are not powerful enough to run MSB, and we won't ever finish our tests.
 #      - name: Run rpc acceptance tests

package/.github/workflows/acceptance-tests.yml

@@ -0,0 +1,35 @@
+name: MSB-Acceptance-Tests
+
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  integration-tests:
+    name: Acceptance Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        node-version: [lts/*]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Install bare
+        run: npm i -g bare
+
+      - name: Run Integration Tests
+        run: npm run test:acceptance

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -13,11 +13,13 @@
     "dev-rpc": "pear run -d . ${npm_config_store} --rpc --port ${npm_config_port}",
     "prod-rpc": "pear run . ${npm_config_store} --rpc --host ${npm_config_host} --port ${npm_config_port}",
     "protobuf": "node scripts/generate-protobufs.js",
-    "test:acceptance": "node --experimental-vm-modules node_modules/jest/bin/jest.js --testTimeout=200000 test/acceptance/",
-    "test:node": "brittle-node -t 1200000 test/all.test.js",
-    "test:bare": "brittle-bare -t 1200000 test/all.test.js",
-    "test:node:cov": "brittle-node -c -t 1200000 test/all.test.js",
-    "test:bare:cov": "brittle-bare -c -t 1200000 test/all.test.js"
+    "test:acceptance": "node --experimental-vm-modules node_modules/jest/bin/jest.js --testTimeout=200000 tests/acceptance/",
+    "test:integration": "brittle-node -t 1200000 tests/integration/integration.test.js",
+    "test:unit:node": "brittle-node -t 60000 tests/unit/unit.test.js",
+    "test:unit:bare": "brittle-bare -t 60000 tests/unit/unit.test.js",
+    "test:unit:all": "(npm run test:unit:node && npm run test:unit:bare) || exit 1",
+    "test:unit:node:cov": "brittle-node -c -t 60000 tests/unit/unit.test.js",
+    "test:unit:bare:cov": "brittle-bare -c -t 60000  tests/unit/unit.test.js"
   },
   "dependencies": {
     "@tracsystems/blake3": "0.0.13",

package/rpc/handlers.mjs

@@ -68,10 +68,17 @@ export async function handleBroadcastTransaction({ msbInstance, respond, req })
             const result = await msbInstance.handleCommand('/broadcast_transaction', null, sanitizedPayload);
             respond(200, { result });
         } catch (error) {
+            let code = error instanceof SyntaxError ? 400 : 500;
+            let errorMsg = code === 400 ? 'Invalid JSON payload.' : 'An error occurred processing the transaction.'
+
+            if(error.message.includes("Failed to broadcast transaction after multiple attempts.")){
+                code = 429;
+                errorMsg = "Failed to broadcast transaction after multiple attempts."
+            }
+            
             console.error('Error in handleBroadcastTransaction:', error);
             // Use 400 for client errors (like bad JSON), 500 for server/command errors
-            const code = error instanceof SyntaxError ? 400 : 500;
-            respond(code, { error: code === 400 ? 'Invalid JSON payload.' : 'An error occurred processing the transaction.' });
+            respond(code, { error:  errorMsg});
         }
     });
 

package/src/index.js

@@ -1199,6 +1199,10 @@ export class MainSettlementBus extends ReadyResource {
                             this.network.validatorConnectionManager.rotate() // force change connection rotation for the next retry
                         }
 
+                        if (await this.#state.get(hash) === null) {
+                            throw new Error("Failed to broadcast transaction after multiple attempts.");
+                        }
+
                         return { message: "Transaction broadcasted successfully.", signedLength, unsignedLength, tx: hash };
                     } else {
                         // Handle case where payload is missing if called internally without one.

package/src/utils/helpers.js

@@ -2,6 +2,8 @@ import b4a from "b4a";
 import {bufferToAddress} from "../core/state/utils/address.js";
 import { EntryType, TRAC_ADDRESS_SIZE } from "./constants.js";
 
+//TODO: change file name or split functions below into multiple files (Remember to update imports and tests accordingly)
+
 export function isHexString(string) {
     return typeof string === 'string' && string.length > 1 && /^[0-9a-fA-F]+$/.test(string) && string.length % 2 === 0;
 }

package/{test → tests}/acceptance/v1/rpc.test.mjs

@@ -1,8 +1,8 @@
 import request from "supertest"
 import { createServer } from "../../../rpc/create_server.mjs"
-import { initTemporaryDirectory } from '../../utils/setupApplyTests.js'
+import { initTemporaryDirectory } from '../../helpers/setupApplyTests.js'
 import { testKeyPair1, testKeyPair2 } from '../../fixtures/apply.fixtures.js'
-import { randomBytes, setupMsbAdmin, setupMsbWriter, fundPeer, removeTemporaryDirectory } from "../../utils/setupApplyTests.js"
+import { randomBytes, setupMsbAdmin, setupMsbWriter, fundPeer, removeTemporaryDirectory } from "../../helpers/setupApplyTests.js"
 import { $TNK } from "../../../src/core/state/utils/balance.js"
 import tracCrypto from 'trac-crypto-api';
 import b4a from 'b4a'

package/{test → tests/integration}/apply/addAdmin/addAdminBasic.test.js

@@ -1,13 +1,13 @@
-import {test, hook} from '../../utils/wrapper.js';
+import {test, hook} from '../../../helpers/wrapper.js';
 import {
     initMsbAdmin, initTemporaryDirectory, removeTemporaryDirectory, setupMsbPeer, setupMsbWriter, setupMsbIndexer,
     tryToSyncWriters
-} from '../../utils/setupApplyTests.js';
-import {randomBytes} from '../../utils/setupApplyTests.js';
-import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
-import {testKeyPair1} from '../../fixtures/apply.fixtures.js';
+} from '../../../helpers/setupApplyTests.js';
+import {randomBytes} from '../../../helpers/setupApplyTests.js';
+import CompleteStateMessageOperations from '../../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import {testKeyPair1} from '../../../fixtures/apply.fixtures.js';
 import b4a from 'b4a';
-import { ADMIN_INITIAL_BALANCE } from '../../../src/utils/constants.js';
+import { ADMIN_INITIAL_BALANCE } from '../../../../src/utils/constants.js';
 
 //TODO: ADD TEST WHEN NON-ADMIN NODE FORGES ADD ADMIN OPERATION AND BROADCASTS IT TO THE STATE -  SHOULD BE REJECTED
 

package/{test → tests/integration}/apply/addAdmin/addAdminRecovery.test.js

@@ -1,16 +1,16 @@
-import {test, hook} from '../../utils/wrapper.js';
+import {test, hook} from '../../../helpers/wrapper.js';
 import {
     initTemporaryDirectory, removeTemporaryDirectory, setupMsbPeer, setupMsbWriter, setupMsbIndexer,
     tryToSyncWriters, waitForAdminEntry, setupMsbAdmin
-} from '../../utils/setupApplyTests.js';
+} from '../../../helpers/setupApplyTests.js';
 
-import {randomBytes} from '../../utils/setupApplyTests.js';
-import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
-import PartialStateMessageOperations from '../../../src/messages/partialStateMessages/PartialStateMessageOperations.js'
-import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4} from '../../fixtures/apply.fixtures.js';
+import {randomBytes} from '../../../helpers/setupApplyTests.js';
+import CompleteStateMessageOperations from '../../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import PartialStateMessageOperations from '../../../../src/messages/partialStateMessages/PartialStateMessageOperations.js'
+import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4} from '../../../fixtures/apply.fixtures.js';
 import b4a from 'b4a';
-import { decode as decodeAdmin } from '../../../src/core/state/utils/adminEntry.js';
-import { EntryType } from '../../../src/utils/constants.js';
+import { decode as decodeAdmin } from '../../../../src/core/state/utils/adminEntry.js';
+import { EntryType } from '../../../../src/utils/constants.js';
 //TODO: ADD TEST WHEN NON-ADMIN NODE FORGES ADD ADMIN OPERATION AND BROADCASTS IT TO THE STATE -  SHOULD BE REJECTED
 
 let admin, newAdmin;

package/{test → tests/integration}/apply/addIndexer.test.js

@@ -1,6 +1,5 @@
 import {test, hook, solo} from 'brittle';
-import CompleteStateMessageOperations from '../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
-import {formatIndexersEntry} from '../../src/utils/helpers.js';
+import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
 import {
     initTemporaryDirectory,
     removeTemporaryDirectory,
@@ -9,7 +8,7 @@ import {
     randomBytes,
     setupMsbPeer,
     setupWhitelist, waitForNodeState, tryToSyncWriters, waitIndexer
-} from '../utils/setupApplyTests.js';
+} from '../../helpers/setupApplyTests.js';
 import {
     testKeyPair1,
     testKeyPair2,
@@ -18,7 +17,7 @@ import {
     testKeyPair5,
     testKeyPair6,
     testKeyPair7
-} from '../fixtures/apply.fixtures.js';
+} from '../../fixtures/apply.fixtures.js';
 import b4a from 'b4a';
 
 let tmpDirectory, admin, indexer1, indexer2, reader1, reader2, indexer3, writer;

package/{test → tests/integration}/apply/addWhitelist.test.js

@@ -1,9 +1,9 @@
-import { test, hook } from '../utils/wrapper.js';
+import { test, hook } from '../../helpers/wrapper.js';
 import b4a from 'b4a';
-import { setupMsbAdmin, initTemporaryDirectory, removeTemporaryDirectory, randomBytes } from '../utils/setupApplyTests.js';
-import { testKeyPair1, testKeyPair2 } from '../fixtures/apply.fixtures.js';
-import fileUtils from '../../src/utils/fileUtils.js';
-import CompleteStateMessageOperations from '../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import { setupMsbAdmin, initTemporaryDirectory, removeTemporaryDirectory, randomBytes } from '../../helpers/setupApplyTests.js';
+import { testKeyPair1, testKeyPair2 } from '../../fixtures/apply.fixtures.js';
+import fileUtils from '../../../src/utils/fileUtils.js';
+import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
 import { address as addressApi } from 'trac-crypto-api';
 import { TRAC_NETWORK_MSB_MAINNET_PREFIX } from 'trac-wallet/constants.js';
 

package/{test → tests/integration}/apply/addWriter.test.js

@@ -1,5 +1,5 @@
 import b4a from 'b4a';
-import { test, hook } from '../utils/wrapper.js';
+import { test, hook } from '../../helpers/wrapper.js';
 
 import {
     setupMsbAdmin,
@@ -14,7 +14,7 @@ import {
     tryToSyncWriters,
     waitForNodeState,
     waitWritable
-} from '../utils/setupApplyTests.js';
+} from '../../helpers/setupApplyTests.js';
 import {
     testKeyPair1,
     testKeyPair2,
@@ -22,11 +22,11 @@ import {
     testKeyPair4,
     testKeyPair5,
     testKeyPair6
-} from '../fixtures/apply.fixtures.js';
-import PartialStateMessageOperations from "../../src/messages/partialStateMessages/PartialStateMessageOperations.js";
-import CompleteStateMessageOperations from '../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
-import {ZERO_WK} from '../../src/utils/buffer.js';
-import { $TNK } from '../../src/core/state/utils/balance.js';
+} from '../../fixtures/apply.fixtures.js';
+import PartialStateMessageOperations from "../../../src/messages/partialStateMessages/PartialStateMessageOperations.js";
+import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import {ZERO_WK} from '../../../src/utils/buffer.js';
+import { $TNK } from '../../../src/core/state/utils/balance.js';
 
 const sendAddWriter = async (invoker, broadcaster) => {
     const validity = await invoker.msb.state.getIndexerSequenceState()

package/{test → tests/integration}/apply/banValidator.test.js

@@ -1,4 +1,4 @@
-import {test, hook} from '../utils/wrapper.js';
+import { test, hook } from '../../helpers/wrapper.js';
 
 import {
     initTemporaryDirectory,
@@ -7,11 +7,11 @@ import {
     setupMsbIndexer,
     setupMsbAdmin,
     tryToSyncWriters
-} from '../utils/setupApplyTests.js';
-import {randomBytes} from '../utils/setupApplyTests.js';
-import CompleteStateMessageOperations from '../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
-import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4} from '../fixtures/apply.fixtures.js';
-import {sleep} from '../../src/utils/helpers.js';
+} from '../../helpers/setupApplyTests.js';
+import { randomBytes } from '../../helpers/setupApplyTests.js';
+import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import { testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4 } from '../../fixtures/apply.fixtures.js';
+import { sleep } from '../../../src/utils/helpers.js';
 import b4a from 'b4a'
 
 let admin;
@@ -99,12 +99,11 @@ test('handleApplyBanValidatorOperation (apply) - Append banValidator payload int
 });
 
 hook('Clean up banValidator setup', async t => {
-    // close msb instances and remove temp directory
-    const toClose = []
-    if (indexer.msb) toClose.push(indexer.msb.close());
-    if (writer1.msb) toClose.push(writer1.msb.close());
-    if (writer2.msb) toClose.push(writer2.msb.close());
-    if (admin.msb) toClose.push(admin.msb.close());
-    await Promise.all(toClose)
+    const toClose = [];
+    if (admin?.msb) toClose.push(admin.msb.close());
+    if (indexer?.msb) toClose.push(indexer.msb.close());
+    if (writer1?.msb) toClose.push(writer1.msb.close());
+    if (writer2?.msb) toClose.push(writer2.msb.close());
+    await Promise.all(toClose);
     if (tmpDirectory) await removeTemporaryDirectory(tmpDirectory);
-})
+});

package/{test → tests/integration}/apply/postTx/invalidSubValues.test.js

@@ -1,5 +1,4 @@
-import {hook, test} from '../../utils/wrapper.js';
-import b4a from "b4a";
+import {hook, test} from '../../../helpers/wrapper.js';
 import {
     generatePostTx,
     initTemporaryDirectory,
@@ -13,11 +12,11 @@ import {
     tryToSyncWriters,
     waitDemotion,
     promoteToWriter
-} from '../../utils/setupApplyTests.js';
-import {safeDecodeApplyOperation, safeEncodeApplyOperation} from '../../../src/utils/protobuf/operationHelpers.js'
-import {testKeyPair1, testKeyPair2, testKeyPair4, testKeyPair5} from '../../fixtures/apply.fixtures.js';
-import { $TNK } from '../../../src/core/state/utils/balance.js';
-import { decode as decodeNodeEntry } from '../../../src/core/state/utils/nodeEntry.js';
+} from '../../../helpers/setupApplyTests.js';
+import {safeDecodeApplyOperation, safeEncodeApplyOperation} from '../../../../src/utils/protobuf/operationHelpers.js'
+import {testKeyPair1, testKeyPair2, testKeyPair4, testKeyPair5} from '../../../fixtures/apply.fixtures.js';
+import { $TNK } from '../../../../src/core/state/utils/balance.js';
+import { decode as decodeNodeEntry } from '../../../../src/core/state/utils/nodeEntry.js';
 
 let tmpDirectory, admin, writer, externalNode, externalBootstrap, maliciousPeer;
 // is and vs is already covered

package/{test → tests/integration}/apply/postTx/postTx.test.js

@@ -1,4 +1,4 @@
-import {hook, test} from '../../utils/wrapper.js';
+import {hook, test} from '../../../helpers/wrapper.js';
 import b4a from "b4a";
 import {
     generatePostTx,
@@ -15,13 +15,12 @@ import {
     waitForHash,
     waitDemotion,
     promoteToWriter
-} from '../../utils/setupApplyTests.js';
-import {safeDecodeApplyOperation, safeEncodeApplyOperation} from '../../../src/utils/protobuf/operationHelpers.js'
-import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4, testKeyPair5} from '../../fixtures/apply.fixtures.js';
-import {OperationType} from "../../../src/utils/constants.js";
-import {addressToBuffer} from "../../../src/core/state/utils/address.js";
-import { $TNK } from '../../../src/core/state/utils/balance.js';
-import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+} from '../../../helpers/setupApplyTests.js';
+import {safeDecodeApplyOperation, safeEncodeApplyOperation} from '../../../../src/utils/protobuf/operationHelpers.js'
+import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4, testKeyPair5} from '../../../fixtures/apply.fixtures.js';
+import {OperationType} from "../../../../src/utils/constants.js";
+import {addressToBuffer} from "../../../../src/core/state/utils/address.js";
+import { $TNK } from '../../../../src/core/state/utils/balance.js';
 
 let tmpDirectory, admin, writer, externalNode, externalBootstrap, maliciousPeer;
 

package/{test → tests/integration}/apply/removeIndexer.test.js

@@ -1,6 +1,6 @@
-import {test, hook} from '../utils/wrapper.js';
+import {test, hook} from '../../helpers/wrapper.js';
 
-import CompleteStateMessageOperations from '../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
 import {
     initTemporaryDirectory,
     removeTemporaryDirectory,
@@ -8,8 +8,8 @@ import {
     setupMsbWriter,
     randomBytes,
     setupMsbIndexer, waitForNodeState, tryToSyncWriters
-} from '../utils/setupApplyTests.js';
-import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4} from '../fixtures/apply.fixtures.js';
+} from '../../helpers/setupApplyTests.js';
+import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4} from '../../fixtures/apply.fixtures.js';
 import b4a from 'b4a'
 
 let tmpDirectory, admin, indexer1, indexer2, writer;

package/{test → tests/integration}/apply/removeWriter.test.js

@@ -1,4 +1,4 @@
-import {test, hook} from '../utils/wrapper.js';
+import {test, hook} from '../../helpers/wrapper.js';
 import b4a from 'b4a';
 import {
     setupMsbAdmin,
@@ -10,7 +10,7 @@ import {
     tryToSyncWriters,
     waitForNotIndexer,
     waitForNodeState,
-} from '../utils/setupApplyTests.js';
+} from '../../helpers/setupApplyTests.js';
 import {
     testKeyPair1,
     testKeyPair2,
@@ -18,9 +18,9 @@ import {
     testKeyPair4,
     testKeyPair5,
     testKeyPair6
-} from '../fixtures/apply.fixtures.js';
-import CompleteStateMessageOperations from '../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
-import PartialStateMessageOperations from '../../src/messages/partialStateMessages/PartialStateMessageOperations.js';
+} from '../../fixtures/apply.fixtures.js';
+import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import PartialStateMessageOperations from '../../../src/messages/partialStateMessages/PartialStateMessageOperations.js';
 
 let admin, writer1, writer2, writer3, writer4, indexer, tmpDirectory;
 

package/{test → tests/integration}/apply/transfer.test.js

@@ -1,5 +1,5 @@
 import b4a from 'b4a';
-import { test, hook } from '../utils/wrapper.js';
+import { test, hook } from '../../helpers/wrapper.js';
 import {
     setupMsbAdmin,
     initTemporaryDirectory,
@@ -7,16 +7,16 @@ import {
     setupMsbWriter,
     waitForHash,
     removeTemporaryDirectory
-} from '../utils/setupApplyTests.js';
+} from '../../helpers/setupApplyTests.js';
 import {
     testKeyPair1,
     testKeyPair2,
     testKeyPair3,
     testKeyPair4
-} from '../fixtures/apply.fixtures.js';
-import PartialStateMessageOperations from "../../src/messages/partialStateMessages/PartialStateMessageOperations.js";
-import CompleteStateMessageOperations from '../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
-import { $TNK } from '../../src/core/state/utils/balance.js';
+} from '../../fixtures/apply.fixtures.js';
+import PartialStateMessageOperations from "../../../src/messages/partialStateMessages/PartialStateMessageOperations.js";
+import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import { $TNK } from '../../../src/core/state/utils/balance.js';
 
 const buildTransfer = async (admin, from, to, amount) => {
     const txValidity = await from.msb.state.getIndexerSequenceState()
@@ -62,7 +62,7 @@ test('handleApplyTransferOperation (apply) - append two transfers', async t => {
     await Promise.all(
         [await waitForHash(writer2, first.hash), await waitForHash(writer2, second.hash)]
     );
-
+    
     const firstResult = await writer2.msb.state.get(first.hash)
     const secondResult = await writer2.msb.state.get(second.hash)
     t.ok(firstResult, 'First result should not be null');

package/tests/integration/integration.test.js

@@ -0,0 +1,9 @@
+import { default as test } from 'brittle';
+
+async function runTests() {
+    test.pause();
+    await import('./apply/apply.test.js');
+    test.resume();
+}
+
+await runTests();

package/{test → tests/unit}/messageOperations/assemblePostTransaction.test.js

@@ -7,7 +7,7 @@ import b4a from 'b4a';
 import {safeDecodeApplyOperation} from '../../src/utils/protobuf/operationHelpers.js';
 import {isAddressValid} from "../../src/core/state/utils/address.js";
 import {errorMessageIncludes} from "../utils/regexHelper.js";
-import {generatePostTx, randomBytes} from "../utils/setupApplyTests.js";
+import {generatePostTx, randomBytes} from "../../helpers/setupApplyTests.js";
 
 const msgTxoLength = 10;
 const opType = OperationType.TX;

package/{test → tests/unit}/network/ConnectionManager.test.js

@@ -1,9 +1,9 @@
 import sinon from "sinon";
 import { hook, test } from 'brittle'
 import { default as EventEmitter } from "bare-events"
-import { testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4, testKeyPair5, testKeyPair6, testKeyPair7, testKeyPair8, testKeyPair9 } from "../fixtures/apply.fixtures.js";
-import ConnectionManager from "../../src/core/network/services/ConnectionManager.js";
-import { tick } from "../utils/setupApplyTests.js";
+import { testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4, testKeyPair5, testKeyPair6, testKeyPair7, testKeyPair8, testKeyPair9 } from "../../fixtures/apply.fixtures.js";
+import ConnectionManager from "../../../src/core/network/services/ConnectionManager.js";
+import { tick } from "../../helpers/setupApplyTests.js";
 import b4a from 'b4a'
 
 const createConnection = (key) => {
@@ -13,7 +13,7 @@ const createConnection = (key) => {
     }
     emitter.connected = true
     emitter.remotePublicKey = b4a.from(key, 'hex')
-
+    
     return { key: b4a.from(key, 'hex'), connection: emitter }
 }
 
@@ -50,7 +50,7 @@ test('ConnectionManager', () => {
             reset()
             const connectionManager = makeManager()
             t.is(connectionManager.connectionCount(), connections.length, 'should have the same length')
-
+            
             const data = createConnection(testKeyPair5.publicKey)
             connectionManager.addValidator(data.key, data.connection)
             t.is(connectionManager.connectionCount(), connections.length + 1, 'should have the same length')

package/{test → tests/unit}/state/stateTestUtils.js

@@ -1,7 +1,7 @@
 import b4a from 'b4a';
 import { bech32m } from 'bech32';
 import { TRAC_NETWORK_MSB_MAINNET_PREFIX } from 'trac-wallet/constants.js';
-import { TOKEN_DECIMALS } from '../../src/utils/constants.js';
+import { TOKEN_DECIMALS } from '../../../src/utils/constants.js';
 
 export function randomBuffer(size) {
     return b4a.from(Array.from({ length: size }, () => Math.floor(Math.random() * 256)));

package/{test → tests/unit}/state/utils/address.test.js

@@ -1,8 +1,8 @@
 import { test } from 'brittle';
 import b4a from 'b4a';
-import { TRAC_ADDRESS_SIZE } from '../../../src/utils/constants.js';
+import { TRAC_ADDRESS_SIZE } from '../../../../src/utils/constants.js';
 import { randomAddress } from '../stateTestUtils.js';
-import addressUtils from '../../../src/core/state/utils/address.js';
+import addressUtils from '../../../../src/core/state/utils/address.js';
 
 test('Convert bech32m address to and from buffer - Happy Path', t => {
     const hrp = 'test';

package/{test → tests/unit}/state/utils/adminEntry.test.js

@@ -1,9 +1,9 @@
 import { test } from 'brittle';
 import b4a from 'b4a';
-import { WRITER_BYTE_LENGTH, TRAC_ADDRESS_SIZE } from '../../../src/utils/constants.js';
+import { WRITER_BYTE_LENGTH, TRAC_ADDRESS_SIZE } from '../../../../src/utils/constants.js';
 import { randomAddress, randomBuffer } from '../stateTestUtils.js';
-import addressUtils from '../../../src/core/state/utils/address.js';
-import adminEntryUtils from '../../../src/core/state/utils/adminEntry.js';
+import addressUtils from '../../../../src/core/state/utils/address.js';
+import adminEntryUtils from '../../../../src/core/state/utils/adminEntry.js';
 
 const isAddressValid = addressUtils.isAddressValid;
 const addressToBuffer = addressUtils.addressToBuffer;

package/{test → tests/unit}/state/utils/balance.test.js

@@ -1,11 +1,11 @@
 import { test } from 'brittle';
 import b4a from 'b4a';
 import { randomBuffer, TEN_THOUSAND_VALUE, tokenUnits } from '../stateTestUtils.js';
-import { ZERO_BALANCE, decode, encode } from '../../../src/core/state/utils/nodeEntry.js';
-import { WRITER_BYTE_LENGTH, ADMIN_INITIAL_BALANCE, BALANCE_BYTE_LENGTH } from '../../../src/utils/constants.js';
-import { $TNK, toBalance, toTerm, percent } from '../../../src/core/state/utils/balance.js';
-import { bufferToBigInt } from '../../../src/utils/amountSerialization.js';
-import { ZERO_LICENSE } from '../../../src/core/state/utils/nodeEntry.js';
+import { ZERO_BALANCE, decode, encode } from '../../../../src/core/state/utils/nodeEntry.js';
+import { WRITER_BYTE_LENGTH, ADMIN_INITIAL_BALANCE, BALANCE_BYTE_LENGTH } from '../../../../src/utils/constants.js';
+import { $TNK, toBalance, toTerm, percent } from '../../../../src/core/state/utils/balance.js';
+import { bufferToBigInt } from '../../../../src/utils/amountSerialization.js';
+import { ZERO_LICENSE } from '../../../../src/core/state/utils/nodeEntry.js';
 test('Balance#asHex explicit', t => {
     const val = $TNK(1000n)
     t.is(toBalance(val).asHex(), b4a.toString(val, 'hex'), 'hex matches')

package/{test → tests/unit}/state/utils/indexerEntry.test.js

@@ -1,8 +1,8 @@
 import { test } from 'brittle';
 import b4a from 'b4a';
-import { TRAC_ADDRESS_SIZE } from '../../../src/utils/constants.js';
+import { TRAC_ADDRESS_SIZE } from '../../../../src/utils/constants.js';
 import { randomBuffer } from '../stateTestUtils.js';
-import indexerEntryUtils, { append } from '../../../src/core/state/utils/indexerEntry.js';
+import indexerEntryUtils, { append } from '../../../../src/core/state/utils/indexerEntry.js';
 
 const appendIndexer = indexerEntryUtils.append;
 const removeIndexer = indexerEntryUtils.remove;

package/{test → tests/unit}/state/utils/lengthEntry.test.js

@@ -1,6 +1,6 @@
 import test from 'brittle';
 import b4a from 'b4a';
-import lengthEntry from '../../../src/core/state/utils/lengthEntry.js';
+import lengthEntry from '../../../../src/core/state/utils/lengthEntry.js';
 
 // Test init()
 test('Length Entry - init returns a 4-byte buffer initialized to 0', t => {

package/{test → tests/unit}/state/utils/nodeEntry.test.js

@@ -1,8 +1,8 @@
 import { test } from 'brittle';
 import b4a from 'b4a';
-import { WRITER_BYTE_LENGTH, LICENSE_BYTE_LENGTH } from '../../../src/utils/constants.js';
+import { WRITER_BYTE_LENGTH, LICENSE_BYTE_LENGTH } from '../../../../src/utils/constants.js';
 import { randomBuffer, TEN_THOUSAND_VALUE } from '../stateTestUtils.js';
-import { NodeRole } from '../../../src/core/state/utils/roles.js';
+import { NodeRole } from '../../../../src/core/state/utils/roles.js';
 import {
     ZERO_BALANCE,
     ZERO_LICENSE,
@@ -14,7 +14,7 @@ import {
     setBalance as setNodeEntryBalance,
     setLicense as setNodeEntryLicense,
     setStakedBalance as setNodeEntryStakedBalance,
-} from '../../../src/core/state/utils/nodeEntry.js';
+} from '../../../../src/core/state/utils/nodeEntry.js';
 
 // Test init()
 test('Node Entry - init - Happy Path', t => {

package/{test → tests/unit}/state/utils/roles.test.js

@@ -1,5 +1,5 @@
 import test from 'brittle';
-import roles from '../../../src/core/state/utils/roles.js';
+import roles from '../../../../src/core/state/utils/roles.js';
 
 const { NodeRole, WHITELISTED_MASK, WRITER_MASK, INDEXER_MASK, calculateNodeRole, isNodeRoleValid } = roles;
 

package/tests/unit/unit.test.js

@@ -0,0 +1,14 @@
+// This runner is auto-generated by Brittle
+
+import { default as test } from 'brittle';
+
+async function runTests() {
+	test.pause();
+	await import('./network/networkModule.test.js')
+	await import('./state/stateModule.test.js');
+	await import('./utils/utils.test.js');
+	// await import('./messageOperations/stateMessageOperations.test.js'); // Broken test - needs fixing
+	test.resume();
+}
+
+await runTests();

package/{test/functions → tests/unit/utils/amountSerialization}/amountSerialization.test.js

@@ -1,8 +1,8 @@
 import test from 'brittle';
 import b4a from 'b4a';
-import { decimalStringToBigInt, bigIntTo16ByteBuffer, bufferToBigInt, bigIntToDecimalString, licenseBufferToBigInt } from '../../src/utils/amountSerialization.js';
-import { errorMessageIncludes } from "../utils/regexHelper.js";
-import lengthEntryUtils from '../../src/core/state/utils/lengthEntry.js';
+import { decimalStringToBigInt, bigIntTo16ByteBuffer, bufferToBigInt, bigIntToDecimalString, licenseBufferToBigInt } from '../../../../src/utils/amountSerialization.js';
+import { errorMessageIncludes } from "../../../helpers/regexHelper.js";
+import lengthEntryUtils from '../../../../src/core/state/utils/lengthEntry.js';
 
 test('decimalStringToBigInt', async t => {
     // Zero cases - all valid

package/{test → tests/unit/utils}/buffer/buffer.test.js

@@ -1,6 +1,6 @@
 import test from 'brittle';
 import b4a from 'b4a';
-import {createMessage, isBufferValid, safeWriteUInt32BE, deepCopyBuffer} from '../../src/utils/buffer.js';
+import {createMessage, isBufferValid, safeWriteUInt32BE, deepCopyBuffer} from '../../../../src/utils/buffer.js';
 
 const invalidDataTypes = [
     null,

package/{test → tests/unit/utils}/check/adminControlOperation.test.js

@@ -1,7 +1,7 @@
 import test from 'brittle'
 
-import Check from '../../src/utils/check.js'
-import {ACO, not_allowed_data_types} from '../fixtures/check.fixtures.js'
+import Check from '../../../../src/utils/check.js'
+import {ACO, not_allowed_data_types} from '../../../fixtures/check.fixtures.js'
 import { topLevelValidationTests, valueLevelValidationTest, addressBufferLengthTest, fieldsBufferLengthTest } from './common.test.js';
 
 const check = new Check()

package/{test → tests/unit/utils}/check/balanceInitializationOperation.test.js

@@ -1,7 +1,7 @@
 import test from 'brittle'
 
-import Check from '../../src/utils/check.js'
-import { BIO, not_allowed_data_types } from '../fixtures/check.fixtures.js'
+import Check from '../../../../src/utils/check.js'
+import { BIO, not_allowed_data_types } from '../../../fixtures/check.fixtures.js'
 import { topLevelValidationTests, valueLevelValidationTest, addressBufferLengthTest, fieldsBufferLengthTest } from './common.test.js';
 
 const check = new Check()

package/{test → tests/unit/utils}/check/bootstrapDeploymentOperation.test.js

@@ -1,7 +1,7 @@
 import test from 'brittle'
 
-import Check from '../../src/utils/check.js';
-import {BDO, not_allowed_data_types} from '../fixtures/check.fixtures.js';
+import Check from '../../../../src/utils/check.js';
+import {BDO, not_allowed_data_types} from '../../../fixtures/check.fixtures.js';
 
 import { topLevelValidationTests, valueLevelValidationTest, addressBufferLengthTest, fieldsBufferLengthTest, partialTypeCommonTests } from './common.test.js';
 

package/{test → tests/unit/utils}/check/common.test.js

@@ -1,7 +1,7 @@
 import b4a from 'b4a';
 
-import { MIN_SAFE_VALIDATION_INTEGER, MAX_SAFE_VALIDATION_INTEGER, TRAC_ADDRESS_SIZE } from '../../src/utils/constants.js';
-import { partial_operation_value_type } from "../fixtures/check.fixtures.js";
+import { MIN_SAFE_VALIDATION_INTEGER, MAX_SAFE_VALIDATION_INTEGER, TRAC_ADDRESS_SIZE } from '../../../../src/utils/constants.js';
+import { partial_operation_value_type } from "../../../fixtures/check.fixtures.js";
 
 export function topLevelValidationTests(
     t,

package/{test → tests/unit/utils}/check/coreAdminOperation.test.js

@@ -1,7 +1,7 @@
 import test from 'brittle'
 
-import Check from '../../src/utils/check.js'
-import {CAO, not_allowed_data_types} from '../fixtures/check.fixtures.js'
+import Check from '../../../../src/utils/check.js'
+import {CAO, not_allowed_data_types} from '../../../fixtures/check.fixtures.js'
 import { topLevelValidationTests, valueLevelValidationTest, addressBufferLengthTest, fieldsBufferLengthTest } from './common.test.js';
 
 const check = new Check()

package/{test → tests/unit/utils}/check/roleAccessOperation.test.js

@@ -1,7 +1,7 @@
 import test from 'brittle'
 
-import Check from '../../src/utils/check.js';
-import {RAO, not_allowed_data_types} from '../fixtures/check.fixtures.js';
+import Check from '../../../../src/utils/check.js';
+import {RAO, not_allowed_data_types} from '../../../fixtures/check.fixtures.js';
 import { topLevelValidationTests, valueLevelValidationTest, addressBufferLengthTest, fieldsBufferLengthTest, partialTypeCommonTests } from './common.test.js';
 
 const check = new Check();

package/{test → tests/unit/utils}/check/transactionOperation.test.js

@@ -1,7 +1,7 @@
 import test from 'brittle'
 
-import Check from '../../src/utils/check.js';
-import {TXO, not_allowed_data_types} from '../fixtures/check.fixtures.js';
+import Check from '../../../../src/utils/check.js';
+import {TXO, not_allowed_data_types} from '../../../fixtures/check.fixtures.js';
 import { topLevelValidationTests, valueLevelValidationTest, addressBufferLengthTest, fieldsBufferLengthTest, partialTypeCommonTests } from './common.test.js';
 
 const check = new Check();

package/{test → tests/unit/utils}/check/transferOperation.test.js

@@ -1,7 +1,7 @@
 import test from 'brittle'
 
-import Check from '../../src/utils/check.js';
-import {TRO, not_allowed_data_types, TXO} from '../fixtures/check.fixtures.js';
+import Check from '../../../../src/utils/check.js';
+import {TRO, not_allowed_data_types, TXO} from '../../../fixtures/check.fixtures.js';
 import { topLevelValidationTests, valueLevelValidationTest, addressBufferLengthTest, fieldsBufferLengthTest, partialTypeCommonTests } from './common.test.js';
 
 const check = new Check();

package/{test/functions → tests/unit/utils/crypto}/createHash.test.js

@@ -1,6 +1,6 @@
 import test from 'brittle';
 import b4a from 'b4a';
-import { blake3Hash} from '../../src/utils/crypto.js';
+import { blake3Hash} from '../../../../src/utils/crypto.js';
 
 test('blake3', async (t) => {
     t.test('blake3Hash', async (k) => {

package/{test → tests/unit/utils}/fileUtils/readAddressesFromWhitelistFile.test.js

@@ -1,6 +1,6 @@
 import { test, hook } from 'brittle';
-import fileUtils from '../../src/utils/fileUtils.js';
-import { errorMessageIncludes } from "../utils/regexHelper.js";
+import fileUtils from '../../../../src/utils/fileUtils.js';
+import { errorMessageIncludes } from "../../../helpers/regexHelper.js";
 import fs from 'fs';
 import PeerWallet from 'trac-wallet';
 

package/{test → tests/unit/utils}/fileUtils/readBalanceMigrationFile.test.js

@@ -1,7 +1,6 @@
-
 import { test, hook } from 'brittle';
-import fileUtils from '../../src/utils/fileUtils.js';
-import { errorMessageIncludes } from "../utils/regexHelper.js";
+import fileUtils from '../../../../src/utils/fileUtils.js';
+import { errorMessageIncludes } from "../../../helpers/regexHelper.js";
 import fs from 'fs';
 import PeerWallet from 'trac-wallet';
 

package/{test/functions/functions.test.js → tests/unit/utils/helpers/helpers.test.js}

@@ -3,11 +3,8 @@ import { default as test } from 'brittle';
 async function runMsgUtilsTests() {
     test.pause();
 
-    await import('./applyOperations.test.js');
-    await import('./createHash.test.js');
     await import('./isHexString.test.js');
     await import('./normalizeHex.test.js');
-    await import('./amountSerialization.test.js');
     test.resume();
 }
 

package/{test/functions → tests/unit/utils/helpers}/isHexString.test.js

@@ -1,5 +1,5 @@
 import test from 'brittle';
-import { isHexString } from '../../src/utils/helpers.js';
+import { isHexString } from '../../../../src/utils/helpers.js';
 
 test('isHexString', (t) => {
     t.ok(isHexString('1234567890abcdef'), 'Valid hex string should return true with all lowercase characters');

package/{test/functions → tests/unit/utils/helpers}/normalizeHex.test.js

@@ -1,6 +1,6 @@
 import test from 'brittle';
 import b4a from 'b4a';
-import { normalizeHex } from '../../src/utils/helpers.js';
+import { normalizeHex } from '../../../../src/utils/helpers.js';
 
 test('normalizeHex should convert hex string to buffer', t => {
     const hexString = '1234abcd';

package/{test → tests/unit/utils}/migrationUtils/validateAddressFromIncomingFile.test.js

@@ -1,7 +1,7 @@
 import { test, hook } from 'brittle';
-import migrationUtils from '../../src/utils/migrationUtils.js';
-import { errorMessageIncludes } from "../utils/regexHelper.js";
-import { ZERO_LICENSE } from '../../src/core/state/utils/nodeEntry.js';
+import migrationUtils from '../../../../src/utils/migrationUtils.js';
+import { errorMessageIncludes } from "../../../helpers/regexHelper.js";
+import { ZERO_LICENSE } from '../../../../src/core/state/utils/nodeEntry.js';
 import b4a from 'b4a';
 const VALID_ADDRESS = 'trac1dguwzsvcsehslh6dgj2mqlsxdn7s5t5vhem56yd0xlg47aq6exzqymhr6u';
 const ADMIN_ADDRESS = 'trac1yva2pduhz5yst8jgzmrc9ve0as5mx7tcw6le9srj6xcwqkx9hacqxxhsf9';

package/{test/functions → tests/unit/utils/protobuf}/applyOperations.test.js

@@ -1,8 +1,8 @@
 import test from 'brittle';
-import { safeDecodeApplyOperation, safeEncodeApplyOperation } from '../../src/utils/protobuf/operationHelpers.js';
+import { safeDecodeApplyOperation, safeEncodeApplyOperation } from '../../../src/utils/protobuf/operationHelpers.js';
 import b4a from 'b4a';
-import fixtures from '../fixtures/protobuf.fixtures.js';
-
+import fixtures from '../../fixtures/protobuf.fixtures.js';
+//TODO add missing operations tests and fill fixtures with them
 test('Happy path encode/decode roundtrip for protobuf applyOperation payloads', t => {
     const payloadsHashMap = new Map([
         ["tx", fixtures.validTransactionOperation],

package/{test/protobuf/protobuf.test.js → tests/unit/utils/protobuf/operationHelpers.test.js}

@@ -1,9 +1,10 @@
 import test from 'brittle';
 import b4a from 'b4a';
 
-import applyOperations from '../../src/utils/protobuf/applyOperations.cjs';
-import fixtures from '../fixtures/protobuf.fixtures.js';
+import applyOperations from '../../../../src/utils/protobuf/applyOperations.cjs';
+import fixtures from '../../../fixtures/protobuf.fixtures.js';
 
+//TODO add missing operations tests and fill fixtures with them
 test('Happy path encode/decode roundtrip for protobuf applyOperation payloads', t => {
     const payloadsHashMap = new Map([
         ["txComplete", fixtures.validTransactionOperation],

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

@@ -0,0 +1,12 @@
+// This runner is auto-generated by Brittle
+
+import { default as test } from 'brittle';
+
+async function runTests() {
+	test.pause();
+	await import('./applyOperations.test.js');
+	await import('./operationHelpers.test.js');
+	test.resume();
+}
+
+await runTests();

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

@@ -0,0 +1,20 @@
+// This runner is auto-generated by Brittle
+
+import { default as test } from 'brittle';
+
+async function runTests() {
+	test.pause();
+
+	await import('./check/check.test.js');
+	await import('./protobuf/operationHelpers.test.js');
+	await import('./helpers/helpers.test.js');
+	await import('./fileUtils/readAddressesFromWhitelistFile.test.js');
+	await import('./fileUtils/readBalanceMigrationFile.test.js');
+	await import('./migrationUtils/validateAddressFromIncomingFile.test.js');
+	await import('./buffer/buffer.test.js')
+	await import('./amountSerialization/amountSerialization.test.js');
+	await import('./crypto/createHash.test.js');
+	test.resume();
+}
+
+await runTests();

package/test/all.test.js

@@ -1,23 +0,0 @@
-// This runner is auto-generated by Brittle
-
-import { default as test } from 'brittle';
-
-async function runTests() {
-  test.pause();
-
-  await import('./state/stateTests.test.js');
-  // await import('./state/apply.addAdmin.basic.test.js');
-  // await import('./check/check.test.js');
-  // await import('./protobuf/protobuf.test.js');
-  // await import('./functions/functions.test.js');
-  // await import('./fileUtils/readAddressesFromWhitelistFile.test.js');
-  // await import('./fileUtils/readBalanceMigrationFile.test.js');
-  // await import('./migrationUtils/validateAddressFromIncomingFile.test.js');
-  // await import('./messageOperations/stateMessageOperations.test.js');
-  // await import('./buffer/buffer.test.js')
-  // await import('./network/connectionManagerTests.test.js')
-  // await import('./apply/apply.test.js'); // This test has been disabled because Github CI fails due to lack of resources. This test can still be run locally but sometimes it hangs when destroying resources.
-  test.resume();
-}
-
-await runTests();