diff options
Diffstat (limited to 'packages/taler-wallet-core/src/operations/deposits.ts')
-rw-r--r-- | packages/taler-wallet-core/src/operations/deposits.ts | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/packages/taler-wallet-core/src/operations/deposits.ts b/packages/taler-wallet-core/src/operations/deposits.ts index 236fa6b59..a8ec859cf 100644 --- a/packages/taler-wallet-core/src/operations/deposits.ts +++ b/packages/taler-wallet-core/src/operations/deposits.ts @@ -81,7 +81,7 @@ import { InternalWalletState } from "../internal-wallet-state.js"; import { readSuccessResponseJsonOrThrow } from "@gnu-taler/taler-util/http"; import { constructTaskIdentifier, - OperationAttemptResult, + TaskRunResult, runLongpollAsync, spendCoins, TombstoneTag, @@ -462,7 +462,7 @@ async function checkDepositKycStatus( async function waitForRefreshOnDepositGroup( ws: InternalWalletState, depositGroup: DepositGroupRecord, -): Promise<OperationAttemptResult> { +): Promise<TaskRunResult> { const abortRefreshGroupId = depositGroup.abortRefreshGroupId; checkLogicInvariant(!!abortRefreshGroupId); const transactionId = constructTransactionIdentifier({ @@ -503,13 +503,13 @@ async function waitForRefreshOnDepositGroup( }); notifyTransition(ws, transactionId, transitionInfo); - return OperationAttemptResult.pendingEmpty(); + return TaskRunResult.pending(); } async function refundDepositGroup( ws: InternalWalletState, depositGroup: DepositGroupRecord, -): Promise<OperationAttemptResult> { +): Promise<TaskRunResult> { const newTxPerCoin = [...depositGroup.transactionPerCoin]; logger.info(`status per coin: ${j2s(depositGroup.transactionPerCoin)}`); for (let i = 0; i < depositGroup.transactionPerCoin.length; i++) { @@ -614,13 +614,13 @@ async function refundDepositGroup( await tx.depositGroups.put(newDg); }); - return OperationAttemptResult.pendingEmpty(); + return TaskRunResult.pending(); } async function processDepositGroupAborting( ws: InternalWalletState, depositGroup: DepositGroupRecord, -): Promise<OperationAttemptResult> { +): Promise<TaskRunResult> { logger.info("processing deposit tx in 'aborting'"); const abortRefreshGroupId = depositGroup.abortRefreshGroupId; if (!abortRefreshGroupId) { @@ -634,7 +634,7 @@ async function processDepositGroupAborting( async function processDepositGroupPendingKyc( ws: InternalWalletState, depositGroup: DepositGroupRecord, -): Promise<OperationAttemptResult> { +): Promise<TaskRunResult> { const { depositGroupId } = depositGroup; const transactionId = constructTransactionIdentifier({ tag: TransactionType.Deposit, @@ -696,7 +696,7 @@ async function processDepositGroupPendingKyc( ); } }); - return OperationAttemptResult.longpoll(); + return TaskRunResult.longpoll(); } /** @@ -709,7 +709,7 @@ async function transitionToKycRequired( depositGroup: DepositGroupRecord, kycInfo: KycPendingInfo, exchangeUrl: string, -): Promise<OperationAttemptResult> { +): Promise<TaskRunResult> { const { depositGroupId } = depositGroup; const userType = "individual"; @@ -728,7 +728,7 @@ async function transitionToKycRequired( }); if (kycStatusReq.status === HttpStatusCode.Ok) { logger.warn("kyc requested, but already fulfilled"); - return OperationAttemptResult.finishedEmpty(); + return TaskRunResult.finished(); } else if (kycStatusReq.status === HttpStatusCode.Accepted) { const kycStatus = await kycStatusReq.json(); logger.info(`kyc status: ${j2s(kycStatus)}`); @@ -754,7 +754,7 @@ async function transitionToKycRequired( return { oldTxState, newTxState }; }); notifyTransition(ws, transactionId, transitionInfo); - return OperationAttemptResult.finishedEmpty(); + return TaskRunResult.finished(); } else { throw Error(`unexpected response from kyc-check (${kycStatusReq.status})`); } @@ -764,7 +764,7 @@ async function processDepositGroupPendingTrack( ws: InternalWalletState, depositGroup: DepositGroupRecord, cancellationToken?: CancellationToken, -): Promise<OperationAttemptResult> { +): Promise<TaskRunResult> { const { depositGroupId } = depositGroup; for (let i = 0; i < depositGroup.depositedPerCoin.length; i++) { const coinPub = depositGroup.payCoinSelection.coinPubs[i]; @@ -905,10 +905,10 @@ async function processDepositGroupPendingTrack( }); notifyTransition(ws, transactionId, transitionInfo); if (allWired) { - return OperationAttemptResult.finishedEmpty(); + return TaskRunResult.finished(); } else { // FIXME: Use long-polling. - return OperationAttemptResult.pendingEmpty(); + return TaskRunResult.pending(); } } @@ -916,7 +916,7 @@ async function processDepositGroupPendingDeposit( ws: InternalWalletState, depositGroup: DepositGroupRecord, cancellationToken?: CancellationToken, -): Promise<OperationAttemptResult> { +): Promise<TaskRunResult> { logger.info("processing deposit group in pending(deposit)"); const depositGroupId = depositGroup.depositGroupId; const contractData = extractContractData( @@ -1000,7 +1000,7 @@ async function processDepositGroupPendingDeposit( }); notifyTransition(ws, transactionId, transitionInfo); - return OperationAttemptResult.finishedEmpty(); + return TaskRunResult.finished(); } /** @@ -1012,7 +1012,7 @@ export async function processDepositGroup( options: { cancellationToken?: CancellationToken; } = {}, -): Promise<OperationAttemptResult> { +): Promise<TaskRunResult> { const depositGroup = await ws.db .mktx((x) => [x.depositGroups]) .runReadOnly(async (tx) => { @@ -1020,7 +1020,7 @@ export async function processDepositGroup( }); if (!depositGroup) { logger.warn(`deposit group ${depositGroupId} not found`); - return OperationAttemptResult.finishedEmpty(); + return TaskRunResult.finished(); } switch (depositGroup.operationStatus) { @@ -1042,7 +1042,7 @@ export async function processDepositGroup( return processDepositGroupAborting(ws, depositGroup); } - return OperationAttemptResult.finishedEmpty(); + return TaskRunResult.finished(); } async function getExchangeWireFee( |