1 files changed, 67 insertions, 62 deletions
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts b/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts
index 9bbe2c875..0f9f29fb5 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts
+++ b/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts
@@ -120,6 +120,73 @@ export class PeerPullDebitTransactionContext implements TransactionContext {
     this.peerPullDebitId = peerPullDebitId;
   }
 
+  async deleteTransaction(): Promise<void> {
+    const transactionId = this.transactionId;
+    const ws = this.ws;
+    const peerPullDebitId = this.peerPullDebitId;
+    await ws.db
+      .mktx((x) => [x.peerPullDebit, x.tombstones])
+      .runReadWrite(async (tx) => {
+        const debit = await tx.peerPullDebit.get(peerPullDebitId);
+        if (debit) {
+          await tx.peerPullDebit.delete(peerPullDebitId);
+          await tx.tombstones.put({ id: transactionId });
+        }
+      });
+  }
+
+  async suspendTransaction(): Promise<void> {
+    const taskId = this.taskId;
+    const transactionId = this.transactionId;
+    const ws = this.ws;
+    const peerPullDebitId = this.peerPullDebitId;
+    stopLongpolling(ws, taskId);
+    const transitionInfo = await ws.db
+      .mktx((x) => [x.peerPullDebit])
+      .runReadWrite(async (tx) => {
+        const pullDebitRec = await tx.peerPullDebit.get(peerPullDebitId);
+        if (!pullDebitRec) {
+          logger.warn(`peer pull debit ${peerPullDebitId} not found`);
+          return;
+        }
+        let newStatus: PeerPullDebitRecordStatus | undefined = undefined;
+        switch (pullDebitRec.status) {
+          case PeerPullDebitRecordStatus.DialogProposed:
+            break;
+          case PeerPullDebitRecordStatus.Done:
+            break;
+          case PeerPullDebitRecordStatus.PendingDeposit:
+            newStatus = PeerPullDebitRecordStatus.SuspendedDeposit;
+            break;
+          case PeerPullDebitRecordStatus.SuspendedDeposit:
+            break;
+          case PeerPullDebitRecordStatus.Aborted:
+            break;
+          case PeerPullDebitRecordStatus.AbortingRefresh:
+            newStatus = PeerPullDebitRecordStatus.SuspendedAbortingRefresh;
+            break;
+          case PeerPullDebitRecordStatus.Failed:
+            break;
+          case PeerPullDebitRecordStatus.SuspendedAbortingRefresh:
+            break;
+          default:
+            assertUnreachable(pullDebitRec.status);
+        }
+        if (newStatus != null) {
+          const oldTxState = computePeerPullDebitTransactionState(pullDebitRec);
+          pullDebitRec.status = newStatus;
+          const newTxState = computePeerPullDebitTransactionState(pullDebitRec);
+          await tx.peerPullDebit.put(pullDebitRec);
+          return {
+            oldTxState,
+            newTxState,
+          };
+        }
+        return undefined;
+      });
+    notifyTransition(ws, transactionId, transitionInfo);
+  }
+
   async resumeTransaction(): Promise<void> {
     const ctx = this;
     stopLongpolling(ctx.ws, ctx.taskId);
@@ -742,68 +809,6 @@ export async function preparePeerPullDebit(
   };
 }
 
-/**
- * FIXME: This belongs in the transaction context!
- */
-export async function suspendPeerPullDebitTransaction(
-  ws: InternalWalletState,
-  peerPullDebitId: string,
-) {
-  const taskId = constructTaskIdentifier({
-    tag: PendingTaskType.PeerPullDebit,
-    peerPullDebitId,
-  });
-  const transactionId = constructTransactionIdentifier({
-    tag: TransactionType.PeerPullDebit,
-    peerPullDebitId,
-  });
-  stopLongpolling(ws, taskId);
-  const transitionInfo = await ws.db
-    .mktx((x) => [x.peerPullDebit])
-    .runReadWrite(async (tx) => {
-      const pullDebitRec = await tx.peerPullDebit.get(peerPullDebitId);
-      if (!pullDebitRec) {
-        logger.warn(`peer pull debit ${peerPullDebitId} not found`);
-        return;
-      }
-      let newStatus: PeerPullDebitRecordStatus | undefined = undefined;
-      switch (pullDebitRec.status) {
-        case PeerPullDebitRecordStatus.DialogProposed:
-          break;
-        case PeerPullDebitRecordStatus.Done:
-          break;
-        case PeerPullDebitRecordStatus.PendingDeposit:
-          newStatus = PeerPullDebitRecordStatus.SuspendedDeposit;
-          break;
-        case PeerPullDebitRecordStatus.SuspendedDeposit:
-          break;
-        case PeerPullDebitRecordStatus.Aborted:
-          break;
-        case PeerPullDebitRecordStatus.AbortingRefresh:
-          newStatus = PeerPullDebitRecordStatus.SuspendedAbortingRefresh;
-          break;
-        case PeerPullDebitRecordStatus.Failed:
-          break;
-        case PeerPullDebitRecordStatus.SuspendedAbortingRefresh:
-          break;
-        default:
-          assertUnreachable(pullDebitRec.status);
-      }
-      if (newStatus != null) {
-        const oldTxState = computePeerPullDebitTransactionState(pullDebitRec);
-        pullDebitRec.status = newStatus;
-        const newTxState = computePeerPullDebitTransactionState(pullDebitRec);
-        await tx.peerPullDebit.put(pullDebitRec);
-        return {
-          oldTxState,
-          newTxState,
-        };
-      }
-      return undefined;
-    });
-  notifyTransition(ws, transactionId, transitionInfo);
-}
-
 export function computePeerPullDebitTransactionState(
   pullDebitRecord: PeerPullPaymentIncomingRecord,
 ): TransactionState {