1 files changed, 8 insertions, 59 deletions
diff --git a/packages/taler-harness/src/integrationtests/test-wallet-cli-termination.ts b/packages/taler-harness/src/integrationtests/test-wallet-cli-termination.ts
index bcd7de74b..ef4166760 100644
--- a/packages/taler-harness/src/integrationtests/test-wallet-cli-termination.ts
+++ b/packages/taler-harness/src/integrationtests/test-wallet-cli-termination.ts
@@ -21,14 +21,10 @@ import { AmountString } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js";
 import {
-  ExchangeService,
-  FakebankService,
   GlobalTestState,
-  MerchantService,
-  WalletCli,
-  generateRandomPayto,
   setupDb,
 } from "../harness/harness.js";
+import { createSimpleTestkudosEnvironmentV3 } from "harness/helpers.js";
 
 /**
  * Test that run-until-done of taler-wallet-cli terminates.
@@ -38,64 +34,17 @@ export async function runWalletCliTerminationTest(t: GlobalTestState) {
 
   const coinConfig: CoinConfig[] = defaultCoinConfig.map((x) => x("TESTKUDOS"));
 
-  const bank = await FakebankService.create(t, {
-    allowRegistrations: true,
-    currency: "TESTKUDOS",
-    database: db.connStr,
-    httpPort: 8082,
-  });
-
-  const exchange = ExchangeService.create(t, {
-    name: "testexchange-1",
-    currency: "TESTKUDOS",
-    httpPort: 8081,
-    database: db.connStr,
-  });
-
-  const merchant = await MerchantService.create(t, {
-    name: "testmerchant-1",
-    currency: "TESTKUDOS",
-    httpPort: 8083,
-    database: db.connStr,
-  });
-
-  const exchangeBankAccount = await bank.createExchangeAccount(
-    "myexchange",
-    "x",
-  );
-  exchange.addBankAccount("1", exchangeBankAccount);
-
-  bank.setSuggestedExchange(exchange, exchangeBankAccount.accountPaytoUri);
-
-  await bank.start();
-
-  await bank.pingUntilAvailable();
+  const {
+    exchange,
+    bankClient,
+    walletClient,
+  } = await createSimpleTestkudosEnvironmentV3(t, coinConfig, {});
 
-  exchange.addCoinConfigList(coinConfig);
-
-  await exchange.start();
-  await exchange.pingUntilAvailable();
-
-  merchant.addExchange(exchange);
-
-  await merchant.start();
-  await merchant.pingUntilAvailable();
-
-  await merchant.addInstanceWithWireAccount({
-    id: "default",
-    name: "Default Instance",
-    paytoUris: [generateRandomPayto("merchant-default")],
-  });
-
-  const wallet = new WalletCli(t, "wallet");
-
-  await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
-    corebankApiBaseUrl: bank.corebankApiBaseUrl,
+  await walletClient.call(WalletApiOperation.WithdrawTestBalance, {
+    corebankApiBaseUrl: bankClient.baseUrl,
     exchangeBaseUrl: exchange.baseUrl,
     amount: "TESTKUDOS:20" as AmountString,
   });
-
-  await wallet.runUntilDone();
 }
 
 runWalletCliTerminationTest.suites = ["wallet"];