From 3365c82943952f7638f22372379c74b329562d28 Mon Sep 17 00:00:00 2001 From: vindard <17693119+vindard@users.noreply.github.com> Date: Wed, 20 Sep 2023 17:52:38 +0300 Subject: [PATCH] test: remove redundant legacy receive-ln tests --- .../02-receive-lightning.spec.ts | 288 +----------------- 1 file changed, 1 insertion(+), 287 deletions(-) diff --git a/test/legacy-integration/02-user-wallet/02-receive-lightning.spec.ts b/test/legacy-integration/02-user-wallet/02-receive-lightning.spec.ts index f3e2992223..695357c967 100644 --- a/test/legacy-integration/02-user-wallet/02-receive-lightning.spec.ts +++ b/test/legacy-integration/02-user-wallet/02-receive-lightning.spec.ts @@ -8,24 +8,17 @@ import { handleHeldInvoices } from "@app/wallets" import { toSats } from "@domain/bitcoin" import { InvoiceNotFoundError } from "@domain/bitcoin/lightning" -import { defaultTimeToExpiryInSeconds } from "@domain/bitcoin/lightning/invoice-expiration" -import { UsdDisplayCurrency, toCents } from "@domain/fiat" +import { toCents } from "@domain/fiat" import { PaymentInitiationMethod } from "@domain/wallets" -import { WalletCurrency } from "@domain/shared" import { CouldNotFindWalletInvoiceError } from "@domain/errors" import { WalletInvoicesRepository } from "@services/mongoose" -import { getDealerUsdWalletId } from "@services/ledger/caching" -import { DealerPriceService } from "@services/dealer-price" import { LedgerService } from "@services/ledger" -import { TransactionsMetadataRepository } from "@services/ledger/services" import { LndService } from "@services/lnd" import { KnownLndErrorDetails } from "@services/lnd/errors" import { baseLogger } from "@services/logger" import { setupInvoiceSubscribe } from "@servers/trigger" -import { LedgerTransactionType } from "@domain/ledger" - import { sleep } from "@utils" import { parseLndErrorDetails } from "@services/lnd/config" @@ -35,7 +28,6 @@ import { WalletInvoice } from "@services/mongoose/schema" import { checkIsBalanced, createUserAndWalletFromPhone, - getAmount, getBalanceHelper, getDefaultWalletIdByPhone, getError, @@ -289,228 +281,6 @@ describe("UserWallet - Lightning", () => { ]) }) - it("receives payment from outside to USD wallet with amount", async () => { - const initBalanceUsdB = toCents(await getBalanceHelper(walletIdUsdB)) - - const cents = toCents(250) - const memo = "myMemo" - - const lnInvoice = await Wallets.addInvoiceForSelfForUsdWallet({ - walletId: walletIdUsdB as WalletId, - amount: cents, - memo, - }) - if (lnInvoice instanceof Error) throw lnInvoice - const { paymentRequest: invoice } = lnInvoice - - const hash = getHash(invoice) - const amount = getAmount(invoice) - - const dealerFns = DealerPriceService(defaultTimeToExpiryInSeconds) - const btcAmount = await dealerFns.getSatsFromCentsForFutureBuy({ - amount: BigInt(cents), - currency: WalletCurrency.Usd, - }) - if (btcAmount instanceof Error) throw btcAmount - const sats = Number(btcAmount.amount) - - expect(amount).toBe(sats) - - safePay({ lnd: lndOutside1, request: invoice }) - - // TODO: we could use an event instead of a sleep - await sleep(500) - - expect( - await Wallets.updatePendingInvoiceByPaymentHash({ - paymentHash: hash as PaymentHash, - logger: baseLogger, - }), - ).not.toBeInstanceOf(Error) - // should be idempotent (not return error when called again) - expect( - await Wallets.updatePendingInvoiceByPaymentHash({ - paymentHash: hash as PaymentHash, - logger: baseLogger, - }), - ).not.toBeInstanceOf(Error) - - const ledger = LedgerService() - const ledgerTxs = await ledger.getTransactionsByHash(hash) - if (ledgerTxs instanceof Error) throw ledgerTxs - - const ledgerTx = ledgerTxs.find((tx) => tx.walletId === walletIdUsdB) - if (ledgerTx === undefined) throw Error("ledgerTx needs to be defined") - - expect(ledgerTx.credit).toBe(cents) - expect(ledgerTx.centsAmount).toBe(cents) - expect(ledgerTx.currency).toBe(WalletCurrency.Usd) - expect(ledgerTx.lnMemo).toBe(memo) - expect(ledgerTx.pendingConfirmation).toBe(false) - const dealerUsdWalletId = await getDealerUsdWalletId() - const dealerBalance = await getBalanceHelper(dealerUsdWalletId) - expect(dealerBalance).toBe(cents * -1) - - // check that memo is not filtered by spam filter - const { result: txns } = await getTransactionsForWalletId(walletIdUsdB) - expect(txns?.slice.length).toBe(1) - - // FIXME(nicolas) need to have spam memo working USD wallet - // if (error instanceof Error || txns === null) throw error - // const noSpamTxn = txns.slice.find( - // (txn) => - // txn.initiationVia.type === PaymentInitiationMethod.Lightning && - // txn.initiationVia.paymentHash === hash, - // ) as WalletTransaction - // expect(noSpamTxn.memo).toBe(memo) - - const finalBalance = await getBalanceHelper(walletIdUsdB) - expect(finalBalance).toBe(initBalanceUsdB + cents) - - // Check ledger transaction metadata for USD 'LedgerTransactionType.Invoice' - // === - const expectedFields = { - type: LedgerTransactionType.Invoice, - - debit: 0, - credit: cents, - - satsAmount: sats, - satsFee: 0, - centsAmount: cents, - centsFee: 0, - displayAmount: cents, - displayFee: 0, - - displayCurrency: UsdDisplayCurrency, - } - expect(ledgerTx).toEqual(expect.objectContaining(expectedFields)) - }) - - it("receives payment from outside to USD wallet with amountless invoices", async () => { - const initBalanceUsdB = toCents(await getBalanceHelper(walletIdUsdB)) - - const sats = toSats(120000) - const memo = "myMemo" - - const lnInvoice = await Wallets.addInvoiceNoAmountForSelf({ - walletId: walletIdUsdB as WalletId, - memo, - }) - if (lnInvoice instanceof Error) throw lnInvoice - const { paymentRequest: invoice } = lnInvoice - - const hash = getHash(invoice) - - safePay({ lnd: lndOutside1, request: invoice, tokens: sats }) - - // TODO: we could use an event instead of a sleep - await sleep(500) - - expect( - await Wallets.updatePendingInvoiceByPaymentHash({ - paymentHash: hash as PaymentHash, - logger: baseLogger, - }), - ).not.toBeInstanceOf(Error) - // should be idempotent (not return error when called again) - expect( - await Wallets.updatePendingInvoiceByPaymentHash({ - paymentHash: hash as PaymentHash, - logger: baseLogger, - }), - ).not.toBeInstanceOf(Error) - - const ledger = LedgerService() - const ledgerTxs = await ledger.getTransactionsByHash(hash) - if (ledgerTxs instanceof Error) throw ledgerTxs - - const ledgerTx = ledgerTxs.find((tx) => tx.walletId === walletIdUsdB) - if (ledgerTx === undefined) throw Error("ledgerTx needs to be defined") - - const dealerFns = DealerPriceService() - const usdAmount = await dealerFns.getCentsFromSatsForImmediateBuy({ - amount: BigInt(sats), - currency: WalletCurrency.Btc, - }) - if (usdAmount instanceof Error) throw usdAmount - const cents = Number(usdAmount.amount) - - expect(ledgerTx.credit).toBe(cents) - expect(ledgerTx.centsAmount).toBe(cents) - expect(ledgerTx.currency).toBe(WalletCurrency.Usd) - expect(ledgerTx.lnMemo).toBe(memo) - expect(ledgerTx.pendingConfirmation).toBe(false) - - // check that memo is not filtered by spam filter - const { result: txns } = await getTransactionsForWalletId(walletIdUsdB) - expect(txns?.slice.length).toBe(2) - - // FIXME(nicolas) need to have spam memo working USD wallet - // if (error instanceof Error || txns === null) throw error - // const noSpamTxn = txns.slice.find( - // (txn) => - // txn.initiationVia.type === PaymentInitiationMethod.Lightning && - // txn.initiationVia.paymentHash === hash, - // ) as WalletTransaction - // expect(noSpamTxn.memo).toBe(memo) - - const finalBalance = await getBalanceHelper(walletIdUsdB) - expect(finalBalance).toBe(initBalanceUsdB + cents) - }) - - it("receives zero amount invoice", async () => { - const sats = 1000 - - const lnInvoice = await Wallets.addInvoiceNoAmountForSelf({ - walletId: walletIdB as WalletId, - }) - if (lnInvoice instanceof Error) throw lnInvoice - const { paymentRequest: invoice } = lnInvoice - - const hash = getHash(invoice) - - safePay({ lnd: lndOutside1, request: invoice, tokens: sats }) - - // TODO: we could use an event instead of a sleep - await sleep(500) - - expect( - await Wallets.updatePendingInvoiceByPaymentHash({ - paymentHash: hash as PaymentHash, - logger: baseLogger, - }), - ).not.toBeInstanceOf(Error) - // should be idempotent (not return error when called again) - expect( - await Wallets.updatePendingInvoiceByPaymentHash({ - paymentHash: hash as PaymentHash, - logger: baseLogger, - }), - ).not.toBeInstanceOf(Error) - - const ledger = LedgerService() - const ledgerMetadata = TransactionsMetadataRepository() - const ledgerTxs = await ledger.getTransactionsByHash(hash) - if (ledgerTxs instanceof Error) throw ledgerTxs - - const ledgerTx = ledgerTxs[0] - const ledgerTxMetadata = await ledgerMetadata.findById(ledgerTx.id) - if (ledgerTxMetadata instanceof Error) throw ledgerTxMetadata - - expect(ledgerTx.credit).toBe(sats) - expect(ledgerTx.lnMemo).toBe("") - expect(ledgerTx.pendingConfirmation).toBe(false) - - expect(ledgerTxMetadata).toHaveProperty("hash") - if (!("hash" in ledgerTxMetadata)) return - expect(ledgerTxMetadata.hash).toBe(ledgerTx.paymentHash) - expect(ledgerTxMetadata["revealedPreImage"]).toBeUndefined() - - const finalBalance = await getBalanceHelper(walletIdB) - expect(finalBalance).toBe(initBalanceB + sats) - }) - it("receives 'less than 1 sat amount' invoice", async () => { const mtokens = "995" const lnInvoice = await Wallets.addInvoiceNoAmountForSelf({ @@ -622,34 +392,6 @@ describe("Invoice handling from trigger", () => { describe("btc recipient invoice", () => { const sats = toSats(500) - it("should process hodl invoice on invoice payment", async () => { - // Kick off listener - const subInvoices = subscribeToInvoices({ lnd: lnd1 }) - setupInvoiceSubscribe({ - lnd: lnd1, - pubkey: process.env.LND1_PUBKEY as Pubkey, - subInvoices, - }) - - // Create invoice for self - const lnInvoice = await Wallets.addInvoiceForSelfForBtcWallet({ - walletId: walletIdF, - amount: sats, - }) - expect(lnInvoice).not.toBeInstanceOf(Error) - if (lnInvoice instanceof Error) throw lnInvoice - - // Pay invoice - const result = await pay({ - lnd: lndOutside1, - request: lnInvoice.paymentRequest, - }) - - // See successful payment - expect(result.is_confirmed).toBeTruthy() - subInvoices.removeAllListeners() - }) - it("should process held invoice when trigger comes back up", async () => { // Create invoice for self const lnInvoice = await Wallets.addInvoiceForSelfForBtcWallet({ @@ -722,34 +464,6 @@ describe("Invoice handling from trigger", () => { describe("usd recipient invoice", () => { const cents = toCents(100) - it("should process hodl invoice on invoice payment", async () => { - // Kick off listener - const subInvoices = subscribeToInvoices({ lnd: lnd1 }) - setupInvoiceSubscribe({ - lnd: lnd1, - pubkey: process.env.LND1_PUBKEY as Pubkey, - subInvoices, - }) - - // Create invoice for self - const lnInvoice = await Wallets.addInvoiceForSelfForUsdWallet({ - walletId: walletIdUsdF, - amount: cents, - }) - expect(lnInvoice).not.toBeInstanceOf(Error) - if (lnInvoice instanceof Error) throw lnInvoice - - // Pay invoice - const result = await pay({ - lnd: lndOutside1, - request: lnInvoice.paymentRequest, - }) - - // See successful payment - expect(result.is_confirmed).toBeTruthy() - subInvoices.removeAllListeners() - }) - it("should process held invoice when trigger comes back up", async () => { // Create invoice for self const lnInvoice = await Wallets.addInvoiceForSelfForUsdWallet({