3 files changed, 64 insertions, 0 deletions
diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts
index 9b5dd2a19..b21f1992c 100644
--- a/packages/taler-wallet-core/src/operations/testing.ts
+++ b/packages/taler-wallet-core/src/operations/testing.ts
@@ -23,6 +23,7 @@ import {
   ConfirmPayResultType,
   Duration,
   IntegrationTestV2Args,
+  j2s,
   Logger,
   NotificationType,
   RegisterAccountRequest,
@@ -31,6 +32,7 @@ import {
   TestPayResult,
   TransactionMajorState,
   TransactionMinorState,
+  TransactionState,
   TransactionType,
   WithdrawTestBalanceRequest,
 } from "@gnu-taler/taler-util";
@@ -494,6 +496,49 @@ async function waitUntilPendingReady(
   cancelNotifs();
 }
 
+/**
+ * Wait until a transaction is in a particular state.
+ */
+export async function waitTransactionState(
+  ws: InternalWalletState,
+  transactionId: string,
+  txState: TransactionState,
+): Promise<void> {
+  logger.info(
+    `starting waiting for ${transactionId} to be in ${JSON.stringify(
+      txState,
+    )})`,
+  );
+  ws.ensureTaskLoopRunning();
+  let p: OpenedPromise<void> | undefined = undefined;
+  const cancelNotifs = ws.addNotificationListener((notif) => {
+    if (!p) {
+      return;
+    }
+    if (notif.type === NotificationType.TransactionStateTransition) {
+      p.resolve();
+    }
+  });
+  while (1) {
+    p = openPromise();
+    const tx = await getTransactionById(ws, {
+      transactionId,
+    });
+    if (
+      tx.txState.major === txState.major &&
+      tx.txState.minor === txState.minor
+    ) {
+      break;
+    }
+    // Wait until transaction state changed
+    await p.promise;
+  }
+  logger.info(
+    `done waiting for ${transactionId} to be in ${JSON.stringify(txState)}`,
+  );
+  cancelNotifs();
+}
+
 export async function runIntegrationTest2(
   ws: InternalWalletState,
   args: IntegrationTestV2Args,
diff --git a/packages/taler-wallet-core/src/wallet-api-types.ts b/packages/taler-wallet-core/src/wallet-api-types.ts
index 3520a05cb..6d66e7ad3 100644
--- a/packages/taler-wallet-core/src/wallet-api-types.ts
+++ b/packages/taler-wallet-core/src/wallet-api-types.ts
@@ -104,6 +104,7 @@ import {
   TestPayArgs,
   TestPayResult,
   TestingSetTimetravelRequest,
+  TestingWaitTransactionRequest,
   Transaction,
   TransactionByIdRequest,
   TransactionsRequest,
@@ -214,6 +215,7 @@ export enum WalletApiOperation {
   ValidateIban = "validateIban",
   TestingWaitTransactionsFinal = "testingWaitTransactionsFinal",
   TestingWaitRefreshesFinal = "testingWaitRefreshesFinal",
+  TestingWaitTransactionState = "testingWaitTransactionState",
   TestingSetTimetravel = "testingSetTimetravel",
   GetScopedCurrencyInfo = "getScopedCurrencyInfo",
   ListStoredBackups = "listStoredBackups",
@@ -1005,6 +1007,15 @@ export type TestingWaitRefreshesFinal = {
 };
 
 /**
+ * Wait until a transaction is in a particular state.
+ */
+export type TestingWaitTransactionStateOp = {
+  op: WalletApiOperation.TestingWaitTransactionState;
+  request: TestingWaitTransactionRequest;
+  response: EmptyObject;
+};
+
+/**
  * Set a coin as (un-)suspended.
  * Suspended coins won't be used for payments.
  */
@@ -1108,6 +1119,7 @@ export type WalletOperations = {
   [WalletApiOperation.TestingWaitTransactionsFinal]: TestingWaitTransactionsFinal;
   [WalletApiOperation.TestingWaitRefreshesFinal]: TestingWaitRefreshesFinal;
   [WalletApiOperation.TestingSetTimetravel]: TestingSetTimetravelOp;
+  [WalletApiOperation.TestingWaitTransactionState]: TestingWaitTransactionStateOp;
   [WalletApiOperation.GetScopedCurrencyInfo]: GetScopedCurrencyInfoOp;
   [WalletApiOperation.CreateStoredBackup]: CreateStoredBackupsOp;
   [WalletApiOperation.ListStoredBackups]: ListStoredBackupsOp;
diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts
index 75f1a33a9..ccc7ec094 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -127,6 +127,7 @@ import {
   codecForRecoverStoredBackupRequest,
   codecForTestingSetTimetravelRequest,
   setDangerousTimetravel,
+  TestingWaitTransactionRequest,
 } from "@gnu-taler/taler-util";
 import type { HttpRequestLibrary } from "@gnu-taler/taler-util/http";
 import { readSuccessResponseJsonOrThrow } from "@gnu-taler/taler-util/http";
@@ -250,6 +251,7 @@ import {
   runIntegrationTest,
   runIntegrationTest2,
   testPay,
+  waitTransactionState,
   waitUntilDone,
   waitUntilRefreshesDone,
   withdrawTestBalance,
@@ -1414,6 +1416,11 @@ async function dispatchRequestInternal<Op extends WalletApiOperation>(
       const resp = await getBackupRecovery(ws);
       return resp;
     }
+    case WalletApiOperation.TestingWaitTransactionState: {
+      const req = payload as TestingWaitTransactionRequest;
+      await waitTransactionState(ws, req.transactionId, req.txState);
+      return {};
+    }
     case WalletApiOperation.GetScopedCurrencyInfo: {
       // Ignore result, just validate in this mock implementation
       codecForGetCurrencyInfoRequest().decode(payload);