From 6cc3fb3d0466e89b67be271009a2fc95f3ed41ca Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 24 Aug 2023 18:29:54 +0200
Subject: harness: modernize some tests

---
 .../src/integrationtests/test-payment-template.ts    | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'packages/taler-harness/src/integrationtests/test-payment-template.ts')

diff --git a/packages/taler-harness/src/integrationtests/test-payment-template.ts b/packages/taler-harness/src/integrationtests/test-payment-template.ts
index 41e43e28a..172791648 100644
--- a/packages/taler-harness/src/integrationtests/test-payment-template.ts
+++ b/packages/taler-harness/src/integrationtests/test-payment-template.ts
@@ -17,13 +17,12 @@
 /**
  * Imports.
  */
-import { ConfirmPayResultType, Duration, PreparePayResultType, TalerProtocolTimestamp } from "@gnu-taler/taler-util";
+import { ConfirmPayResultType, Duration, PreparePayResultType } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { GlobalTestState, MerchantPrivateApi } from "../harness/harness.js";
 import {
-  createSimpleTestkudosEnvironment,
-  withdrawViaBank,
-  makeTestPayment,
+  createSimpleTestkudosEnvironmentV2,
+  withdrawViaBankV2
 } from "../harness/helpers.js";
 
 /**
@@ -32,8 +31,8 @@ import {
 export async function runPaymentTemplateTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { wallet, bank, exchange, merchant } =
-    await createSimpleTestkudosEnvironment(t);
+  const { walletClient, bank, exchange, merchant } =
+    await createSimpleTestkudosEnvironmentV2(t);
 
   await MerchantPrivateApi.createTemplate(merchant, "default", {
     template_id: "template1",
@@ -51,11 +50,11 @@ export async function runPaymentTemplateTest(t: GlobalTestState) {
 
   // Withdraw digital cash into the wallet.
 
-  await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:20" });
+  await withdrawViaBankV2(t, { walletClient, bank, exchange, amount: "TESTKUDOS:20" });
 
   // Request a template payment
 
-  const preparePayResult = await wallet.client.call(
+  const preparePayResult = await walletClient.call(
     WalletApiOperation.PreparePayForTemplate,
     {
       talerPayTemplateUri: `taler+http://pay-template/localhost:${merchant.port}/template1?amount=TESTKUDOS:1`,
@@ -71,7 +70,7 @@ export async function runPaymentTemplateTest(t: GlobalTestState) {
 
   // Pay for it
 
-  const r2 = await wallet.client.call(WalletApiOperation.ConfirmPay, {
+  const r2 = await walletClient.call(WalletApiOperation.ConfirmPay, {
     proposalId: preparePayResult.proposalId,
   });
 
@@ -88,8 +87,7 @@ export async function runPaymentTemplateTest(t: GlobalTestState) {
   );
 
   t.assertTrue(orderStatus.order_status === "paid");
-
-  await wallet.runUntilDone();
+  await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
 }
 
 runPaymentTemplateTest.suites = ["wallet"];
-- 
cgit v1.2.3