taler-typescript-core

commit 4433a4d49cdce0b0b0491e834c6f598c5e923928
parent 4d6c7ca01c862d25a914313f49f4336a397e37d0
Author: Florian Dold <florian@dold.me>
Date:   Tue, 26 Mar 2024 10:43:18 +0100

-logging

Diffstat:
M
packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts
 | 
4
----
M
packages/taler-wallet-core/src/pay-merchant.ts
 | 
9
+++++++--

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts b/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts
@@ -48,10 +48,6 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) {
     },
   );
 
-  const merchantClient = new MerchantApiClient(
-    merchant.makeInstanceBaseUrl("default"),
-  );
-
   const { walletClient: walletClientTwo } = await createWalletDaemonWithClient(
     t,
     {
diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts
@@ -610,7 +610,8 @@ async function processDownloadProposal(
 
   if (proposal.purchaseStatus != PurchaseStatus.PendingDownloadingProposal) {
     logger.error(
-      `unexpected state ${proposal.purchaseStatus}/${PurchaseStatus[proposal.purchaseStatus]
+      `unexpected state ${proposal.purchaseStatus}/${
+        PurchaseStatus[proposal.purchaseStatus]
       } for ${ctx.transactionId} in processDownloadProposal`,
     );
     return TaskRunResult.finished();
@@ -866,7 +867,8 @@ async function createOrReusePurchase(
     oldProposal.claimToken === claimToken
   ) {
     logger.info(
-      `Found old proposal (status=${PurchaseStatus[oldProposal.purchaseStatus]
+      `Found old proposal (status=${
+        PurchaseStatus[oldProposal.purchaseStatus]
       }) for order ${orderId} at ${merchantBaseUrl}`,
     );
     if (oldProposal.purchaseStatus === PurchaseStatus.DialogShared) {
@@ -2115,6 +2117,9 @@ async function processPurchasePay(
     if (resp.status >= 400 && resp.status <= 499) {
       logger.trace("got generic 4xx from merchant");
       const err = await readTalerErrorResponse(resp);
+      if (logger.shouldLogTrace()) {
+        logger.trace(`error body: ${j2s(err)}`);
+      }
       throwUnexpectedRequestError(resp, err);
     }