ln-service 53.6.0 → 53.7.3

package/test/routerrpc-integration/test_probe_for_route.js

@@ -31,99 +31,103 @@ test('Probe for route', async ({end, equal, strictSame}) => {
 
   const [{generate, lnd}, target, remote] = nodes;
 
-  // Send coins to remote so that it can accept a channel
-  await remote.generate({count});
-
-  await setupChannel({
-    generate,
-    lnd,
-    capacity: channelCapacityTokens + channelCapacityTokens,
-    to: target,
-  });
-
-  await setupChannel({
-    capacity: channelCapacityTokens,
-    lnd: target.lnd,
-    generate: target.generate,
-    give: Math.round(channelCapacityTokens / 2),
-    to: remote,
-  });
-
-  await addPeer({lnd, public_key: remote.id, socket: remote.socket});
-
-  const invoice = await createInvoice({tokens, lnd: remote.lnd});
+  try {
+    // Send coins to remote so that it can accept a channel
+    await remote.generate({count});
 
-  await delay(1000);
+    await addPeer({lnd, public_key: remote.id, socket: remote.socket});
 
-  try {
-    await probeForRoute({
+    await setupChannel({
+      generate,
       lnd,
-      destination: remote.id,
-      is_ignoring_past_failures: true,
-      tokens: invoice.tokens,
+      capacity: channelCapacityTokens + channelCapacityTokens,
+      to: target,
     });
-  } catch (err) {
-    const [code, message, {failure}] = err;
 
-    equal(code, 503, 'Failed to find route');
-    equal(message, 'RoutingFailure', 'Hit a routing failure');
-    equal(failure.reason, 'TemporaryChannelFailure', 'Temporary failure');
-  }
+    await setupChannel({
+      capacity: channelCapacityTokens,
+      lnd: target.lnd,
+      generate: target.generate,
+      give: Math.round(channelCapacityTokens / 2),
+      to: remote,
+    });
 
-  const {version} = await getWalletVersion({lnd});
+    const invoice = await createInvoice({tokens, lnd: remote.lnd});
 
-  const [, minor] = (version || '').split('.');
+    await delay(1000);
 
-  if (!version || parseInt(minor) > 13) {
-    const {payments} = await getFailedPayments({lnd});
+    try {
+      await probeForRoute({
+        lnd,
+        destination: remote.id,
+        is_ignoring_past_failures: true,
+        tokens: invoice.tokens,
+      });
+    } catch (err) {
+      const [code, message, {failure}] = err;
 
-    strictSame(payments, [], 'Probes do not leave a failed state behind');
-  }
-
-  // Create a new channel to increase total edge liquidity
-  await setupChannel({
-    capacity: channelCapacityTokens,
-    lnd: target.lnd,
-    generate: target.generate,
-    to: remote,
-  });
+      equal(code, 503, 'Failed to find route');
+      equal(message, 'RoutingFailure', 'Hit a routing failure');
+      equal(failure.reason, 'TemporaryChannelFailure', 'Temporary failure');
+    }
 
-  await deleteForwardingReputations({lnd});
+    const {version} = await getWalletVersion({lnd});
 
-  await waitForRoute({lnd, destination: remote.id, tokens: invoice.tokens});
+    const [, minor] = (version || '').split('.');
 
-  try {
-    const {route} = await probeForRoute({
-      lnd,
-      destination: remote.id,
-      payment: invoice.payment,
-      tokens: invoice.tokens,
-      total_mtokens: !!invoice.payment ? invoice.mtokens : undefined,
-    });
+    if (!version || parseInt(minor) > 13) {
+      const {payments} = await getFailedPayments({lnd});
 
-    if (!route) {
-      throw new Error('ExpectedRouteFromProbe');
+      strictSame(payments, [], 'Probes do not leave a failed state behind');
     }
 
-    equal(route.fee, 1, 'Found route fee');
-    equal(route.fee_mtokens, '1500', 'Found route fee mtokens');
-    strictSame(route.hops.length, 2, 'Found route hops returned');
-    equal(route.mtokens, '500001500', 'Found route mtokens');
-    equal(route.timeout >= 400, true, 'Found route timeout');
-    equal(route.tokens, 500001, 'Found route tokens');
-
-    const {secret} = await payViaRoutes({
-      lnd,
-      id: invoice.id,
-      routes: [route],
+    // Create a new channel to increase total edge liquidity
+    await setupChannel({
+      capacity: channelCapacityTokens,
+      lnd: target.lnd,
+      generate: target.generate,
+      to: remote,
     });
 
-    equal(secret, invoice.secret, 'Route works');
+    await deleteForwardingReputations({lnd});
+
+    await waitForRoute({lnd, destination: remote.id, tokens: invoice.tokens});
+
+    try {
+      const {route} = await probeForRoute({
+        lnd,
+        destination: remote.id,
+        payment: invoice.payment,
+        tokens: invoice.tokens,
+        total_mtokens: !!invoice.payment ? invoice.mtokens : undefined,
+      });
+
+      if (!route) {
+        throw new Error('ExpectedRouteFromProbe');
+      }
+
+      equal(route.fee, 1, 'Found route fee');
+      equal(route.fee_mtokens, '1500', 'Found route fee mtokens');
+      strictSame(route.hops.length, 2, 'Found route hops returned');
+      equal(route.mtokens, '500001500', 'Found route mtokens');
+      equal(route.timeout >= 400, true, 'Found route timeout');
+      equal(route.tokens, 500001, 'Found route tokens');
+
+      const {secret} = await payViaRoutes({
+        lnd,
+        id: invoice.id,
+        routes: [route],
+      });
+
+      equal(secret, invoice.secret, 'Route works');
+    } catch (err) {
+      equal(err, null, 'No error when probing for route');
+    }
   } catch (err) {
-    equal(err, null, 'No error when probing for route');
+    equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
   }
 
-  await kill({});
-
   return end();
 });

package/test/routerrpc-integration/test_subscribe_to_forward_requests.js

@@ -10,7 +10,6 @@ const {deleteForwardingReputations} = require('./../../');
 const {getHeight} = require('./../../');
 const {getInvoice} = require('./../../');
 const {getPayment} = require('./../../');
-const {getWalletVersion} = require('./../../');
 const {payViaPaymentRequest} = require('./../../');
 const {subscribeToForwardRequests} = require('./../../');
 const {subscribeToPayViaRequest} = require('./../../');
@@ -20,8 +19,8 @@ const {waitForRoute} = require('./../macros');
 const size = 3;
 const tokens = 100;
 
-// Paying an invoice should settle the invoice
-test(`Pay via payment request`, async ({end, equal, rejects, strictSame}) => {
+// Subscribing to forward requests should intercept forwards
+test(`Subscribe to requests`, async ({end, equal, rejects, strictSame}) => {
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [{generate, lnd}, target, remote] = nodes;