From 9c708251f92e6691ebba80fa8d129c6c04cec618 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 20 Jun 2023 11:40:06 +0200 Subject: wallet-core: emit DD37 self-transition notifications with errors --- .../src/operations/transactions.ts | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'packages/taler-wallet-core/src/operations/transactions.ts') diff --git a/packages/taler-wallet-core/src/operations/transactions.ts b/packages/taler-wallet-core/src/operations/transactions.ts index b6dc2e8bd..82b7cea64 100644 --- a/packages/taler-wallet-core/src/operations/transactions.ts +++ b/packages/taler-wallet-core/src/operations/transactions.ts @@ -69,8 +69,12 @@ import { InternalWalletState } from "../internal-wallet-state.js"; import { PendingTaskType } from "../pending-types.js"; import { assertUnreachable } from "../util/assertUnreachable.js"; import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js"; -import { constructTaskIdentifier, TaskIdentifiers } from "../util/retries.js"; -import { resetOperationTimeout, TombstoneTag } from "./common.js"; +import { + constructTaskIdentifier, + resetPendingTaskTimeout, + TaskIdentifiers, + TombstoneTag, +} from "./common.js"; import { abortDepositGroup, failDepositTransaction, @@ -1388,7 +1392,7 @@ export async function retryTransaction( tag: PendingTaskType.PeerPullCredit, pursePub: parsedTx.pursePub, }); - await resetOperationTimeout(ws, taskId); + await resetPendingTaskTimeout(ws, taskId); stopLongpolling(ws, taskId); break; } @@ -1397,7 +1401,7 @@ export async function retryTransaction( tag: PendingTaskType.Deposit, depositGroupId: parsedTx.depositGroupId, }); - await resetOperationTimeout(ws, taskId); + await resetPendingTaskTimeout(ws, taskId); stopLongpolling(ws, taskId); break; } @@ -1408,7 +1412,7 @@ export async function retryTransaction( tag: PendingTaskType.Withdraw, withdrawalGroupId: parsedTx.withdrawalGroupId, }); - await resetOperationTimeout(ws, taskId); + await resetPendingTaskTimeout(ws, taskId); stopLongpolling(ws, taskId); break; } @@ -1417,7 +1421,7 @@ export async function retryTransaction( tag: PendingTaskType.Purchase, proposalId: parsedTx.proposalId, }); - await resetOperationTimeout(ws, taskId); + await resetPendingTaskTimeout(ws, taskId); stopLongpolling(ws, taskId); break; } @@ -1426,7 +1430,7 @@ export async function retryTransaction( tag: PendingTaskType.TipPickup, walletTipId: parsedTx.walletTipId, }); - await resetOperationTimeout(ws, taskId); + await resetPendingTaskTimeout(ws, taskId); stopLongpolling(ws, taskId); break; } @@ -1435,7 +1439,7 @@ export async function retryTransaction( tag: PendingTaskType.Refresh, refreshGroupId: parsedTx.refreshGroupId, }); - await resetOperationTimeout(ws, taskId); + await resetPendingTaskTimeout(ws, taskId); stopLongpolling(ws, taskId); break; } @@ -1444,7 +1448,7 @@ export async function retryTransaction( tag: PendingTaskType.PeerPullDebit, peerPullPaymentIncomingId: parsedTx.peerPullPaymentIncomingId, }); - await resetOperationTimeout(ws, taskId); + await resetPendingTaskTimeout(ws, taskId); stopLongpolling(ws, taskId); break; } @@ -1453,7 +1457,7 @@ export async function retryTransaction( tag: PendingTaskType.PeerPushCredit, peerPushPaymentIncomingId: parsedTx.peerPushPaymentIncomingId, }); - await resetOperationTimeout(ws, taskId); + await resetPendingTaskTimeout(ws, taskId); stopLongpolling(ws, taskId); break; } @@ -1462,7 +1466,7 @@ export async function retryTransaction( tag: PendingTaskType.PeerPushDebit, pursePub: parsedTx.pursePub, }); - await resetOperationTimeout(ws, taskId); + await resetPendingTaskTimeout(ws, taskId); stopLongpolling(ws, taskId); break; } -- cgit v1.2.3