Merge branch 'master' into age-withdraw

1 files changed, 25 insertions, 23 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-payment-abort.ts b/packages/taler-harness/src/integrationtests/test-payment-abort.ts
index 05ca7a543..fe7ecbcd7 100644
--- a/packages/taler-harness/src/integrationtests/test-payment-abort.ts
+++ b/packages/taler-harness/src/integrationtests/test-payment-abort.ts
@@ -17,41 +17,46 @@
 /**
  * Imports.
  */
-import { GlobalTestState, MerchantPrivateApi, harnessHttpLib } from "../harness/harness.js";
 import {
-  withdrawViaBank,
-  createFaultInjectedMerchantTestkudosEnvironment,
-} from "../harness/helpers.js";
-import { FaultInjectionRequestContext } from "../harness/faultInjection.js";
-import {
-  codecForMerchantOrderStatusUnpaid,
   ConfirmPayResultType,
-  j2s,
+  MerchantApiClient,
   PreparePayResultType,
   TalerErrorCode,
   TalerErrorDetail,
   URL,
+  codecForMerchantOrderStatusUnpaid,
+  j2s,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
+import { FaultInjectionRequestContext } from "../harness/faultInjection.js";
+import { GlobalTestState, harnessHttpLib } from "../harness/harness.js";
+import {
+  createFaultInjectedMerchantTestkudosEnvironment,
+  withdrawViaBankV2,
+} from "../harness/helpers.js";
 
 export async function runPaymentAbortTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { wallet, bank, exchange, faultyMerchant, faultyExchange } =
+  const { walletClient, bank, exchange, faultyMerchant, faultyExchange } =
     await createFaultInjectedMerchantTestkudosEnvironment(t);
 
   // Withdraw digital cash into the wallet.
 
-  await withdrawViaBank(t, {
-    wallet,
+  const wres = await withdrawViaBankV2(t, {
+    walletClient,
     bank,
     exchange: faultyExchange,
     amount: "TESTKUDOS:20",
   });
 
-  const merchant = faultyMerchant;
+  await wres.withdrawalFinishedCond;
 
-  let orderResp = await MerchantPrivateApi.createOrder(merchant, "default", {
+  const merchantClient = new MerchantApiClient(
+    faultyMerchant.makeInstanceBaseUrl(),
+  );
+
+  let orderResp = await merchantClient.createOrder({
     order: {
       summary: "Buy me!",
       amount: "TESTKUDOS:5",
@@ -60,7 +65,7 @@ export async function runPaymentAbortTest(t: GlobalTestState) {
     },
   });
 
-  let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  let orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
     sessionId: "mysession-one",
   });
@@ -84,7 +89,7 @@ export async function runPaymentAbortTest(t: GlobalTestState) {
 
   console.log(pubUnpaidStatus);
 
-  let preparePayResp = await wallet.client.call(
+  let preparePayResp = await walletClient.call(
     WalletApiOperation.PreparePayForUri,
     {
       talerPayUri: pubUnpaidStatus.taler_pay_uri,
@@ -124,7 +129,7 @@ export async function runPaymentAbortTest(t: GlobalTestState) {
     },
   });
 
-  const confirmPayResp = await wallet.client.call(
+  const confirmPayResp = await walletClient.call(
     WalletApiOperation.ConfirmPay,
     {
       proposalId,
@@ -134,19 +139,16 @@ export async function runPaymentAbortTest(t: GlobalTestState) {
   // Can't have succeeded yet, but network error results in "pending" state.
   t.assertDeepEqual(confirmPayResp.type, ConfirmPayResultType.Pending);
 
-  const txns = await wallet.client.call(WalletApiOperation.GetTransactions, {});
+  const txns = await walletClient.call(WalletApiOperation.GetTransactions, {});
   console.log(j2s(txns));
 
-  await wallet.client.call(WalletApiOperation.AbortTransaction, {
+  await walletClient.call(WalletApiOperation.AbortTransaction, {
     transactionId: txns.transactions[1].transactionId,
   });
 
-  await wallet.runUntilDone();
+  await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
 
-  const txns2 = await wallet.client.call(
-    WalletApiOperation.GetTransactions,
-    {},
-  );
+  const txns2 = await walletClient.call(WalletApiOperation.GetTransactions, {});
   console.log(j2s(txns2));
 
   const txTypes = txns2.transactions.map((x) => x.type);