From b42af40a7fe5875991459229645121f2c24e42e3 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Wed, 16 Apr 2025 17:34:50 +0000 Subject: [PATCH] up --- src/services/main/index.ts | 2 +- src/tests/externalPayment.spec.ts | 6 +++--- src/tests/testBase.ts | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/services/main/index.ts b/src/services/main/index.ts index a4691246..e9114445 100644 --- a/src/services/main/index.ts +++ b/src/services/main/index.ts @@ -114,7 +114,7 @@ export default class { NewBlockHandler = async (height: number) => { let confirmed: (PendingTx & { confs: number; })[] let log = getLogger({}) - + log("checking new block", height) try { const balanceEvents = await this.paymentManager.GetLndBalance() await this.metricsManager.NewBlockCb(height, balanceEvents) diff --git a/src/tests/externalPayment.spec.ts b/src/tests/externalPayment.spec.ts index 0bb2f181..10d31fa6 100644 --- a/src/tests/externalPayment.spec.ts +++ b/src/tests/externalPayment.spec.ts @@ -2,7 +2,7 @@ import { defaultInvoiceExpiry } from '../services/storage/paymentStorage.js' import { Describe, expect, expectThrowsAsync, runSanityCheck, safelySetUserBalance, TestBase } from './testBase.js' import * as Types from '../../proto/autogenerated/ts/types.js' export const ignore = false -export const dev = false +export const dev = true export default async (T: TestBase) => { await safelySetUserBalance(T, T.user1, 2000) await testSuccessfulExternalPayment(T) @@ -58,8 +58,8 @@ const testSuccesfulReceivedExternalChainPayment = async (T: TestBase) => { const payment = await T.externalAccessToOtherLnd.PayAddress(user2Address.address, 1000, 3, "test", { from: 'system', useProvider: false }) expect(payment.txid).to.not.be.undefined T.d("paid 1000 sats to user2's external chain address") - await T.chainTools.mine(2) - T.d("mined 2 blocks to confirm the payment") + await T.chainTools.mine(1) + T.d("mined 1 blocks to confirm the payment") const u2 = await T.main.storage.userStorage.GetUser(T.user2.userId) expect(u2.balance_sats).to.be.equal(1000) T.d("user2 balance is now 1000") diff --git a/src/tests/testBase.ts b/src/tests/testBase.ts index aa4d3714..939ce5fb 100644 --- a/src/tests/testBase.ts +++ b/src/tests/testBase.ts @@ -30,7 +30,7 @@ export type TestBase = { app: AppData user1: TestUserData user2: TestUserData - externalAccessToMainLnd: LND + //externalAccessToMainLnd: LND externalAccessToOtherLnd: LND externalAccessToThirdLnd: LND adminManager: AdminManager @@ -74,8 +74,8 @@ export const SetupTest = async (d: Describe, chainTools: ChainTools): Promise { }, async () => { }), extermnalUtils, async () => { }, async () => { }, () => { }, () => { }) - await externalAccessToMainLnd.Warmup() + /* const externalAccessToMainLnd = new LND(settings.lndSettings, new LiquidityProvider("", extermnalUtils, async () => { }, async () => { }), extermnalUtils, async () => { }, async () => { }, () => { }, () => { }) + await externalAccessToMainLnd.Warmup() */ const otherLndSetting = { ...settings.lndSettings, mainNode: settings.lndSettings.otherNode } const externalAccessToOtherLnd = new LND(otherLndSetting, new LiquidityProvider("", extermnalUtils, async () => { }, async () => { }), extermnalUtils, async () => { }, async () => { }, () => { }, () => { }) @@ -89,7 +89,7 @@ export const SetupTest = async (d: Describe, chainTools: ChainTools): Promise { T.main.Stop() - T.externalAccessToMainLnd.Stop() + /* T.externalAccessToMainLnd.Stop() */ T.externalAccessToOtherLnd.Stop() T.externalAccessToThirdLnd.Stop() T.adminManager.Stop()