fix: test failure

commerceblock · Aug 1, 2024 · 8767ede · 8767ede
1 parent a3a4ee3
commit 8767ede
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/clients/apps/nodejs/test/tb04-simple-lightning-latch.mjs b/clients/apps/nodejs/test/tb04-simple-lightning-latch.mjs
@@ -3,7 +3,7 @@ import client_config from '../client_config.js';
 import mercurynodejslib from 'mercurynodejslib';
 import { CoinStatus } from 'mercurynodejslib/coin_enum.js';
 import crypto from 'crypto';
-import { createWallet, depositCoin, generateInvoice } from '../test_utils.js';
+import { createWallet, depositCoin, generateInvoice, payInvoice } from '../test_utils.js';
 
 describe('TB04 - Lightning Latch', function() {
   this.timeout(30000);
@@ -43,7 +43,7 @@ describe('TB04 - Lightning Latch', function() {
 
       const transferAddress = await mercurynodejslib.newTransferAddress(clientConfig, wallet_2_name, null);
 
-      await mercurynodejslib.transferSend(clientConfig, wallet_1_name, coin.statechain_id, transferAddress.transfer_receive, paymentHash.batchId);
+      await mercurynodejslib.transferSend(clientConfig, wallet_1_name, coin.statechain_id, transferAddress.transfer_receive, false, paymentHash.batchId);
 
       let transferReceiveResult = await mercurynodejslib.transferReceive(clientConfig, wallet_2_name);
 
@@ -131,8 +131,8 @@ describe('TB04 - Lightning Latch', function() {
       const transferAddress1 = await mercurynodejslib.newTransferAddress(clientConfig, wallet_1_name, null);
       const transferAddress2 = await mercurynodejslib.newTransferAddress(clientConfig, wallet_2_name, null);
 
-      await mercurynodejslib.transferSend(clientConfig, wallet_1_name, coin1.statechain_id, transferAddress1.transfer_receive, paymentHash1.batchId);
-      await mercurynodejslib.transferSend(clientConfig, wallet_2_name, coin2.statechain_id, transferAddress2.transfer_receive, paymentHash2.batchId);
+      await mercurynodejslib.transferSend(clientConfig, wallet_1_name, coin1.statechain_id, transferAddress1.transfer_receive, false, paymentHash1.batchId);
+      await mercurynodejslib.transferSend(clientConfig, wallet_2_name, coin2.statechain_id, transferAddress2.transfer_receive, false, paymentHash2.batchId);
 
       let transferReceiveResult = await mercurynodejslib.transferReceive(clientConfig, wallet_1_name);
 
@@ -229,8 +229,8 @@ describe('TB04 - Lightning Latch', function() {
       const transferAddress1 = await mercurynodejslib.newTransferAddress(clientConfig, wallet_1_name, null);
       const transferAddress2 = await mercurynodejslib.newTransferAddress(clientConfig, wallet_2_name, null);
 
-      await mercurynodejslib.transferSend(clientConfig, wallet_1_name, coin1.statechain_id, transferAddress1.transfer_receive, paymentHash1.batchId);
-      await mercurynodejslib.transferSend(clientConfig, wallet_2_name, coin2.statechain_id, transferAddress2.transfer_receive, paymentHash1.batchId);
+      await mercurynodejslib.transferSend(clientConfig, wallet_1_name, coin1.statechain_id, transferAddress1.transfer_receive, false, paymentHash1.batchId);
+      await mercurynodejslib.transferSend(clientConfig, wallet_2_name, coin2.statechain_id, transferAddress2.transfer_receive, false, paymentHash1.batchId);
 
       let transferReceiveResult = await mercurynodejslib.transferReceive(clientConfig, wallet_1_name);
 
@@ -256,8 +256,8 @@ describe('TB04 - Lightning Latch', function() {
       const transferAddress3 = await mercurynodejslib.newTransferAddress(clientConfig, wallet_1_name, null);
       const transferAddress4 = await mercurynodejslib.newTransferAddress(clientConfig, wallet_2_name, null);
 
-      await mercurynodejslib.transferSend(clientConfig, wallet_1_name, coin1.statechain_id, transferAddress3.transfer_receive, paymentHash2.batchId);
-      await mercurynodejslib.transferSend(clientConfig, wallet_2_name, coin2.statechain_id, transferAddress4.transfer_receive, paymentHash2.batchId);
+      await mercurynodejslib.transferSend(clientConfig, wallet_1_name, coin1.statechain_id, transferAddress3.transfer_receive, false, paymentHash2.batchId);
+      await mercurynodejslib.transferSend(clientConfig, wallet_2_name, coin2.statechain_id, transferAddress4.transfer_receive, false, paymentHash2.batchId);
 
       transferReceiveResult = await mercurynodejslib.transferReceive(clientConfig, wallet_1_name);
 
@@ -284,8 +284,8 @@ describe('TB04 - Lightning Latch', function() {
 
       // await removeDatabase();
       const clientConfig = client_config.load();
-      let wallet_1_name = "w_ln_1";
-      let wallet_2_name = "w_ln_2";
+      let wallet_1_name = "w_ln_7";
+      let wallet_2_name = "w_ln_8";
       await createWallet(clientConfig, wallet_1_name);
       await createWallet(clientConfig, wallet_2_name);
 
@@ -314,6 +314,8 @@ describe('TB04 - Lightning Latch', function() {
 
       const invoice = await generateInvoice(paymentHash.hash, amount);
 
+      await payInvoice(invoice.payment_request);
+
       const transferAddress = await mercurynodejslib.newTransferAddress(clientConfig, wallet_2_name, null);
 
       await mercurynodejslib.transferSend(clientConfig, wallet_1_name, coin.statechain_id, transferAddress.transfer_receive, false, paymentHash.batchId);

diff --git a/clients/apps/nodejs/test_utils.js b/clients/apps/nodejs/test_utils.js
@@ -100,9 +100,9 @@ const connectElectr = async () => {
     await exec("docker network connect mercurylayer_default mercurylayer_electrs_1");
 }
 
-async function generateInvoice(paymentHash, amountInSats) {
+const generateInvoice = async (paymentHash, amountInSats) => {
 
-    const generateInvoiceCommand = `docker exec $(docker ps -qf "name=mercurylayer_alice_1") lncli addinvoice ${paymentHash} --amt ${amountInSats}`;
+    const generateInvoiceCommand = `docker exec $(docker ps -qf "name=mercurylayer_alice_1") lncli -n regtest addholdinvoice ${paymentHash} --amt ${amountInSats}`;
     const { stdout, stderr } = await exec(generateInvoiceCommand);
     if (stderr) {
         console.error('Error:', stderr);
@@ -111,6 +111,17 @@ async function generateInvoice(paymentHash, amountInSats) {
     return stdout.trim();
 }
 
+const payInvoice = async (paymentRequest) => {
+
+    const payInvoiceCommand = `docker exec $(docker ps -qf "name=mercurylayer_bob_1") lncli -n regtest payinvoice ${paymentRequest}`;
+    const { stdout, stderr } = await exec(payInvoiceCommand);
+    if (stderr) {
+        console.error('Error:', stderr);
+        return null;
+    }
+    return stdout.trim();
+}
+
 module.exports = { 
     removeDatabase, 
     getDatabase, 
@@ -123,5 +134,6 @@ module.exports = {
     disconnectElectr, 
     connectMercuryServer, 
     disconnectMercuryServer ,
-    generateInvoice
+    generateInvoice,
+    payInvoice
 };