ln-service 53.6.0 → 53.7.3

package/test/integration/test_remove_peer.js

@@ -14,21 +14,25 @@ test(`Remove a peer`, async ({end, equal}) => {
 
   const [{id, lnd}, target] = nodes;
 
-  await asyncRetry({interval: 10, times: 2000}, async () => {
-    await addPeer({lnd, public_key: target.id, socket: target.socket});
-  });
+  try {
+    await asyncRetry({interval: 10, times: 2000}, async () => {
+      await addPeer({lnd, public_key: target.id, socket: target.socket});
+    });
 
-  const {peers} = await getPeers({lnd});
+    const {peers} = await getPeers({lnd});
 
-  const [targetPeer] = peers;
+    const [targetPeer] = peers;
 
-  equal(targetPeer.public_key, target.id, 'Peer is added');
+    equal(targetPeer.public_key, target.id, 'Peer is added');
 
-  await removePeer({lnd, public_key: targetPeer.public_key});
+    await removePeer({lnd, public_key: targetPeer.public_key});
 
-  const postRemovalPeers = await getPeers({lnd});
+    const postRemovalPeers = await getPeers({lnd});
 
-  equal(postRemovalPeers.peers.length, [].length, 'Peer is removed');
+    equal(postRemovalPeers.peers.length, [].length, 'Peer is removed');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
 
   await kill({});
 

package/test/integration/test_send_message_to_peer.js

@@ -8,7 +8,7 @@ const {subscribeToPeerMessages} = require('./../../');
 
 const interval = 10;
 const size = 2;
-const times = 1000;
+const times = 2000;
 
 // Sending a message to a peer should result in the message received
 test(`Send peer message`, async ({end, equal, strictSame}) => {
@@ -33,39 +33,50 @@ test(`Send peer message`, async ({end, equal, strictSame}) => {
     }
   }
 
-  await asyncRetry({interval, times}, async () => {
-    await addPeer({lnd, public_key: target.id, socket: target.socket});
-  });
+  try {
+    await asyncRetry({interval, times}, async () => {
+      await addPeer({
+        lnd,
+        public_key: target.id,
+        retry_count: 1,
+        retry_delay: 1,
+        socket: target.socket,
+        timeout: 1000,
+      });
+    });
 
-  const sub = subscribeToPeerMessages({lnd: target.lnd});
+    const sub = subscribeToPeerMessages({lnd: target.lnd});
 
-  const messages = [];
+    const messages = [];
 
-  sub.on('message_received', message => messages.push(message));
+    sub.on('message_received', message => messages.push(message));
 
-  await asyncRetry({interval, times}, async () => {
-    await sendMessageToPeer({
-      lnd,
-      message: Buffer.from('message').toString('hex'),
-      public_key: target.id,
-    });
+    await asyncRetry({interval, times}, async () => {
+      await sendMessageToPeer({
+        lnd,
+        message: Buffer.from('message').toString('hex'),
+        public_key: target.id,
+      });
 
-    if (!messages.length) {
-      throw new Error('ExpectedMessage');
-    }
-  });
-
-  const [message] = messages;
+      if (!messages.length) {
+        throw new Error('ExpectedMessage');
+      }
+    });
 
-  strictSame(
-    message,
-    {
-      message: Buffer.from('message').toString('hex'),
-      public_key: id,
-      type: 32768,
-    },
-    'Message successfully sent to peer'
-  );
+    const [message] = messages;
+
+    strictSame(
+      message,
+      {
+        message: Buffer.from('message').toString('hex'),
+        public_key: id,
+        type: 32768,
+      },
+      'Message successfully sent to peer'
+    );
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
 
   await kill({});
 

package/test/integration/test_subscribe_to_channels.js

@@ -5,7 +5,6 @@ const {test} = require('@alexbosworth/tap');
 const {addPeer} = require('./../../');
 const {closeChannel} = require('./../../');
 const {getChainBalance} = require('./../../');
-const {getHeight} = require('./../../');
 const {getWalletInfo} = require('./../../');
 const {openChannel} = require('./../../');
 const {removePeer} = require('./../../');
@@ -16,7 +15,7 @@ const defaultFee = 1e3;
 const giveTokens = 1e5;
 const interval = 100;
 const size = 2;
-const times = 20;
+const times = 200;
 
 // Subscribing to channels should trigger channel events
 test('Subscribe to channels', async ({end, equal, fail}) => {

package/test/integration/test_subscribe_to_invoices.js

@@ -4,13 +4,9 @@ const {routeFromHops} = require('bolt07');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
-const {cancelHodlInvoice} = require('./../../');
 const {createInvoice} = require('./../../');
 const {getChannel} = require('./../../');
-const {getChannels} = require('./../../');
-const {getHeight} = require('./../../');
 const {pay} = require('./../../');
-const {payViaRoutes} = require('./../../');
 const {setupChannel} = require('./../macros');
 const {subscribeToInvoices} = require('./../../');
 
@@ -37,107 +33,113 @@ test('Subscribe to invoices', async ({end, equal, fail}) => {
 
   const destination = control.id;
 
-  // Create a channel from the control to the target node
-  const controlToTargetChannel = await setupChannel({
-    generate,
-    lnd,
-    give: 1e5,
-    to: target,
-  });
+  try {
+    await generate({count: 100});
 
-  // Create a channel from the target back to the control
-  const targetToControlChannel = await setupChannel({
-    lnd: target.lnd,
-    generate: target.generate,
-    give: 1e5,
-    to: control,
-  });
-
-  // Created invoices are emitted
-  {
-    const sub = subscribeToInvoices({lnd, restart_delay_ms: 1});
+    // Create a channel from the control to the target node
+    const controlToTargetChannel = await setupChannel({
+      generate,
+      lnd,
+      give: 1e5,
+      to: target,
+    });
 
-    const updates = [];
+    // Create a channel from the target back to the control
+    const targetToControlChannel = await setupChannel({
+      lnd: target.lnd,
+      generate: target.generate,
+      give: 1e5,
+      to: control,
+    });
 
-    sub.on('invoice_updated', updated => updates.push(updated));
+    // Created invoices are emitted
+    {
+      const sub = subscribeToInvoices({lnd, restart_delay_ms: 1});
 
-    const update = await asyncRetry({interval, times}, async () => {
-      await createInvoice({lnd});
+      const updates = [];
 
-      const [update] = updates;
+      sub.on('invoice_updated', updated => updates.push(updated));
 
-      if (!update) {
-        throw new Error('ExpectedInvoiceUpdate');
-      }
+      const update = await asyncRetry({interval, times}, async () => {
+        await createInvoice({lnd});
 
-      return update;
-    });
+        const [update] = updates;
 
-    equal(update.tokens, 0, 'Invoiced zero');
+        if (!update) {
+          throw new Error('ExpectedInvoiceUpdate');
+        }
 
-    sub.removeAllListeners();
-  }
+        return update;
+      });
 
-  // Paid invoices are emitted
-  {
-    const sub = subscribeToInvoices({lnd, restart_delay_ms: 1});
+      equal(update.tokens, 0, 'Invoiced zero');
 
-    const updates = [];
+      sub.removeAllListeners();
+    }
 
-    sub.on('invoice_updated', updated => updates.push(updated));
+    // Paid invoices are emitted
+    {
+      const sub = subscribeToInvoices({lnd, restart_delay_ms: 1});
 
-    const update = await asyncRetry({interval, times}, async () => {
-      await pay({
-        lnd: target.lnd,
-        request: (await createInvoice({lnd, tokens})).request,
-      });
+      const updates = [];
 
-      const [update] = updates.filter(n => n.is_confirmed);
+      sub.on('invoice_updated', updated => updates.push(updated));
 
-      if (!update) {
-        throw new Error('ExpectedPaidInvoiceUpdate');
-      }
+      const update = await asyncRetry({interval, times}, async () => {
+        await pay({
+          lnd: target.lnd,
+          request: (await createInvoice({lnd, tokens})).request,
+        });
 
-      return update;
-    });
+        const [update] = updates.filter(n => n.is_confirmed);
 
-    equal(!!update.confirmed_at, true, 'Got receive date');
-    equal(!!update.confirmed_index, true, 'Got confirm index');
-    equal(update.payments.length, 1, 'Got received HTLC');
-    equal(update.received, tokens, 'Got received tokens');
-    equal(update.received_mtokens, '10000000', 'Got invoice mtokens');
+        if (!update) {
+          throw new Error('ExpectedPaidInvoiceUpdate');
+        }
 
-    sub.removeAllListeners();
-  }
+        return update;
+      });
 
-  // Old invoices are emitted
-  {
-    const sub = subscribeToInvoices({
-      lnd,
-      added_after: 1,
-      restart_delay_ms: 1,
-    });
+      equal(!!update.confirmed_at, true, 'Got receive date');
+      equal(!!update.confirmed_index, true, 'Got confirm index');
+      equal(update.payments.length, 1, 'Got received HTLC');
+      equal(update.received, tokens, 'Got received tokens');
+      equal(update.received_mtokens, '10000000', 'Got invoice mtokens');
+
+      sub.removeAllListeners();
+    }
+
+    // Old invoices are emitted
+    {
+      const sub = subscribeToInvoices({
+        lnd,
+        added_after: 1,
+        restart_delay_ms: 1,
+      });
 
-    const updates = [];
+      const updates = [];
 
-    sub.on('invoice_updated', updated => updates.push(updated));
+      sub.on('invoice_updated', updated => updates.push(updated));
 
-    const update = await asyncRetry({interval, times}, async () => {
-      const [update] = updates;
+      const update = await asyncRetry({interval, times}, async () => {
+        const [update] = updates;
 
-      if (!update) {
-        throw new Error('ExpectedPastInvoiceUpdate');
-      }
+        if (!update) {
+          throw new Error('ExpectedPastInvoiceUpdate');
+        }
 
-      return update;
-    });
+        return update;
+      });
 
-    equal(update.index, 2, 'Got past update');
+      equal(update.index, 2, 'Got past update');
 
-    sub.removeAllListeners();
+      sub.removeAllListeners();
+    }
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
   }
 
-  await kill({});
-
   return end();
 });

package/test/integration/test_subscribe_to_peer_messages.js

@@ -16,98 +16,106 @@ test(`Subscribe to peer messages`, async ({end, equal, strictSame}) => {
 
   const [{lnd}, target, remote] = nodes;
 
-  await addPeer({
-    lnd,
-    public_key: target.id,
-    socket: target.socket,
-  });
-
-  await addPeer({
-    lnd: target.lnd,
-    public_key: remote.id,
-    socket: remote.socket,
-  });
-
   try {
-    await sendMessageToPeer({
-      lnd,
-      message: Buffer.from('message').toString('hex'),
-      public_key: target.id,
+    await asyncRetry({interval, times}, async () => {
+      await addPeer({
+        lnd,
+        public_key: target.id,
+        socket: target.socket,
+      });
     });
-  } catch (err) {
-    const [code] = err;
 
-    // Send message to peer is not supported on LND 0.13.4 or lower
-    if (code === 501) {
-      await kill({});
+    await addPeer({
+      lnd: target.lnd,
+      public_key: remote.id,
+      socket: remote.socket,
+    });
+
+    try {
+      await sendMessageToPeer({
+        lnd,
+        message: Buffer.from('message').toString('hex'),
+        public_key: target.id,
+      });
+    } catch (err) {
+      const [code] = err;
 
-      return end();
+      // Send message to peer is not supported on LND 0.13.4 or lower
+      if (code === 501) {
+        await kill({});
+
+        return end();
+      }
     }
-  }
 
-  const messages = [];
-  const targetSub = subscribeToPeerMessages({lnd: target.lnd});
-  const remoteSub = subscribeToPeerMessages({lnd: remote.lnd});
-  const targetMessages = [];
+    const messages = [];
+    const targetSub = subscribeToPeerMessages({lnd: target.lnd});
+    const remoteSub = subscribeToPeerMessages({lnd: remote.lnd});
+    const targetMessages = [];
 
-  remoteSub.on('message_received', message => messages.push(message));
+    remoteSub.on('message_received', message => messages.push(message));
 
-  targetSub.on('message_received', async ({message, type}) => {
-    targetMessages.push(message);
+    targetSub.on('message_received', async ({message, type}) => {
+      targetMessages.push(message);
 
-    if (type !== 40805) {
-      return;
-    }
+      if (type !== 40805) {
+        return;
+      }
+
+      // Wait for message to appear
+      return await asyncRetry({interval, times}, async () => {
+      // Relay message from control to remote
+        await sendMessageToPeer({
+          message,
+          type,
+          lnd: target.lnd,
+          public_key: remote.id,
+        });
+
+        if (!messages.length) {
+          throw new Error('ExpectedMessage');
+        }
+      });
+    });
 
     // Wait for message to appear
-    return await asyncRetry({interval, times}, async () => {
-    // Relay message from control to remote
+    await asyncRetry({interval, times}, async () => {
+      // Control send a message to target peer
       await sendMessageToPeer({
-        message,
-        type,
-        lnd: target.lnd,
-        public_key: remote.id,
+        lnd,
+        message: Buffer.from('message to remote').toString('hex'),
+        public_key: target.id,
+        type: 40805,
       });
 
+      if (!targetMessages.length) {
+        throw new Error('ExpectedTargetMessageReceived');
+      }
+    });
+
+    // Wait for message to appear
+    await asyncRetry({interval, times}, async () => {
       if (!messages.length) {
         throw new Error('ExpectedMessage');
       }
     });
-  });
-
-  // Wait for message to appear
-  await asyncRetry({interval, times}, async () => {
-    // Control send a message to target peer
-    await sendMessageToPeer({
-      lnd,
-      message: Buffer.from('message to remote').toString('hex'),
-      public_key: target.id,
-      type: 40805,
-    });
-
-    if (!targetMessages.length) {
-      throw new Error('ExpectedTargetMessageReceived');
-    }
-  });
 
-  // Wait for message to appear
-  await asyncRetry({interval, times}, async () => {
-    if (!messages.length) {
-      throw new Error('ExpectedMessage');
-    }
-  });
-
-  strictSame(
-    messages,
-    [{
-      message: Buffer.from('message to remote').toString('hex'),
-      public_key: target.id,
-      type: 40805,
-    }],
-    'Message successfully relayed through target'
-  );
-
-  await kill({});
+    const [message] = messages;
+
+    strictSame(
+      message,
+      {
+        message: Buffer.from('message to remote').toString('hex'),
+        public_key: target.id,
+        type: 40805,
+      },
+      'Message successfully relayed through target'
+    );
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
+  }
 
   return end();
 });

package/test/integration/test_subscribe_to_peers.js

@@ -20,36 +20,40 @@ test(`Subscribe to peers`, async ({end, equal}) => {
 
   const [{generate, lnd}, target] = nodes;
 
-  const sub = subscribeToPeers({lnd});
+  try {
+    const sub = subscribeToPeers({lnd});
 
-  sub.on('error', () => {});
+    sub.on('error', () => {});
 
-  await asyncRetry({interval, times}, async () => {
-    await addPeer({lnd, public_key: target.id, socket: target.socket});
-  });
+    await asyncRetry({interval, times}, async () => {
+      await addPeer({lnd, public_key: target.id, socket: target.socket});
+    });
 
-  const disconnect = removePeer({lnd, public_key: target.id});
-  const receiveDisconnect = once(sub, 'disconnected');
+    const disconnect = removePeer({lnd, public_key: target.id});
+    const receiveDisconnect = once(sub, 'disconnected');
 
-  const [disconectMessage] = await all([receiveDisconnect, disconnect]);
+    const [disconectMessage] = await all([receiveDisconnect, disconnect]);
 
-  const [disconnected] = disconectMessage;
+    const [disconnected] = disconectMessage;
 
-  equal(disconnected.public_key, target.id, 'Got d/c event');
+    equal(disconnected.public_key, target.id, 'Got d/c event');
 
-  const connect = asyncRetry({interval, times}, async () => {
-    return addPeer({lnd, public_key: target.id, socket: target.socket});
-  });
+    const connect = asyncRetry({interval, times}, async () => {
+      return addPeer({lnd, public_key: target.id, socket: target.socket});
+    });
 
-  const receiveConnectMessage = once(sub, 'connected');
+    const receiveConnectMessage = once(sub, 'connected');
 
-  const [connectMessage] = await all([receiveConnectMessage, connect]);
+    const [connectMessage] = await all([receiveConnectMessage, connect]);
 
-  const [connected] = connectMessage;
+    const [connected] = connectMessage;
 
-  equal(connected.public_key, target.id, 'Got connected');
-
-  await kill({});
+    equal(connected.public_key, target.id, 'Got connected');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
+  }
 
   return end();
 });

package/test/invoicesrpc-integration/test_get_sweep_transactions.js

@@ -10,10 +10,8 @@ const {closeChannel} = require('./../../');
 const {createHodlInvoice} = require('./../../');
 const {delay} = require('./../macros');
 const {getChainTransactions} = require('./../../');
-const {getChannels} = require('./../../');
 const {getClosedChannels} = require('./../../');
 const {getInvoice} = require('./../../');
-const {getInvoices} = require('./../../');
 const {getPendingChannels} = require('./../../');
 const {getSweepTransactions} = require('./../../');
 const {getWalletInfo} = require('./../../');

package/test/invoicesrpc-integration/test_subscribe_cancel_invoice.js

@@ -8,7 +8,6 @@ const {cancelHodlInvoice} = require('./../../');
 const {createHodlInvoice} = require('./../../');
 const {delay} = require('./../macros');
 const {getInvoice} = require('./../../');
-const {getInvoices} = require('./../../');
 const {pay} = require('./../../');
 const {setupChannel} = require('./../macros');
 const {subscribeToInvoice} = require('./../../');

package/test/macros/wait_for_channel.js

@@ -6,7 +6,7 @@ const {getChannel} = require('./../../');
 const {getChannels} = require('./../../');
 
 const interval = 10;
-const times = 6000;
+const times = 10000;
 
 /** Wait for channel to be open