integration testing tweaks, rerun-payment-multiple scenario

1 files changed, 31 insertions, 16 deletions

diff --git a/packages/taler-integrationtests/src/test-payment-multiple.ts b/packages/taler-integrationtests/src/test-payment-multiple.ts
index 2914b7181..84aab4c81 100644
--- a/packages/taler-integrationtests/src/test-payment-multiple.ts
+++ b/packages/taler-integrationtests/src/test-payment-multiple.ts
@@ -28,16 +28,13 @@ import {
   coin_ct10,
   coin_u1,
 } from "./harness";
-import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";
-
-/**
- * Run test.
- * 
- * This test uses a very sub-optimal denomination structure.
- */
-runTest(async (t: GlobalTestState) => {
-  // Set up test environment
+import { withdrawViaBank } from "./helpers";
 
+async function setupTest(t: GlobalTestState): Promise<{
+  merchant: MerchantService,
+  exchange: ExchangeService,
+  bank: BankService,
+}> {
   const db = await setupDb(t);
 
   const bank = await BankService.create(t, {
@@ -45,22 +42,23 @@ runTest(async (t: GlobalTestState) => {
     currency: "TESTKUDOS",
     database: db.connStr,
     httpPort: 8082,
-    suggestedExchange: "http://localhost:8081/",
-    suggestedExchangePayto: "payto://x-taler-bank/MyExchange",
   });
 
-  await bank.start();
-
-  await bank.pingUntilAvailable();
-
   const exchange = ExchangeService.create(t, {
     name: "testexchange-1",
     currency: "TESTKUDOS",
     httpPort: 8081,
     database: db.connStr,
-    coinConfig: [coin_ct10, coin_u1],
   });
 
+  exchange.addOfferedCoins([coin_ct10, coin_u1]);
+
+  bank.setSuggestedExchange(exchange, "payto://x-taler-bank/MyExchange");
+
+  await bank.start();
+
+  await bank.pingUntilAvailable();
+
   await exchange.setupTestBankAccount(bank, "1", "MyExchange", "x");
 
   await exchange.start();
@@ -92,6 +90,23 @@ runTest(async (t: GlobalTestState) => {
 
   console.log("setup done!");
 
+  return {
+    merchant,
+    bank,
+    exchange,
+  }
+}
+
+/**
+ * Run test.
+ * 
+ * This test uses a very sub-optimal denomination structure.
+ */
+runTest(async (t: GlobalTestState) => {
+  // Set up test environment
+
+  const { merchant, bank, exchange } = await setupTest(t);
+
   const wallet = new WalletCli(t);
 
   // Withdraw digital cash into the wallet.