From 1f60ac76f920da9c710c4a6116741f4412350f4a Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 20 Jun 2023 16:19:53 +0200 Subject: harness: fix test-peer-repair --- .../src/integrationtests/test-peer-repair.ts | 45 +++++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/taler-harness/src/integrationtests/test-peer-repair.ts b/packages/taler-harness/src/integrationtests/test-peer-repair.ts index cfa7ec877..b09bff2dc 100644 --- a/packages/taler-harness/src/integrationtests/test-peer-repair.ts +++ b/packages/taler-harness/src/integrationtests/test-peer-repair.ts @@ -61,7 +61,8 @@ export async function runPeerRepairTest(t: GlobalTestState) { const wallet2 = w2.walletClient; const withdrawalDoneCond = wallet1.waitForNotificationCond( - (x) => x.type === NotificationType.TransactionStateTransition && + (x) => + x.type === NotificationType.TransactionStateTransition && x.newTxState.major === TransactionMajorState.Done && x.transactionId.startsWith("txn:withdrawal:"), ); @@ -102,7 +103,7 @@ export async function runPeerRepairTest(t: GlobalTestState) { x.type === NotificationType.TransactionStateTransition && x.transactionId === resp1.transactionId && x.newTxState.major === TransactionMajorState.Pending && - x.newTxState.minor === TransactionMinorState.Ready + x.newTxState.minor === TransactionMinorState.Ready, ); await peerPushDebitReady1Cond; @@ -128,12 +129,9 @@ export async function runPeerRepairTest(t: GlobalTestState) { x.newTxState.major === TransactionMajorState.Done, ); - await wallet2.client.call( - WalletApiOperation.ConfirmPeerPushCredit, - { - peerPushPaymentIncomingId: resp2.peerPushPaymentIncomingId, - }, - ); + await wallet2.client.call(WalletApiOperation.ConfirmPeerPushCredit, { + peerPushPaymentIncomingId: resp2.peerPushPaymentIncomingId, + }); await peerPushCreditDone1Cond; await peerPushDebitDone1Cond; @@ -154,6 +152,8 @@ export async function runPeerRepairTest(t: GlobalTestState) { }); wallet1 = w1.walletClient; + console.log("attempting peer-push-debit, should fail."); + const initResp2 = await wallet1.client.call( WalletApiOperation.InitiatePeerPushDebit, { @@ -166,12 +166,37 @@ export async function runPeerRepairTest(t: GlobalTestState) { }, ); + const peerPushDebitFailingCond = wallet1.waitForNotificationCond( + (x) => + x.type === NotificationType.TransactionStateTransition && + x.transactionId === initResp2.transactionId && + x.newTxState.major === TransactionMajorState.Pending && + x.errorInfo != null, + ); + + console.log(`waiting for error on ${initResp2.transactionId}`); + + await peerPushDebitFailingCond; + + console.log("reached error"); + + // Now withdraw so we have enough coins to re-select + + const withdraw2Res = await withdrawViaBankV2(t, { + walletClient: wallet1, + bank, + exchange, + amount: "TESTKUDOS:5", + }); + + await withdraw2Res.withdrawalFinishedCond; + const peerPushDebitReady2Cond = wallet1.waitForNotificationCond( (x) => x.type === NotificationType.TransactionStateTransition && - x.transactionId === resp1.transactionId && + x.transactionId === initResp2.transactionId && x.newTxState.major === TransactionMajorState.Pending && - x.newTxState.minor === TransactionMinorState.Ready + x.newTxState.minor === TransactionMinorState.Ready, ); await peerPushDebitReady2Cond; -- cgit v1.2.3