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

2 files changed, 10 insertions, 10 deletions

diff --git a/packages/taler-wallet-core/src/wallet-api-types.ts b/packages/taler-wallet-core/src/wallet-api-types.ts
index f493a6b8b..ba28c009a 100644
--- a/packages/taler-wallet-core/src/wallet-api-types.ts
+++ b/packages/taler-wallet-core/src/wallet-api-types.ts
@@ -60,7 +60,7 @@ import {
   FailTransactionRequest,
   ForceRefreshRequest,
   ForgetKnownBankAccountsRequest,
-  GetActiveTasks,
+  GetActiveTasksResponse,
   GetAmountRequest,
   GetBalanceDetailRequest,
   GetContractTermsDetailsRequest,
@@ -235,11 +235,6 @@ export enum WalletApiOperation {
   Recycle = "recycle",
   ApplyDevExperiment = "applyDevExperiment",
   ValidateIban = "validateIban",
-  TestingWaitTransactionsFinal = "testingWaitTransactionsFinal",
-  TestingWaitRefreshesFinal = "testingWaitRefreshesFinal",
-  TestingWaitTransactionState = "testingWaitTransactionState",
-  TestingWaitTasksDone = "testingWaitTasksDone",
-  TestingSetTimetravel = "testingSetTimetravel",
   GetCurrencySpecification = "getCurrencySpecification",
   ListStoredBackups = "listStoredBackups",
   CreateStoredBackup = "createStoredBackup",
@@ -248,7 +243,6 @@ export enum WalletApiOperation {
   UpdateExchangeEntry = "updateExchangeEntry",
   ListExchangesForScopedCurrency = "listExchangesForScopedCurrency",
   PrepareWithdrawExchange = "prepareWithdrawExchange",
-  TestingInfiniteTransactionLoop = "testingInfiniteTransactionLoop",
   GetExchangeResources = "getExchangeResources",
   DeleteExchange = "deleteExchange",
   ListGlobalCurrencyExchanges = "listGlobalCurrencyExchanges",
@@ -258,6 +252,12 @@ export enum WalletApiOperation {
   AddGlobalCurrencyAuditor = "addGlobalCurrencyAuditor",
   RemoveGlobalCurrencyAuditor = "removeGlobalCurrencyAuditor",
   ListAssociatedRefreshes = "listAssociatedRefreshes",
+  TestingWaitTransactionsFinal = "testingWaitTransactionsFinal",
+  TestingWaitRefreshesFinal = "testingWaitRefreshesFinal",
+  TestingWaitTransactionState = "testingWaitTransactionState",
+  TestingWaitTasksDone = "testingWaitTasksDone",
+  TestingSetTimetravel = "testingSetTimetravel",
+  TestingInfiniteTransactionLoop = "testingInfiniteTransactionLoop",
   TestingListTaskForTransaction = "testingListTasksForTransaction",
   TestingGetDenomStats = "testingGetDenomStats",
   TestingPing = "testingPing",
@@ -1074,7 +1074,7 @@ export type GetPendingTasksOp = {
 export type GetActiveTasksOp = {
   op: WalletApiOperation.GetActiveTasks;
   request: EmptyObject;
-  response: GetActiveTasks;
+  response: GetActiveTasksResponse;
 };
 
 /**
diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts
index 45f9e6078..f743e82b1 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -1043,8 +1043,8 @@ async function dispatchRequestInternal<Op extends WalletApiOperation>(
         const lastError = d?.lastError;
 
         return {
-          id: taskId,
-          counter,
+          taskId: taskId,
+          retryCounter: counter,
           firstTry,
           nextTry,
           lastError,