1 files changed, 50 insertions, 30 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-revocation.ts b/packages/taler-harness/src/integrationtests/test-revocation.ts
index 04707e51a..233780674 100644
--- a/packages/taler-harness/src/integrationtests/test-revocation.ts
+++ b/packages/taler-harness/src/integrationtests/test-revocation.ts
@@ -28,20 +28,22 @@ import {
   BankService,
   delayMs,
   getPayto,
+  WalletClient,
 } from "../harness/harness.js";
 import {
-  withdrawViaBank,
-  makeTestPayment,
-  SimpleTestEnvironment,
+  SimpleTestEnvironmentNg,
+  createWalletDaemonWithClient,
+  makeTestPaymentV2,
+  withdrawViaBankV2,
 } from "../harness/helpers.js";
 
 async function revokeAllWalletCoins(req: {
-  wallet: WalletCli;
+  walletClient: WalletClient;
   exchange: ExchangeService;
   merchant: MerchantService;
 }): Promise<void> {
-  const { wallet, exchange, merchant } = req;
-  const coinDump = await wallet.client.call(WalletApiOperation.DumpCoins, {});
+  const { walletClient, exchange, merchant } = req;
+  const coinDump = await walletClient.call(WalletApiOperation.DumpCoins, {});
   console.log(coinDump);
   const usedDenomHashes = new Set<string>();
   for (const coin of coinDump.coins) {
@@ -60,7 +62,7 @@ async function revokeAllWalletCoins(req: {
 
 async function createTestEnvironment(
   t: GlobalTestState,
-): Promise<SimpleTestEnvironment> {
+): Promise<SimpleTestEnvironmentNg> {
   const db = await setupDb(t);
 
   const bank = await BankService.create(t, {
@@ -120,13 +122,13 @@ async function createTestEnvironment(
   await merchant.start();
   await merchant.pingUntilAvailable();
 
-  await merchant.addInstance({
+  await merchant.addInstanceWithWireAccount({
     id: "default",
     name: "Default Instance",
     paytoUris: [getPayto("merchant-default")],
   });
 
-  await merchant.addInstance({
+  await merchant.addInstanceWithWireAccount({
     id: "minst1",
     name: "minst1",
     paytoUris: [getPayto("minst1")],
@@ -136,11 +138,19 @@ async function createTestEnvironment(
 
   const wallet = new WalletCli(t);
 
+  const { walletService, walletClient } = await createWalletDaemonWithClient(
+    t,
+    {
+      name: "default",
+    },
+  );
+
   return {
     commonDb: db,
     exchange,
     merchant,
-    wallet,
+    walletClient,
+    walletService,
     bank,
     exchangeBankAccount,
   };
@@ -152,24 +162,30 @@ async function createTestEnvironment(
 export async function runRevocationTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { wallet, bank, exchange, merchant } = await createTestEnvironment(t);
+  const { walletClient, bank, exchange, merchant } =
+    await createTestEnvironment(t);
 
   // Withdraw digital cash into the wallet.
 
-  await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:15" });
+  const wres = await withdrawViaBankV2(t, {
+    walletClient,
+    bank,
+    exchange,
+    amount: "TESTKUDOS:15",
+  });
+  await wres.withdrawalFinishedCond;
 
   console.log("revoking first time");
-  await revokeAllWalletCoins({ wallet, exchange, merchant });
+  await revokeAllWalletCoins({ walletClient, exchange, merchant });
 
   // FIXME: this shouldn't be necessary once https://bugs.taler.net/n/6565
   // is implemented.
-  await wallet.client.call(WalletApiOperation.AddExchange, {
+  await walletClient.call(WalletApiOperation.AddExchange, {
     exchangeBaseUrl: exchange.baseUrl,
     forceUpdate: true,
   });
-  await wallet.runUntilDone();
-  await wallet.runUntilDone();
-  const bal = await wallet.client.call(WalletApiOperation.GetBalances, {});
+  await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
+  const bal = await walletClient.call(WalletApiOperation.GetBalances, {});
   console.log("wallet balance", bal);
 
   const order = {
@@ -178,39 +194,43 @@ export async function runRevocationTest(t: GlobalTestState) {
     fulfillment_url: "taler://fulfillment-success/thx",
   };
 
-  await makeTestPayment(t, { wallet, merchant, order });
+  await makeTestPaymentV2(t, { walletClient, merchant, order });
 
-  wallet.deleteDatabase();
+  await walletClient.call(WalletApiOperation.ClearDb, {});
 
-  await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:15" });
+  await withdrawViaBankV2(t, {
+    walletClient,
+    bank,
+    exchange,
+    amount: "TESTKUDOS:15",
+  });
 
-  const coinDump = await wallet.client.call(WalletApiOperation.DumpCoins, {});
+  const coinDump = await walletClient.call(WalletApiOperation.DumpCoins, {});
   console.log(coinDump);
   const coinPubList = coinDump.coins.map((x) => x.coin_pub);
-  await wallet.client.call(WalletApiOperation.ForceRefresh, {
+  await walletClient.call(WalletApiOperation.ForceRefresh, {
     coinPubList,
   });
-  await wallet.runUntilDone();
+  await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
 
   console.log("revoking second time");
-  await revokeAllWalletCoins({ wallet, exchange, merchant });
+  await revokeAllWalletCoins({ walletClient, exchange, merchant });
 
   // FIXME: this shouldn't be necessary once https://bugs.taler.net/n/6565
   // is implemented.
-  await wallet.client.call(WalletApiOperation.AddExchange, {
+  await walletClient.call(WalletApiOperation.AddExchange, {
     exchangeBaseUrl: exchange.baseUrl,
     forceUpdate: true,
   });
-  await wallet.runUntilDone();
-  await wallet.runUntilDone();
+  await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
   {
-    const bal = await wallet.client.call(WalletApiOperation.GetBalances, {});
+    const bal = await walletClient.call(WalletApiOperation.GetBalances, {});
     console.log("wallet balance", bal);
   }
 
-  await makeTestPayment(t, { wallet, merchant, order });
+  await makeTestPaymentV2(t, { walletClient, merchant, order });
 }
 
 runRevocationTest.timeoutMs = 120000;
 runRevocationTest.suites = ["wallet"];
-runRevocationTest.excludeByDefault = true;
\ No newline at end of file
+runRevocationTest.excludeByDefault = true;