ln-service 53.6.0 → 53.7.3

package/test/integration/test_get_peers.js

@@ -15,27 +15,38 @@ test('Get peers', async ({end, equal}) => {
 
   const [{lnd}, target] = nodes;
 
-  await asyncRetry({interval, times}, async () => {
-    await addPeer({lnd, public_key: target.id, socket: target.socket});
-
-    const [peer] = (await getPeers({lnd})).peers;
-
-    if (!peer || !peer.is_sync_peer) {
-      throw new Error('ExpectedSyncPeer');
-    }
-
-    equal(peer.bytes_received !== undefined, true, 'Bytes received');
-    equal(peer.bytes_sent !== undefined, true, 'Bytes sent');
-    equal(peer.is_inbound, false, 'Is inbound peer');
-    equal(peer.is_sync_peer, true, 'Is sync peer');
-    equal(peer.ping_time, 0, 'Ping time');
-    equal(peer.public_key, target.id, 'Public key');
-    equal(!!peer.socket, true, 'Socket');
-    equal(peer.tokens_received, 0, 'Tokens received');
-    equal(peer.tokens_sent, 0, 'Tokens sent');
-
-    return;
-  });
+  try {
+    await asyncRetry({interval, times}, async () => {
+      await addPeer({
+        lnd,
+        public_key: target.id,
+        retry_count: 1,
+        retry_delay: 1,
+        socket: target.socket,
+        timeout: 100,
+      });
+
+      const [peer] = (await getPeers({lnd})).peers;
+
+      if (!peer || !peer.is_sync_peer) {
+        throw new Error('ExpectedSyncPeer');
+      }
+
+      equal(peer.bytes_received !== undefined, true, 'Bytes received');
+      equal(peer.bytes_sent !== undefined, true, 'Bytes sent');
+      equal(peer.is_inbound, false, 'Is inbound peer');
+      equal(peer.is_sync_peer, true, 'Is sync peer');
+      equal(peer.ping_time, 0, 'Ping time');
+      equal(peer.public_key, target.id, 'Public key');
+      equal(!!peer.socket, true, 'Socket');
+      equal(peer.tokens_received, 0, 'Tokens received');
+      equal(peer.tokens_sent, 0, 'Tokens sent');
+
+      return;
+    });
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
 
   await kill({});
 

package/test/integration/test_get_pending_force.js

@@ -178,7 +178,7 @@ test(`Get pending channels`, async ({end, equal}) => {
   equal(forceClose.received, 0, 'No receive amount');
   equal(forceClose.recovered_tokens, undefined, 'No recovered amount');
 
-  // LND 0.14.1 and below do not support remote balance info
+  // LND 0.14.2 and below do not support remote balance info
   if (!!forceClose.remote_balance) {
     equal(forceClose.remote_balance, giftTokens, 'Got gift remote balance');
   } else {

package/test/integration/test_get_wallet_info.js

@@ -1,34 +1,51 @@
+const asyncRetry = require('async/retry');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
 
 const {getWalletInfo} = require('./../../');
 
 const initHeight = 1;
+const interval = 10;
 const pubKeyHexLength = Buffer.alloc(33).toString('hex').length;
 const regtestChainId = '06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f';
+const times = 1000;
 const walletInfoType = 'wallet';
 
 // Getting the wallet info should return info about the wallet
-test(`Get wallet info`, async ({end, equal, strictSame}) => {
+test(`Get wallet info`, async ({end, equal, ok, strictSame}) => {
   const {kill, nodes} = await spawnLightningCluster({});
 
-  const [{lnd}] = nodes;
-
-  const result = await getWalletInfo({lnd});
-
-  equal(result.active_channels_count, 0, 'Expected channels count');
-  equal(!!result.alias, true, 'Expected alias');
-  strictSame(result.chains, [regtestChainId], 'Got chains');
-  equal(!!result.current_block_hash, true, 'Expected best block hash');
-  equal(result.current_block_height, initHeight, 'Expected best block height');
-  equal(!!result.latest_block_at, true, 'Last block time');
-  equal(result.peers_count, 0, 'Expected wallet peers count');
-  equal(result.pending_channels_count, 0, 'Expected pending channels count');
-  equal(result.public_key.length, pubKeyHexLength, 'Expected public key');
-  strictSame(result.uris.length, 1, 'Expected node URI');
-  equal(!!result.version, true, 'Expected version');
-
-  await kill({});
+  const [{generate, lnd}] = nodes;
+
+  try {
+    const result = await asyncRetry({interval, times}, async () => {
+      await generate({});
+
+      const result = await getWalletInfo({lnd});
+
+      if (result.current_block_height >= initHeight) {
+        return result;
+      }
+
+      throw new Error('ExpectedBlockHeightAtInitHeight');
+    });
+
+    equal(result.active_channels_count, 0, 'Expected channels count');
+    equal(!!result.alias, true, 'Expected alias');
+    strictSame(result.chains, [regtestChainId], 'Got chains');
+    equal(!!result.current_block_hash, true, 'Expected best block hash');
+    ok(result.current_block_height >= initHeight, 'Expected block height');
+    equal(!!result.latest_block_at, true, 'Last block time');
+    equal(result.peers_count, 0, 'Expected wallet peers count');
+    equal(result.pending_channels_count, 0, 'Expected pending channels count');
+    equal(result.public_key.length, pubKeyHexLength, 'Expected public key');
+    strictSame(result.uris.length, 1, 'Expected node URI');
+    equal(!!result.version, true, 'Expected version');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  } finally {
+    await kill({});
+  }
 
   return end();
 });

package/test/integration/test_open_channels.js

@@ -4,6 +4,7 @@ const {extractTransaction} = require('psbt');
 const {finalizePsbt} = require('psbt');
 const {spawnLightningCluster} = require('ln-docker-daemons');
 const {test} = require('@alexbosworth/tap');
+const tinysecp = require('tiny-secp256k1');
 const {transactionAsPsbt} = require('psbt');
 
 const {addPeer} = require('./../../');
@@ -29,27 +30,29 @@ const times = 2000;
 
 // Opening channels should open up channels
 test(`Open channels`, async ({end, equal}) => {
+  const ecp = (await import('ecpair')).ECPairFactory(tinysecp);
+
   const {kill, nodes} = await spawnLightningCluster({size});
 
   const [{generate, lnd}, target, remote] = nodes;
 
-  await generate({count: maturity});
+  try {
+    await generate({count: maturity});
 
-  await asyncRetry({interval, times}, async () => {
-    const lnds = [lnd, target.lnd, remote.lnd];
+    await asyncRetry({interval, times}, async () => {
+      const lnds = [lnd, target.lnd, remote.lnd];
 
-    const heights = await asyncMap(lnds, async lnd => {
-      return (await getHeight({lnd})).current_block_height;
-    });
+      const heights = await asyncMap(lnds, async lnd => {
+        return (await getHeight({lnd})).current_block_height;
+      });
 
-    const [controlHeight, targetHeight, remoteHeight] = heights;
+      const [controlHeight, targetHeight, remoteHeight] = heights;
 
-    if (controlHeight !== targetHeight || controlHeight !== remoteHeight) {
-      throw new Error('ExpectedSyncHeights');
-    }
-  });
+      if (controlHeight !== targetHeight || controlHeight !== remoteHeight) {
+        throw new Error('ExpectedSyncHeights');
+      }
+    });
 
-  try {
     const chainTx = (await getChainTransactions({lnd})).transactions;
 
     const spending = chainTx.map(({transaction}) => transaction);
@@ -97,11 +100,15 @@ test(`Open channels`, async ({end, equal}) => {
       .map(({transaction}) => transaction)
       .find(transaction => spending.find(spend => transaction !== spend));
 
-    const fundingPsbt = transactionAsPsbt({spending, transaction: fundTx});
+    const fundingPsbt = transactionAsPsbt({
+      ecp,
+      spending,
+      transaction: fundTx,
+    });
 
-    const {psbt} = finalizePsbt({psbt: fundingPsbt.psbt});
+    const {psbt} = finalizePsbt({ecp, psbt: fundingPsbt.psbt});
 
-    const reconstitutedTransaction = extractTransaction({psbt});
+    const reconstitutedTransaction = extractTransaction({ecp, psbt});
 
     await fundPendingChannels({
       lnd,

package/test/integration/test_pay.js

@@ -10,7 +10,6 @@ const {createInvoice} = require('./../../');
 const {decodePaymentRequest} = require('./../../');
 const {delay} = require('./../macros');
 const {getChannel} = require('./../../');
-const {getChannels} = require('./../../');
 const {getHeight} = require('./../../');
 const {getNetworkGraph} = require('./../../');
 const {getRouteToDestination} = require('./../../');

package/test/integration/test_pay_private_invoice.js

@@ -8,7 +8,6 @@ const {cancelHodlInvoice} = require('./../../');
 const {createInvoice} = require('./../../');
 const {decodePaymentRequest} = require('./../../');
 const {getChannel} = require('./../../');
-const {getChannels} = require('./../../');
 const {getInvoice} = require('./../../');
 const {getRouteToDestination} = require('./../../');
 const {openChannel} = require('./../../');