adopt new merchant refund API

1 files changed, 7 insertions, 16 deletions

diff --git a/src/wallet.ts b/src/wallet.ts
index 273a9f875..41569a44f 100644
--- a/src/wallet.ts
+++ b/src/wallet.ts
@@ -34,7 +34,6 @@ import {
 } from "./operations/withdraw";
 
 import {
-  abortFailedPayment,
   preparePayForUri,
   refuseProposal,
   confirmPay,
@@ -53,7 +52,7 @@ import {
   ReserveRecordStatus,
   CoinSourceType,
 } from "./types/dbTypes";
-import { MerchantRefundPermission, CoinDumpJson } from "./types/talerTypes";
+import { MerchantRefundDetails, CoinDumpJson } from "./types/talerTypes";
 import {
   BenchmarkResult,
   ConfirmPayResult,
@@ -107,7 +106,6 @@ import { WalletNotification, NotificationType } from "./types/notifications";
 import { HistoryQuery, HistoryEvent } from "./types/history";
 import {
   processPurchaseQueryRefund,
-  processPurchaseApplyRefund,
   getFullRefundFees,
   applyRefund,
 } from "./operations/refund";
@@ -218,9 +216,6 @@ export class Wallet {
       case PendingOperationType.RefundQuery:
         await processPurchaseQueryRefund(this.ws, pending.proposalId, forceNow);
         break;
-      case PendingOperationType.RefundApply:
-        await processPurchaseApplyRefund(this.ws, pending.proposalId, forceNow);
-        break;
       case PendingOperationType.Recoup:
         await processRecoupGroup(this.ws, pending.recoupGroupId, forceNow);
         break;
@@ -658,7 +653,7 @@ export class Wallet {
   }
 
   async getFullRefundFees(
-    refundPermissions: MerchantRefundPermission[],
+    refundPermissions: MerchantRefundDetails[],
   ): Promise<AmountJson> {
     return getFullRefundFees(this.ws, refundPermissions);
   }
@@ -676,11 +671,7 @@ export class Wallet {
   }
 
   async abortFailedPayment(contractTermsHash: string): Promise<void> {
-    try {
-      return abortFailedPayment(this.ws, contractTermsHash);
-    } finally {
-      this.latch.trigger();
-    }
+    throw Error("not implemented");
   }
 
   /**
@@ -745,20 +736,20 @@ export class Wallet {
       throw Error("unknown purchase");
     }
     const refundsDoneAmounts = Object.values(
-      purchase.refundState.refundsDone,
+      purchase.refundsDone,
     ).map((x) => Amounts.parseOrThrow(x.perm.refund_amount));
     const refundsPendingAmounts = Object.values(
-      purchase.refundState.refundsPending,
+      purchase.refundsPending,
     ).map((x) => Amounts.parseOrThrow(x.perm.refund_amount));
     const totalRefundAmount = Amounts.sum([
       ...refundsDoneAmounts,
       ...refundsPendingAmounts,
     ]).amount;
     const refundsDoneFees = Object.values(
-      purchase.refundState.refundsDone,
+      purchase.refundsDone,
     ).map((x) => Amounts.parseOrThrow(x.perm.refund_amount));
     const refundsPendingFees = Object.values(
-      purchase.refundState.refundsPending,
+      purchase.refundsPending,
     ).map((x) => Amounts.parseOrThrow(x.perm.refund_amount));
     const totalRefundFees = Amounts.sum([
       ...refundsDoneFees,