paid-services 7.0.2 → 7.0.3

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## Version 7.0.2
+## Version 7.0.3
 
 ### Breaking Changes
 

package/package.json

@@ -17,18 +17,16 @@
     "ecpair": "2.1.0",
     "goldengate": "15.0.0",
     "invoices": "5.0.2",
-    "ln-service": "58.0.2",
-    "ln-sync": "7.0.0",
+    "ln-service": "58.0.4",
+    "ln-sync": "7.0.1",
     "psbt": "5.0.0",
     "p2tr": "2.0.0",
     "tiny-secp256k1": "2.2.4"
   },
   "description": "Lightning Paid Services library",
   "devDependencies": {
-    "@alexbosworth/tap": "15.0.12",
     "ln-docker-daemons": "7.0.0",
-    "mock-lnd": "2.0.0",
-    "secp256k1": "5.0.1"
+    "mock-lnd": "3.0.0"
   },
   "engines": {
     "node": ">=20"
@@ -45,8 +43,8 @@
     "url": "https://github.com/alexbosworth/paid-services.git"
   },
   "scripts": {
-    "integration-tests": "tap -j 1 --branches=1 --functions=1 --lines=1 --statements=1 -t 2700 test/integration/*.js",
+    "integration-tests": "node test/integration",
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 60 test/actions/*.js test/balanced/*.js test/capacity/*.js test/client/*.js test/config/*.js test/p2p/*.js test/records/*.js test/respond/*.js test/server/*.js test/swaps/*.js test/services/*.js test/trades/*.js"
   },
-  "version": "7.0.2"
+  "version": "7.0.3"
 }

package/test/integration/test_accept_capacity_change.js

@@ -1,3 +1,6 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const {address} = require('bitcoinjs-lib');
 const asyncAuto = require('async/auto');
 const asyncMap = require('async/map');
@@ -12,7 +15,6 @@ const {getNetwork} = require('ln-sync');
 const {networks} = require('bitcoinjs-lib');
 const {openChannel} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const {Transaction} = require('bitcoinjs-lib');
 
 const accept = require('./../../capacity/accept_capacity_change');
@@ -38,7 +40,7 @@ const {toOutputScript} = address;
 const weightAsVBytes = n => Math.ceil(n / 4);
 
 // A capacity replacement proposal should be counter signed and accepted
-test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
+test(`Accept capacity replacement`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target] = nodes;
@@ -125,8 +127,6 @@ test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
           transaction_vout: channel.transaction_vout,
         });
 
-        proposeDone = true;
-
         return;
       },
 
@@ -164,7 +164,7 @@ test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
           throw new Error('ExpectedChannelActivation');
         });
 
-        strictSame(recreated.is_active, true, 'Recreated channel is active');
+        equal(recreated.is_active, true, 'Recreated channel is active');
       }],
 
       confirmControl: ['accept', 'propose', async ({}) => {
@@ -190,14 +190,12 @@ test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
           throw new Error('ExpectedChannelActivation');
         });
 
-        strictSame(recreated.is_active, true, 'Recreated channel is active');
+        equal(recreated.is_active, true, 'Recreated channel is active');
       }],
     });
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_change_channel_capacity.js

@@ -1,3 +1,6 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const {address} = require('bitcoinjs-lib');
 const asyncAuto = require('async/auto');
 const asyncMap = require('async/map');
@@ -12,7 +15,6 @@ const {getNetwork} = require('ln-sync');
 const {networks} = require('bitcoinjs-lib');
 const {openChannel} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const {Transaction} = require('bitcoinjs-lib');
 
 const {changeChannelCapacity} = require('./../../capacity');
@@ -32,7 +34,7 @@ const {toOutputScript} = address;
 const weightAsVBytes = n => Math.ceil(n / 4);
 
 // A capacity replacement proposal should be counter signed and accepted
-test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
+test(`Accept capacity replacement`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target] = nodes;
@@ -201,10 +203,8 @@ test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
       }],
     });
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_decrease_channel_capacity.js

@@ -1,3 +1,6 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const {address} = require('bitcoinjs-lib');
 const asyncAuto = require('async/auto');
 const asyncMap = require('async/map');
@@ -12,7 +15,6 @@ const {getNetwork} = require('ln-sync');
 const {networks} = require('bitcoinjs-lib');
 const {openChannel} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const {Transaction} = require('bitcoinjs-lib');
 
 const {changeChannelCapacity} = require('./../../capacity');
@@ -32,7 +34,7 @@ const {toOutputScript} = address;
 const weightAsVBytes = n => Math.ceil(n / 4);
 
 // A capacity replacement proposal should be counter signed and accepted
-test(`Decrease capacity replacement`, async ({end, equal, strictSame}) => {
+test(`Decrease capacity replacement`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target] = nodes;
@@ -214,10 +216,8 @@ test(`Decrease capacity replacement`, async ({end, equal, strictSame}) => {
       }],
     });
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_fanout.js

@@ -1,4 +1,7 @@
-const {once} = require('events');
+const {deepStrictEqual} = require('node:assert').strict;
+const {equal} = require('node:assert').strict;
+const {once} = require('node:events');
+const test = require('node:test');
 
 const {addPeer} = require('ln-service');
 const asyncEach = require('async/each');
@@ -12,7 +15,6 @@ const {getUtxos} = require('ln-service');
 const {networks} = require('bitcoinjs-lib');
 const {sendToChainAddress} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const tinysecp = require('tiny-secp256k1');
 
 const assembleGroup = require('./../../groups/fanout/assemble_fanout_group');
@@ -24,7 +26,7 @@ const capacity = 1e5;
 const count = 101;
 const feeRate = 1;
 const format = 'p2tr';
-const interval = 10;
+const interval = 50;
 const outputCount = 2;
 const outputCountControl = 4;
 const size = 3;
@@ -33,7 +35,7 @@ const times = 2000;
 const uniq = arr => Array.from(new Set(arr));
 
 // Make a joint transaction fanout group
-test(`Setup joint fanout group`, async ({end, equal, strictSame}) => {
+test(`Setup joint fanout group`, async () => {
   const ecp = (await import('ecpair')).ECPairFactory(tinysecp);
   const {kill, nodes} = await spawnLightningCluster({size});
 
@@ -75,6 +77,8 @@ test(`Setup joint fanout group`, async ({end, equal, strictSame}) => {
 
     // Wait for UTXOs to be confirmed
     await asyncRetry({interval, times}, async () => {
+      await generate({});
+
       const remoteUtxos = await getUtxos({lnd: remote.lnd});
       const targetUtxos = await getUtxos({lnd: target.lnd});
 
@@ -152,7 +156,7 @@ test(`Setup joint fanout group`, async ({end, equal, strictSame}) => {
     // Transaction ids of the open should be returned
     const ids = joins.map(n => n.id);
 
-    strictSame(uniq(ids).length, 1, 'Only one transaction id');
+    equal(uniq(ids).length, 1, 'Only one transaction id');
 
     // Finished, wait for confirmations on fanout utxos
     await generate({count});
@@ -183,7 +187,7 @@ test(`Setup joint fanout group`, async ({end, equal, strictSame}) => {
           .filter(n => n.tokens === capacity)
           .length;
 
-        strictSame(utxosCount, count, 'Got expected UTXOs count');
+        equal(utxosCount, count, 'Got expected UTXOs count');
       });
     });
 
@@ -200,21 +204,19 @@ test(`Setup joint fanout group`, async ({end, equal, strictSame}) => {
     const changeOutput2 = components.outputs
       .find(n => n.tokens === 799809 || n.tokens === 799810);
 
-    strictSame(components.inputs.length, 3, 'Got expected inputs count');
-    strictSame(components.outputs.length, 11, 'Got expected outputs count');
-    strictSame(fundedOuts.length, 8, 'Got expected funded outputs count');
-    strictSame(!!changeOutput1, true, 'Got change output 1');
-    strictSame(!!changeOutput2, true, 'Got change output 2');
-    strictSame(!!controlExtra, true, 'Got control change output');
-    strictSame(ids, [events.broadcast.id, events.broadcast.id], 'Got tx ids');
-    strictSame(events.broadcast.id.length, 64, 'Got broadcast tx id');
-    strictSame(!!events.broadcast.transaction, true, 'Got broadcast tx');
-    strictSame(events.filled.ids.length, nodes.length, 'Got filled event');
+    equal(components.inputs.length, 3, 'Got expected inputs count');
+    equal(components.outputs.length, 11, 'Got expected outputs count');
+    equal(fundedOuts.length, 8, 'Got expected funded outputs count');
+    equal(!!changeOutput1, true, 'Got change output 1');
+    equal(!!changeOutput2, true, 'Got change output 2');
+    equal(!!controlExtra, true, 'Got control change output');
+    deepStrictEqual(ids, [events.broadcast.id, events.broadcast.id], 'Got id');
+    equal(events.broadcast.id.length, 64, 'Got broadcast tx id');
+    equal(!!events.broadcast.transaction, true, 'Got broadcast tx');
+    equal(events.filled.ids.length, nodes.length, 'Got filled event');
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_group.js

@@ -1,4 +1,7 @@
-const {once} = require('events');
+const {deepStrictEqual} = require('node:assert').strict;
+const {equal} = require('node:assert').strict;
+const {once} = require('node:events');
+const test = require('node:test');
 
 const {addPeer} = require('ln-service');
 const asyncMap = require('async/map');
@@ -11,7 +14,6 @@ const {getUtxos} = require('ln-service');
 const {networks} = require('bitcoinjs-lib');
 const {sendToChainAddress} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const tinysecp = require('tiny-secp256k1');
 
 const assembleChannelGroup = require('./../../groups/assemble_channel_group');
@@ -28,7 +30,7 @@ const tokens = 1e6;
 const times = 2000;
 
 // Make a joint transaction channel group
-test(`Setup joint channel group`, async ({end, equal, strictSame}) => {
+test(`Setup joint channel group`, async () => {
   const ecp = (await import('ecpair')).ECPairFactory(tinysecp);
   const {kill, nodes} = await spawnLightningCluster({size});
 
@@ -138,8 +140,8 @@ test(`Setup joint channel group`, async ({end, equal, strictSame}) => {
 
       const [{inbound, outbound}] = await once(join, 'peering');
 
-      strictSame(!!inbound, true, 'Received inbound peer');
-      strictSame(!!outbound, true, 'Received outbound peer');
+      equal(!!inbound, true, 'Received inbound peer');
+      equal(!!outbound, true, 'Received outbound peer');
 
       const [tx] = await once(join, 'end');
 
@@ -160,15 +162,13 @@ test(`Setup joint channel group`, async ({end, equal, strictSame}) => {
       }
     });
 
-    strictSame(ids, [events.broadcast.id, events.broadcast.id], 'Got tx ids');
-    strictSame(events.broadcast.id.length, 64, 'Got broadcast tx id');
-    strictSame(!!events.broadcast.transaction, true, 'Got broadcast tx');
-    strictSame(events.filled.ids.length, nodes.length, 'Got filled event');
+    deepStrictEqual(ids, [events.broadcast.id, events.broadcast.id], 'Got tx ids');
+    equal(events.broadcast.id.length, 64, 'Got broadcast tx id');
+    equal(!!events.broadcast.transaction, true, 'Got broadcast tx');
+    equal(events.filled.ids.length, nodes.length, 'Got filled event');
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_group_noninteractive.js

@@ -1,8 +1,8 @@
-const {once} = require('events');
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
 
 const {addPeer} = require('ln-service');
 const asyncAuto = require('async/auto');
-const asyncMap = require('async/map');
 const asyncRetry = require('async/retry');
 const {createChainAddress} = require('ln-service');
 const {getChainTransactions} = require('ln-service');
@@ -12,7 +12,6 @@ const {getUtxos} = require('ln-service');
 const {networks} = require('bitcoinjs-lib');
 const {sendToChainAddress} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {createGroupChannel} = require('./../../');
 const {joinGroupChannel} = require('./../../');
@@ -26,7 +25,7 @@ const tokens = 1e6;
 const times = 2000;
 
 // Make a joint transaction channel group non-interactively
-test(`Setup joint channel group`, async ({end, equal, strictSame}) => {
+test(`Setup joint channel group`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target] = nodes;
@@ -121,12 +120,10 @@ test(`Setup joint channel group`, async ({end, equal, strictSame}) => {
 
     const ids = [group.join.transaction_id, group.create.transaction_id];
 
-    strictSame(ids.length, nodes.length, 'Got tx ids');
+    equal(ids.length, nodes.length, 'Got tx ids');
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_group_pair.js

@@ -1,4 +1,7 @@
-const {once} = require('events');
+const {deepStrictEqual} = require('node:assert').strict;
+const {equal} = require('node:assert').strict;
+const {once} = require('node:events');
+const test = require('node:test');
 
 const {addPeer} = require('ln-service');
 const asyncMap = require('async/map');
@@ -11,7 +14,6 @@ const {getUtxos} = require('ln-service');
 const {networks} = require('bitcoinjs-lib');
 const {sendToChainAddress} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const tinysecp = require('tiny-secp256k1');
 
 const assembleChannelGroup = require('./../../groups/assemble_channel_group');
@@ -28,7 +30,7 @@ const tokens = 1e6;
 const times = 2000;
 
 // Make a joint transaction channel group
-test(`Setup joint channel group`, async ({end, equal, strictSame}) => {
+test(`Setup joint channel group`, async () => {
   const ecp = (await import('ecpair')).ECPairFactory(tinysecp);
   const {kill, nodes} = await spawnLightningCluster({size});
 
@@ -129,15 +131,13 @@ test(`Setup joint channel group`, async ({end, equal, strictSame}) => {
       }
     });
 
-    strictSame(ids, [events.broadcast.id], 'Got tx ids');
-    strictSame(events.broadcast.id.length, 64, 'Got broadcast tx id');
-    strictSame(!!events.broadcast.transaction, true, 'Got broadcast tx');
-    strictSame(events.filled.ids.length, nodes.length, 'Got filled event');
+    deepStrictEqual(ids, [events.broadcast.id], 'Got tx ids');
+    equal(events.broadcast.id.length, 64, 'Got broadcast tx id');
+    equal(!!events.broadcast.transaction, true, 'Got broadcast tx');
+    equal(events.filled.ids.length, nodes.length, 'Got filled event');
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_group_sort.js

@@ -1,4 +1,6 @@
-const {once} = require('events');
+const {equal} = require('node:assert').strict;
+const {once} = require('node:events');
+const test = require('node:test');
 
 const {addPeer} = require('ln-service');
 const asyncMap = require('async/map');
@@ -11,7 +13,6 @@ const {getUtxos} = require('ln-service');
 const {networks} = require('bitcoinjs-lib');
 const {sendToChainAddress} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const tinysecp = require('tiny-secp256k1');
 
 const assembleChannelGroup = require('./../../groups/assemble_channel_group');
@@ -28,7 +29,7 @@ const tokens = 1e6;
 const times = 2000;
 
 // Make a joint transaction channel group with a sort defined
-test(`Setup sorted channel group`, async ({end, equal, strictSame}) => {
+test(`Setup sorted channel group`, async () => {
   const ecp = (await import('ecpair')).ECPairFactory(tinysecp);
   const {kill, nodes} = await spawnLightningCluster({size});
 
@@ -149,26 +150,26 @@ test(`Setup sorted channel group`, async ({end, equal, strictSame}) => {
 
       switch (node.id) {
       case (extra.id):
-        strictSame(inbound, control.id, 'Extra inbound is control');
-        strictSame(outbound, remote.id, 'Extra outbound is remote');
+        equal(inbound, control.id, 'Extra inbound is control');
+        equal(outbound, remote.id, 'Extra outbound is remote');
         break;
 
       case (remote.id):
-        strictSame(inbound, extra.id, 'Remote inbound is extra');
-        strictSame(outbound, target.id, 'Remote outbound is target');
+        equal(inbound, extra.id, 'Remote inbound is extra');
+        equal(outbound, target.id, 'Remote outbound is target');
         break;
 
       case (target.id):
-        strictSame(inbound, remote.id, 'Target inbound is remote');
-        strictSame(outbound, control.id, 'Target outbound is control');
+        equal(inbound, remote.id, 'Target inbound is remote');
+        equal(outbound, control.id, 'Target outbound is control');
         break;
 
       default:
         break;
       }
 
-      strictSame(!!inbound, true, 'Received inbound peer');
-      strictSame(!!outbound, true, 'Received outbound peer');
+      equal(!!inbound, true, 'Received inbound peer');
+      equal(!!outbound, true, 'Received outbound peer');
 
       const [tx] = await once(join, 'end');
 
@@ -189,14 +190,12 @@ test(`Setup sorted channel group`, async ({end, equal, strictSame}) => {
       }
     });
 
-    strictSame(events.broadcast.id.length, 64, 'Got broadcast tx id');
-    strictSame(!!events.broadcast.transaction, true, 'Got broadcast tx');
-    strictSame(events.filled.ids.length, nodes.length, 'Got filled event');
+    equal(events.broadcast.id.length, 64, 'Got broadcast tx id');
+    equal(!!events.broadcast.transaction, true, 'Got broadcast tx');
+    equal(events.filled.ids.length, nodes.length, 'Got filled event');
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_increase_channel_capacity.js

@@ -1,3 +1,6 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const {address} = require('bitcoinjs-lib');
 const asyncAuto = require('async/auto');
 const asyncMap = require('async/map');
@@ -12,7 +15,6 @@ const {getNetwork} = require('ln-sync');
 const {networks} = require('bitcoinjs-lib');
 const {openChannel} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const {Transaction} = require('bitcoinjs-lib');
 
 const {changeChannelCapacity} = require('./../../capacity');
@@ -31,7 +33,7 @@ const {toOutputScript} = address;
 const weightAsVBytes = n => Math.ceil(n / 4);
 
 // A capacity replacement proposal should be counter signed and accepted
-test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
+test(`Accept capacity replacement`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target] = nodes;
@@ -193,10 +195,8 @@ test(`Accept capacity replacement`, async ({end, equal, strictSame}) => {
       }],
     });
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_move_channel_capacity.js

@@ -1,3 +1,6 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const {addPeer} = require('ln-service');
 const {address} = require('bitcoinjs-lib');
 const asyncAuto = require('async/auto');
@@ -13,7 +16,6 @@ const {getNetwork} = require('ln-sync');
 const {networks} = require('bitcoinjs-lib');
 const {openChannel} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const {Transaction} = require('bitcoinjs-lib');
 
 const {changeChannelCapacity} = require('./../../capacity');
@@ -33,7 +35,7 @@ const {toOutputScript} = address;
 const weightAsVBytes = n => Math.ceil(n / 4);
 
 // A capacity movement proposal should be counter signed and accepted
-test(`Move channel capacity`, async ({end, equal, strictSame}) => {
+test(`Move channel capacity`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target, remote] = nodes;
@@ -221,10 +223,8 @@ test(`Move channel capacity`, async ({end, equal, strictSame}) => {
       }],
     });
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_request_swap_out.js

@@ -1,3 +1,6 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const asyncRetry = require('async/retry');
 const {broadcastChainTransaction} = require('ln-service');
 const {createChainAddress} = require('ln-service');
@@ -9,7 +12,6 @@ const {openChannel} = require('ln-service');
 const {pay} = require('ln-service');
 const {sendToChainAddress} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const requestSwapOut = require('./../../swaps/request_swap_out');
 const respondToSwapOut = require('./../../swaps/respond_to_swap_out_request');
@@ -24,7 +26,7 @@ const times = 3000;
 const tokens = 1e5;
 
 // Start an offchain swap
-test(`Start offchain swap`, async ({end, equal, strictSame}) => {
+test(`Start offchain swap`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [{generate, id, lnd}, target] = nodes;
@@ -35,7 +37,7 @@ test(`Start offchain swap`, async ({end, equal, strictSame}) => {
   if (!keys.find(n => n.derivation_path === taprootDerivationPath)) {
     await kill({});
 
-    return end();
+    return;
   }
 
   try {
@@ -166,10 +168,8 @@ test(`Start offchain swap`, async ({end, equal, strictSame}) => {
       min_confirmations: 3,
     });
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   }
 
   await kill({});
-
-  return end();
-});
+});

package/test/integration/test_service_peer_requests.js

@@ -1,6 +1,9 @@
+const {deepStrictEqual} = require('node:assert').strict;
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const {addPeer} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const {makePeerRequest} = require('./../../');
 const {servicePeerRequests} = require('./../../');
@@ -12,7 +15,7 @@ const size = 2;
 const type = '0';
 
 // Adding a listener for peer requests should allow responding to peer requests
-test(`Listen for peer requests`, async ({end, equal, strictSame}) => {
+test(`Listen for peer requests`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [{id, lnd}, target] = nodes;
@@ -34,7 +37,7 @@ test(`Listen for peer requests`, async ({end, equal, strictSame}) => {
       to: id,
     });
 
-    strictSame(records, got.records, 'Got response records');
+    deepStrictEqual(records, got.records, 'Got response records');
   } catch (err) {
     equal(err, null, 'Expected no error making peer request');
   }
@@ -48,12 +51,10 @@ test(`Listen for peer requests`, async ({end, equal, strictSame}) => {
       to: id,
     });
 
-    strictSame(got, null, 'Expected failure response for failure type');
+    equal(got, null, 'Expected failure response for failure type');
   } catch (err) {
-    strictSame(err, failure, 'Got failure response for failure type');
+    deepStrictEqual(err, failure, 'Got failure response for failure type');
   }
 
   await kill({});
-
-  return end();
 });

package/test/integration/test_sign_capacity_replacement.js

@@ -1,3 +1,6 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const {address} = require('bitcoinjs-lib');
 const asyncMap = require('async/map');
 const asyncRetry = require('async/retry');
@@ -9,7 +12,6 @@ const {getChannels} = require('ln-service');
 const {networks} = require('bitcoinjs-lib');
 const {openChannel} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const {Transaction} = require('bitcoinjs-lib');
 
 const finalize = require('./../../capacity/finalize_capacity_replacement');
@@ -31,7 +33,7 @@ const {toOutputScript} = address;
 const weightAsVBytes = n => Math.ceil(n / 4);
 
 // Signing a capacity replacement transaction should result in a valid sig
-test(`Sign capacity replacement`, async ({end, equal, strictSame}) => {
+test(`Sign capacity replacement`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [{generate, lnd}, target] = nodes;
@@ -133,12 +135,10 @@ test(`Sign capacity replacement`, async ({end, equal, strictSame}) => {
       return tx.id === fromHex(transaction).getId();
     });
 
-    strictSame(done.is_confirmed, true, 'Signed replacement is confirmed');
+    equal(done.is_confirmed, true, 'Signed replacement is confirmed');
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_split_channel_capacity.js

@@ -1,3 +1,6 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const {addPeer} = require('ln-service');
 const {address} = require('bitcoinjs-lib');
 const asyncAuto = require('async/auto');
@@ -13,7 +16,6 @@ const {getNetwork} = require('ln-sync');
 const {networks} = require('bitcoinjs-lib');
 const {openChannel} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 const {Transaction} = require('bitcoinjs-lib');
 
 const {changeChannelCapacity} = require('./../../capacity');
@@ -35,7 +37,7 @@ const {toOutputScript} = address;
 const weightAsVBytes = n => Math.ceil(n / 4);
 
 // A capacity replacement proposal should be counter signed and accepted
-test(`Decrease capacity replacement`, async ({end, equal, strictSame}) => {
+test(`Decrease capacity replacement`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [control, target, remote] = nodes;
@@ -234,10 +236,8 @@ test(`Decrease capacity replacement`, async ({end, equal, strictSame}) => {
       }],
     });
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   } finally {
     await kill({});
   }
-
-  return end();
 });

package/test/integration/test_swap_with_claim_path.js

@@ -1,3 +1,6 @@
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const asyncRetry = require('async/retry');
 const {broadcastChainTransaction} = require('ln-service');
 const {createChainAddress} = require('ln-service');
@@ -9,7 +12,6 @@ const {openChannel} = require('ln-service');
 const {pay} = require('ln-service');
 const {sendToChainAddress} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const requestSwapOut = require('./../../swaps/request_swap_out');
 const respondToSwapOut = require('./../../swaps/respond_to_swap_out_request');
@@ -24,7 +26,7 @@ const times = 3000;
 const tokens = 1e5;
 
 // Start an offchain swap but use the claim path to sweep
-test(`Swap with claim path`, async ({end, equal, strictSame}) => {
+test(`Swap with claim path`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [{generate, id, lnd}, target] = nodes;
@@ -35,7 +37,7 @@ test(`Swap with claim path`, async ({end, equal, strictSame}) => {
   if (!keys.find(n => n.derivation_path === taprootDerivationPath)) {
     await kill({});
 
-    return end();
+    return;
   }
 
   try {
@@ -168,10 +170,8 @@ test(`Swap with claim path`, async ({end, equal, strictSame}) => {
       },
     });
   } catch (err) {
-    strictSame(err, null, 'Expected no failure');
+    equal(err, null, 'Expected no failure');
   }
 
   await kill({});
-
-  return end();
-});
+});

package/test/integration/test_swap_with_refund_path.js

@@ -1,3 +1,7 @@
+const {deepStrictEqual} = require('node:assert').strict;
+const {equal} = require('node:assert').strict;
+const test = require('node:test');
+
 const asyncRetry = require('async/retry');
 const {createChainAddress} = require('ln-service');
 const {createInvoice} = require('ln-service');
@@ -8,7 +12,6 @@ const {openChannel} = require('ln-service');
 const {pay} = require('ln-service');
 const {sendToChainAddress} = require('ln-service');
 const {spawnLightningCluster} = require('ln-docker-daemons');
-const {test} = require('@alexbosworth/tap');
 
 const requestSwapOut = require('./../../swaps/request_swap_out');
 const respondToSwapOut = require('./../../swaps/respond_to_swap_out_request');
@@ -23,7 +26,7 @@ const times = 3000;
 const tokens = 1e5;
 
 // Start an offchain swap but do not cooperate and eventually force a refund
-test(`Timeout a swap`, async ({end, equal, strictSame}) => {
+test(`Timeout a swap`, async () => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [{generate, id, lnd}, target] = nodes;
@@ -37,7 +40,7 @@ test(`Timeout a swap`, async ({end, equal, strictSame}) => {
   if (!keys.find(n => n.derivation_path === taprootDerivationPath)) {
     await kill({});
 
-    return end();
+    return;
   }
 
   try {
@@ -153,7 +156,7 @@ test(`Timeout a swap`, async ({end, equal, strictSame}) => {
               },
             });
           } catch (err) {
-            strictSame(err, [503, 'SwapFailedViaTimeout']);
+            deepStrictEqual(err, [503, 'SwapFailedViaTimeout']);
 
             return;
           }
@@ -180,14 +183,12 @@ test(`Timeout a swap`, async ({end, equal, strictSame}) => {
   } catch (err) {
     const [, msg] = err;
 
-    strictSame(msg, 'PaymentRejectedByDestination', 'Expected failed swap');
+    equal(msg, 'PaymentRejectedByDestination', 'Expected failed swap');
   }
 
   const complete = responder.find(n => !!n.swap_timeout_complete);
 
-  strictSame(!!complete, true, 'Swap refund completed');
+  equal(!!complete, true, 'Swap refund completed');
 
   await kill({});
-
-  return end();
-});
+});

package/test/integration.js

@@ -0,0 +1,18 @@
+const {join} = require('node:path');
+const {readdirSync} = require('node:fs');
+const {run} = require('node:test');
+const {tap} = require('node:test/reporters');
+
+const concurrency = 1;
+const timeout = 1000 * 60 * 5;
+
+const dirs = ['integration'];
+
+const asPath = file => join(file.path || file.parentPath, file.name);
+const flatten = arr => [].concat(...arr);
+
+const files = flatten(dirs.map(dir => {
+  return readdirSync(join(__dirname, dir), {withFileTypes: true}).map(asPath);
+}));
+
+run({concurrency, files, timeout}).compose(tap).pipe(process.stdout);