diff options
Diffstat (limited to 'packages/taler-wallet-core/src/wallet.ts')
-rw-r--r-- | packages/taler-wallet-core/src/wallet.ts | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts index 336817be9..eee89b483 100644 --- a/packages/taler-wallet-core/src/wallet.ts +++ b/packages/taler-wallet-core/src/wallet.ts @@ -84,7 +84,6 @@ import { codecForAny, codecForApplyDevExperiment, codecForCanonicalizeBaseUrlRequest, - codecForCheckPayTemplateRequest, codecForCheckPeerPullPaymentRequest, codecForCheckPeerPushDebitRequest, codecForConfirmPayRequest, @@ -107,7 +106,6 @@ import { codecForGetExchangeTosRequest, codecForGetWithdrawalDetailsForAmountRequest, codecForGetWithdrawalDetailsForUri, - codecForHintNetworkAvailabilityRequest, codecForImportDbRequest, codecForInitRequest, codecForInitiatePeerPullPaymentRequest, @@ -230,7 +228,6 @@ import { observeTalerCrypto, } from "./observable-wrappers.js"; import { - checkPayForTemplate, confirmPay, getContractTermsDetails, preparePayForTemplate, @@ -288,7 +285,6 @@ import { getWithdrawalTransactionByUri, parseTransactionIdentifier, resumeTransaction, - retryAll, retryTransaction, suspendTransaction, } from "./transactions.js"; @@ -746,6 +742,7 @@ async function dispatchRequestInternal( innerError: getErrorDetailFromException(e), }); } + wex.ws.initWithConfig(applyRunConfigDefaults(req.config)); if (wex.ws.config.testing.skipDefaults) { @@ -758,11 +755,8 @@ async function dispatchRequestInternal( versionInfo: getVersion(wex), }; - if (req.config?.lazyTaskLoop) { - logger.trace("lazily starting task loop"); - } else { - await wex.taskScheduler.ensureRunning(); - } + // After initialization, task loop should run. + await wex.taskScheduler.ensureRunning(); wex.ws.initCalled = true; return resp; @@ -1006,16 +1000,13 @@ async function dispatchRequestInternal( } case WalletApiOperation.ConfirmWithdrawal: { const req = codecForConfirmWithdrawalRequestRequest().decode(payload); - return confirmWithdrawal(wex, req.transactionId); + return confirmWithdrawal(wex, req); } case WalletApiOperation.PrepareBankIntegratedWithdrawal: { const req = codecForPrepareBankIntegratedWithdrawalRequest().decode(payload); return prepareBankIntegratedWithdrawal(wex, { - selectedExchange: req.exchangeBaseUrl, talerWithdrawUri: req.talerWithdrawUri, - forcedDenomSel: req.forcedDenomSel, - restrictAge: req.restrictAge, }); } case WalletApiOperation.GetExchangeTos: { @@ -1054,10 +1045,6 @@ async function dispatchRequestInternal( const req = codecForPrepareWithdrawExchangeRequest().decode(payload); return handlePrepareWithdrawExchange(wex, req); } - case WalletApiOperation.CheckPayForTemplate: { - const req = codecForCheckPayTemplateRequest().decode(payload); - return await checkPayForTemplate(wex, req); - } case WalletApiOperation.PreparePayForUri: { const req = codecForPreparePayRequest().decode(payload); return await preparePayForUri(wex, req.talerPayUri); @@ -1242,16 +1229,10 @@ async function dispatchRequestInternal( await loadBackupRecovery(wex, req); return {}; } - case WalletApiOperation.HintNetworkAvailability: { - const req = codecForHintNetworkAvailabilityRequest().decode(payload); - if (req.isNetworkAvailable) { - await retryAll(wex); - } else { - // We're not doing anything right now, but we could stop showing - // certain errors! - } - return {}; - } + // case WalletApiOperation.GetPlanForOperation: { + // const req = codecForGetPlanForOperationRequest().decode(payload); + // return await getPlanForOperation(ws, req); + // } case WalletApiOperation.ConvertDepositAmount: { const req = codecForConvertAmountRequest.decode(payload); return await convertDepositAmount(wex, req); @@ -1846,7 +1827,7 @@ class WalletDbTriggerSpec implements TriggerSpec { if (info.mode !== "readwrite") { return; } - logger.trace( + logger.info( `in after commit callback for readwrite, modified ${j2s([ ...info.modifiedStores, ])}`, |