From 5df7ddba97aa4482c781bfe8e87f60c3bc195ae4 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 17 Jun 2021 13:34:59 +0200
Subject: use the new wallet core API interface in all tests

---
 packages/taler-wallet-core/src/wallet-api-types.ts | 26 +++++++++++++++++-----
 packages/taler-wallet-core/src/wallet.ts           |  2 ++
 2 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'packages/taler-wallet-core')

diff --git a/packages/taler-wallet-core/src/wallet-api-types.ts b/packages/taler-wallet-core/src/wallet-api-types.ts
index 39d63b04b..d1c8914d9 100644
--- a/packages/taler-wallet-core/src/wallet-api-types.ts
+++ b/packages/taler-wallet-core/src/wallet-api-types.ts
@@ -22,6 +22,7 @@
  * Imports.
  */
 import {
+  AbortPayWithRefundRequest,
   AcceptBankIntegratedWithdrawalRequest,
   AcceptExchangeTosRequest,
   AcceptManualWithdrawalRequest,
@@ -45,6 +46,7 @@ import {
   GetExchangeTosResult,
   GetWithdrawalDetailsForAmountRequest,
   GetWithdrawalDetailsForUriRequest,
+  IntegrationTestArgs,
   ManualWithdrawalDetails,
   PreparePayRequest,
   PreparePayResult,
@@ -54,12 +56,14 @@ import {
   RetryTransactionRequest,
   SetCoinSuspendedRequest,
   SetWalletDeviceIdRequest,
+  TestPayArgs,
   TrackDepositGroupRequest,
   TrackDepositGroupResponse,
   TransactionsRequest,
   TransactionsResponse,
   WalletBackupContentV1,
   WalletCurrencyInfo,
+  WithdrawTestBalanceRequest,
   WithdrawUriInfoResponse,
 } from "@gnu-taler/taler-util";
 import { AddBackupProviderRequest, BackupInfo } from "./operations/backup";
@@ -85,7 +89,7 @@ export enum WalletApiOperation {
   AcceptBankIntegratedWithdrawal = "acceptBankIntegratedWithdrawal",
   GetExchangeTos = "getExchangeTos",
   RetryPendingNow = "retryPendingNow",
-  PreparePay = "preparePay",
+  AbortFailedPayWithRefund = "abortFailedPayWithRefund",
   ConfirmPay = "confirmPay",
   DumpCoins = "dumpCoins",
   SetCoinSuspended = "setCoinSuspended",
@@ -117,14 +121,14 @@ export type WalletOperations = {
     request: {};
     response: {};
   };
-  [WalletApiOperation.PreparePay]: {
-    request: PreparePayRequest;
-    response: PreparePayResult;
-  };
   [WalletApiOperation.ConfirmPay]: {
     request: ConfirmPayRequest;
     response: ConfirmPayResult;
   };
+  [WalletApiOperation.AbortFailedPayWithRefund]: {
+    request: AbortPayWithRefundRequest;
+    response: {};
+  };
   [WalletApiOperation.GetBalances]: {
     request: {};
     response: BalancesResponse;
@@ -241,6 +245,18 @@ export type WalletOperations = {
     request: {};
     response: BackupInfo;
   };
+  [WalletApiOperation.RunIntegrationTest]: {
+    request: IntegrationTestArgs;
+    response: {};
+  };
+  [WalletApiOperation.WithdrawTestBalance]: {
+    request: WithdrawTestBalanceRequest;
+    response: {};
+  };
+  [WalletApiOperation.TestPay]: {
+    request: TestPayArgs;
+    response: {};
+  }
 };
 
 export type RequestType<
diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts
index 85b5ae657..920cd2cc1 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -791,6 +791,8 @@ async function dispatchRequestInternal(
       await runPending(ws, true);
       return {};
     }
+    // FIXME: Deprecate one of the aliases!
+    case "preparePayForUri":
     case "preparePay": {
       const req = codecForPreparePayRequest().decode(payload);
       return await preparePayForUri(ws, req.talerPayUri);
-- 
cgit v1.2.3