1 files changed, 9 insertions, 89 deletions
diff --git a/packages/taler-harness/src/integrationtests/test-wallet-denom-expire.ts b/packages/taler-harness/src/integrationtests/test-wallet-denom-expire.ts
index b9d028efd..a2573eda1 100644
--- a/packages/taler-harness/src/integrationtests/test-wallet-denom-expire.ts
+++ b/packages/taler-harness/src/integrationtests/test-wallet-denom-expire.ts
@@ -17,21 +17,16 @@
 /**
  * Imports.
  */
-import { Duration, Logger, NotificationType, TalerCorebankApiClient, j2s } from "@gnu-taler/taler-util";
+import { Duration, Logger, NotificationType, j2s } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { makeNoFeeCoinConfig } from "../harness/denomStructures.js";
 import {
-    BankService,
-  ExchangeService,
-  FakebankService,
   GlobalTestState,
-  MerchantService,
-  generateRandomPayto,
   setupDb,
 } from "../harness/harness.js";
 import {
   applyTimeTravelV2,
-  createWalletDaemonWithClient,
+  createSimpleTestkudosEnvironmentV3,
   withdrawViaBankV3,
 } from "../harness/helpers.js";
 
@@ -45,89 +40,14 @@ export async function runWalletDenomExpireTest(t: GlobalTestState) {
 
   const db = await setupDb(t);
 
-  const bank = await BankService.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,
-  });
-
-  let receiverName = "Exchange";
-  let exchangeBankUsername = "exchange";
-  let exchangeBankPassword = "mypw";
-  let exchangePaytoUri = generateRandomPayto(exchangeBankUsername);
-
-  await exchange.addBankAccount("1", {
-    accountName: exchangeBankUsername,
-    accountPassword: exchangeBankPassword,
-    wireGatewayApiBaseUrl: new URL("accounts/exchange/taler-wire-gateway/", bank.baseUrl).href,
-    accountPaytoUri: exchangePaytoUri,
-  });
-
-  bank.setSuggestedExchange(exchange, exchangePaytoUri);
-
-  await bank.start();
-
-  await bank.pingUntilAvailable();
-
-  const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, {
-    auth: {
-      username: "admin",
-      password: "adminpw",
-    },
-  });
-
-  await bankClient.registerAccountExtended({
-    name: receiverName,
-    password: exchangeBankPassword,
-    username: exchangeBankUsername,
-    is_taler_exchange: true,
-    payto_uri: exchangePaytoUri,
-  });
-
-  exchange.addCoinConfigList(makeNoFeeCoinConfig("TESTKUDOS"));
-
-  await exchange.start();
-  await exchange.pingUntilAvailable();
-
-  merchant.addExchange(exchange);
-
-  await merchant.start();
-  await merchant.pingUntilAvailable();
-
-  console.log("merchant started, configuring instances");
-
-  await merchant.addInstanceWithWireAccount({
-    id: "default",
-    name: "Default Instance",
-    paytoUris: [generateRandomPayto("merchant-default")],
-  });
+  const coinConfig = makeNoFeeCoinConfig("TESTKUDOS");
 
-  await merchant.addInstanceWithWireAccount({
-    id: "minst1",
-    name: "minst1",
-    paytoUris: [generateRandomPayto("minst1")],
-  });
-
-  console.log("setup done!");
-
-  const { walletClient } = await createWalletDaemonWithClient(t, {
-    name: "default",
-  });
+  const {
+    walletClient,
+    bankClient,
+    exchange,
+    merchant,
+  } = await createSimpleTestkudosEnvironmentV3(t, coinConfig, {});
 
   // Withdraw digital cash into the wallet.