diff --git a/dist/src/tests/controllers/invoices.test.js b/dist/src/tests/controllers/invoices.test.js index a9e750aa0..ad8115f7a 100644 --- a/dist/src/tests/controllers/invoices.test.js +++ b/dist/src/tests/controllers/invoices.test.js @@ -13,6 +13,7 @@ const ava_1 = require("ava"); const invoices_1 = require("../utils/invoices"); const nodes_1 = require("../nodes"); const helpers = require("../utils/helpers"); +const get_1 = require("../utils/get"); /* npx ava src/tests/controllers/invoices.test.ts --verbose --serial --timeout=2m */ @@ -44,6 +45,15 @@ function invoices(t, node1, node2) { const invoiceDetail2 = yield (0, invoices_1.getInvoice)(t, node1, paymentRequest); const invoicePaymentStatus = invoiceDetail2.response.settled; t.true(invoicePaymentStatus, `Payment should have been made by ${node2.alias} to ${node1.alias}`); + if (node2.alias.includes('virtualNode') || node2.alias === 'dave') { + const balance = yield (0, get_1.getBalance)(t, node2); + yield helpers.sleep(1000); + const invoice = yield (0, invoices_1.createInvoice)(t, node1, balance + 100, 'test invoice'); + const paymentRequest = invoice.response.invoice; + yield helpers.sleep(1000); + const pay = yield (0, invoices_1.payInvoice)(t, node2, paymentRequest); + t.false(pay.success, 'Response is suppose to be false because we have insufficent balance'); + } console.log(`${node2.alias} generating invoice to be paid by ${node1.alias}`); //Create an Invoice by node 2 yield helpers.sleep(1000); @@ -56,9 +66,6 @@ function invoices(t, node1, node2) { //Get Invoice details by node 2 const invoiceDetail3 = yield (0, invoices_1.getInvoice)(t, node2, paymentRequest2); const invoicePaymentRequest2 = invoiceDetail3.response.payment_request; - if (node1.alias === 'alice' && node2.alias === 'virtualNode0') { - console.log(invoiceDetail3); - } t.truthy(invoicePaymentRequest2, `Payment request should exist for ${node2.alias} when testing with ${node1.alias}`); //Payment request gotten from getInvoice should equal payment request from create invoice t.true(paymentRequest2 === invoicePaymentRequest2, 'Payment request gotten from getInvoice should equal payment request from create invoice'); diff --git a/dist/src/tests/controllers/invoices.test.js.map b/dist/src/tests/controllers/invoices.test.js.map index 6558db30f..1b3ae8ffc 100644 --- a/dist/src/tests/controllers/invoices.test.js.map +++ b/dist/src/tests/controllers/invoices.test.js.map @@ -1 +1 @@ -{"version":3,"file":"invoices.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/invoices.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"invoices.test.js","sourceRoot":"","sources":["../../../../src/tests/controllers/invoices.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/tests/utils/invoices/payInvoice.js b/dist/src/tests/utils/invoices/payInvoice.js index ea1483b42..f2d11ffa4 100644 --- a/dist/src/tests/utils/invoices/payInvoice.js +++ b/dist/src/tests/utils/invoices/payInvoice.js @@ -14,10 +14,15 @@ const http = require("ava-http"); const helpers_1 = require("../../utils/helpers"); function payInvoice(t, node, payment_request) { return __awaiter(this, void 0, void 0, function* () { - const v = { payment_request }; - const r = yield http.put(node.external_ip + '/invoices', (0, helpers_1.makeArgs)(node, v)); - t.true(r.success, 'Put method should have succeeded'); - return r; + try { + const v = { payment_request }; + const r = yield http.put(node.external_ip + '/invoices', (0, helpers_1.makeArgs)(node, v)); + t.true(r.success, 'Put method should have succeeded'); + return r; + } + catch (error) { + return error.error; + } }); } exports.payInvoice = payInvoice; diff --git a/dist/src/tests/utils/invoices/payInvoice.js.map b/dist/src/tests/utils/invoices/payInvoice.js.map index fbb091ea8..ae72d15fb 100644 --- a/dist/src/tests/utils/invoices/payInvoice.js.map +++ b/dist/src/tests/utils/invoices/payInvoice.js.map @@ -1 +1 @@ -{"version":3,"file":"payInvoice.js","sourceRoot":"","sources":["../../../../../src/tests/utils/invoices/payInvoice.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,iDAA8C;AAE9C,SAAsB,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe;;QACvD,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,CAAA;QAC7B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,EAAE,IAAA,kBAAQ,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QAE3E,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAA;QAErD,OAAO,CAAC,CAAA;IACV,CAAC;CAAA;AAPD,gCAOC"} \ No newline at end of file +{"version":3,"file":"payInvoice.js","sourceRoot":"","sources":["../../../../../src/tests/utils/invoices/payInvoice.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,iDAA8C;AAE9C,SAAsB,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe;;QACvD,IAAI;YACF,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,CAAA;YAC7B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,EAAE,IAAA,kBAAQ,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;YAE3E,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAA;YAErD,OAAO,CAAC,CAAA;SACT;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC,KAAK,CAAA;SACnB;IACH,CAAC;CAAA;AAXD,gCAWC"} \ No newline at end of file diff --git a/src/tests/controllers/invoices.test.ts b/src/tests/controllers/invoices.test.ts index 805c18d4e..7c94311d5 100644 --- a/src/tests/controllers/invoices.test.ts +++ b/src/tests/controllers/invoices.test.ts @@ -2,6 +2,7 @@ import test from 'ava' import { createInvoice, getInvoice, payInvoice } from '../utils/invoices' import nodes from '../nodes' import * as helpers from '../utils/helpers' +import { getBalance } from '../utils/get' /* npx ava src/tests/controllers/invoices.test.ts --verbose --serial --timeout=2m @@ -49,6 +50,18 @@ async function invoices(t, node1, node2) { `Payment should have been made by ${node2.alias} to ${node1.alias}` ) + if (node2.alias.includes('virtualNode') || node2.alias === 'dave') { + const balance = await getBalance(t, node2) + await helpers.sleep(1000) + const invoice = await createInvoice(t, node1, balance + 100, 'test invoice') + const paymentRequest = invoice.response.invoice + await helpers.sleep(1000) + const pay = await payInvoice(t, node2, paymentRequest) + t.false( + pay.success, + 'Response is suppose to be false because we have insufficent balance' + ) + } console.log(`${node2.alias} generating invoice to be paid by ${node1.alias}`) //Create an Invoice by node 2 @@ -63,9 +76,6 @@ async function invoices(t, node1, node2) { //Get Invoice details by node 2 const invoiceDetail3 = await getInvoice(t, node2, paymentRequest2) const invoicePaymentRequest2 = invoiceDetail3.response.payment_request - if (node1.alias === 'alice' && node2.alias === 'virtualNode0') { - console.log(invoiceDetail3) - } t.truthy( invoicePaymentRequest2, `Payment request should exist for ${node2.alias} when testing with ${node1.alias}` diff --git a/src/tests/utils/invoices/payInvoice.ts b/src/tests/utils/invoices/payInvoice.ts index a3b225773..a83b3a7ff 100644 --- a/src/tests/utils/invoices/payInvoice.ts +++ b/src/tests/utils/invoices/payInvoice.ts @@ -2,10 +2,14 @@ import http = require('ava-http') import { makeArgs } from '../../utils/helpers' export async function payInvoice(t, node, payment_request) { - const v = { payment_request } - const r = await http.put(node.external_ip + '/invoices', makeArgs(node, v)) + try { + const v = { payment_request } + const r = await http.put(node.external_ip + '/invoices', makeArgs(node, v)) - t.true(r.success, 'Put method should have succeeded') + t.true(r.success, 'Put method should have succeeded') - return r + return r + } catch (error) { + return error.error + } }