wallet-core: avoid use of plain 'id' field, misc. fixes

1 files changed, 10 insertions, 10 deletions

diff --git a/packages/taler-util/src/wallet-types.ts b/packages/taler-util/src/wallet-types.ts
index d39eb3ce9..0564c45f7 100644
--- a/packages/taler-util/src/wallet-types.ts
+++ b/packages/taler-util/src/wallet-types.ts
@@ -2621,30 +2621,30 @@ export const codecForWithdrawFakebankRequest =
       .build("WithdrawFakebankRequest");
 
 export interface ActiveTask {
-  id: string;
+  taskId: string;
   transaction: TransactionIdStr | undefined;
   firstTry: AbsoluteTime | undefined;
   nextTry: AbsoluteTime | undefined;
-  counter: number | undefined;
+  retryCounter: number | undefined;
   lastError: TalerErrorDetail | undefined;
 }
 
-export interface GetActiveTasks {
+export interface GetActiveTasksResponse {
   tasks: ActiveTask[];
 }
 
 export const codecForActiveTask = (): Codec<ActiveTask> =>
   buildCodecForObject<ActiveTask>()
-    .property("id", codecForString())
+    .property("taskId", codecForString())
     .property("transaction", codecOptional(codecForTransactionIdStr()))
-    .property("counter", codecForNumber())
-    .property("firstTry", codecForAbsoluteTime)
-    .property("nextTry", codecForAbsoluteTime)
-    .property("lastError", codecForTalerErrorDetail())
+    .property("retryCounter", codecOptional(codecForNumber()))
+    .property("firstTry", codecOptional(codecForAbsoluteTime))
+    .property("nextTry", codecOptional(codecForAbsoluteTime))
+    .property("lastError", codecOptional(codecForTalerErrorDetail()))
     .build("ActiveTask");
 
-export const codecForGetActiveTasks = (): Codec<GetActiveTasks> =>
-  buildCodecForObject<GetActiveTasks>()
+export const codecForGetActiveTasks = (): Codec<GetActiveTasksResponse> =>
+  buildCodecForObject<GetActiveTasksResponse>()
     .property("tasks", codecForList(codecForActiveTask()))
     .build("GetActiveTasks");