-towards tip->reward rename

1 files changed, 17 insertions, 15 deletions

diff --git a/packages/taler-wallet-core/src/operations/common.ts b/packages/taler-wallet-core/src/operations/common.ts
index cc16a4704..7a8b78b53 100644
--- a/packages/taler-wallet-core/src/operations/common.ts
+++ b/packages/taler-wallet-core/src/operations/common.ts
@@ -57,7 +57,7 @@ import {
   PurchaseRecord,
   RecoupGroupRecord,
   RefreshGroupRecord,
-  TipRecord,
+  RewardRecord,
   WithdrawalGroupRecord,
 } from "../db.js";
 import { makeErrorDetail, TalerError } from "@gnu-taler/taler-util";
@@ -293,10 +293,10 @@ function convertTaskToTransactionId(
         tag: TransactionType.Refresh,
         refreshGroupId: parsedTaskId.refreshGroupId,
       });
-    case PendingTaskType.TipPickup:
+    case PendingTaskType.RewardPickup:
       return constructTransactionIdentifier({
-        tag: TransactionType.Tip,
-        walletTipId: parsedTaskId.walletTipId,
+        tag: TransactionType.Reward,
+        walletRewardId: parsedTaskId.walletRewardId,
       });
     case PendingTaskType.PeerPushDebit:
       return constructTransactionIdentifier({
@@ -515,7 +515,7 @@ export enum TombstoneTag {
   DeleteWithdrawalGroup = "delete-withdrawal-group",
   DeleteReserve = "delete-reserve",
   DeletePayment = "delete-payment",
-  DeleteTip = "delete-tip",
+  DeleteReward = "delete-reward",
   DeleteRefreshGroup = "delete-refresh-group",
   DeleteDepositGroup = "delete-deposit-group",
   DeleteRefund = "delete-refund",
@@ -601,7 +601,9 @@ export function runLongpollAsync(
       };
       res = await reqFn(cts.token);
     } catch (e) {
-      await storePendingTaskError(ws, retryTag, getErrorDetailFromException(e));
+      const errDetail = getErrorDetailFromException(e);
+      logger.warn(`got error during long-polling: ${j2s(errDetail)}`);
+      await storePendingTaskError(ws, retryTag, errDetail);
       return;
     } finally {
       delete ws.activeLongpoll[retryTag];
@@ -622,7 +624,7 @@ export type ParsedTombstone =
   | { tag: TombstoneTag.DeleteRefund; refundGroupId: string }
   | { tag: TombstoneTag.DeleteReserve; reservePub: string }
   | { tag: TombstoneTag.DeleteRefreshGroup; refreshGroupId: string }
-  | { tag: TombstoneTag.DeleteTip; walletTipId: string }
+  | { tag: TombstoneTag.DeleteReward; walletTipId: string }
   | { tag: TombstoneTag.DeletePayment; proposalId: string };
 
 export function constructTombstone(p: ParsedTombstone): TombstoneIdStr {
@@ -637,7 +639,7 @@ export function constructTombstone(p: ParsedTombstone): TombstoneIdStr {
       return `tmb:${p.tag}:${p.proposalId}` as TombstoneIdStr;
     case TombstoneTag.DeleteRefreshGroup:
       return `tmb:${p.tag}:${p.refreshGroupId}` as TombstoneIdStr;
-    case TombstoneTag.DeleteTip:
+    case TombstoneTag.DeleteReward:
       return `tmb:${p.tag}:${p.walletTipId}` as TombstoneIdStr;
     default:
       assertUnreachable(p);
@@ -810,7 +812,7 @@ export type ParsedTaskIdentifier =
   | { tag: PendingTaskType.PeerPushDebit; pursePub: string }
   | { tag: PendingTaskType.Purchase; proposalId: string }
   | { tag: PendingTaskType.Recoup; recoupGroupId: string }
-  | { tag: PendingTaskType.TipPickup; walletTipId: string }
+  | { tag: PendingTaskType.RewardPickup; walletRewardId: string }
   | { tag: PendingTaskType.Refresh; refreshGroupId: string };
 
 export function parseTaskIdentifier(x: string): ParsedTaskIdentifier {
@@ -844,8 +846,8 @@ export function parseTaskIdentifier(x: string): ParsedTaskIdentifier {
       return { tag: type, recoupGroupId: rest[0] };
     case PendingTaskType.Refresh:
       return { tag: type, refreshGroupId: rest[0] };
-    case PendingTaskType.TipPickup:
-      return { tag: type, walletTipId: rest[0] };
+    case PendingTaskType.RewardPickup:
+      return { tag: type, walletRewardId: rest[0] };
     case PendingTaskType.Withdraw:
       return { tag: type, withdrawalGroupId: rest[0] };
     default:
@@ -877,8 +879,8 @@ export function constructTaskIdentifier(p: ParsedTaskIdentifier): TaskId {
       return `${p.tag}:${p.recoupGroupId}` as TaskId;
     case PendingTaskType.Refresh:
       return `${p.tag}:${p.refreshGroupId}` as TaskId;
-    case PendingTaskType.TipPickup:
-      return `${p.tag}:${p.walletTipId}` as TaskId;
+    case PendingTaskType.RewardPickup:
+      return `${p.tag}:${p.walletRewardId}` as TaskId;
     case PendingTaskType.Withdraw:
       return `${p.tag}:${p.withdrawalGroupId}` as TaskId;
     default:
@@ -899,8 +901,8 @@ export namespace TaskIdentifiers {
   export function forExchangeCheckRefresh(exch: ExchangeRecord): TaskId {
     return `${PendingTaskType.ExchangeCheckRefresh}:${exch.baseUrl}` as TaskId;
   }
-  export function forTipPickup(tipRecord: TipRecord): TaskId {
-    return `${PendingTaskType.TipPickup}:${tipRecord.walletTipId}` as TaskId;
+  export function forTipPickup(tipRecord: RewardRecord): TaskId {
+    return `${PendingTaskType.RewardPickup}:${tipRecord.walletRewardId}` as TaskId;
   }
   export function forRefresh(refreshGroupRecord: RefreshGroupRecord): TaskId {
     return `${PendingTaskType.Refresh}:${refreshGroupRecord.refreshGroupId}` as TaskId;