[taler-wallet-core] 01/02: harness: shared test environment WIP

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository wallet-core.

commit 9be4034cc0d3cafff16917e7382f9c196ad75477
Author: Florian Dold <florian@dold.me>
AuthorDate: Wed Aug 23 14:40:23 2023 +0200

    harness: shared test environment WIP
---
 packages/taler-harness/src/harness/harness.ts      | 23 ++++++
 packages/taler-harness/src/harness/helpers.ts      | 85 ++++++++++++++++++++++
 .../src/integrationtests/test-simple-payment.ts    |  7 +-
 packages/taler-wallet-core/src/bank-api-client.ts  |  2 +-
 4 files changed, 112 insertions(+), 5 deletions(-)

diff --git a/packages/taler-harness/src/harness/harness.ts 
b/packages/taler-harness/src/harness/harness.ts
index c9202c60e..d29b30a5b 100644
--- a/packages/taler-harness/src/harness/harness.ts
+++ b/packages/taler-harness/src/harness/harness.ts
@@ -467,6 +467,22 @@ export async function setupDb(t: GlobalTestState): 
Promise<DbInfo> {
   };
 }
 
+/**
+ * Make sure that the taler-integrationtest-shared database exists.
+ * Don't delete it if it already exists.
+ */
+export async function setupSharedDb(t: GlobalTestState): Promise<DbInfo> {
+  const dbname = "taler-integrationtest-shared";
+  const databases = await runCommand(t, "list-dbs", "psql", ["-Aqtl"]);
+  if (databases.indexOf("taler-integrationtest-shared") < 0) {
+    await runCommand(t, "createdb", "createdb", [dbname]);
+  }
+  return {
+    connStr: `postgres:///${dbname}`,
+    dbname,
+  };
+}
+
 export interface BankConfig {
   currency: string;
   httpPort: number;
@@ -857,6 +873,13 @@ export class FakebankService
     accountPassword: string;
   }[] = [];
 
+  /**
+   * Create a new fakebank service handle.
+   * 
+   * First generates the configuration for the fakebank and
+   * then creates a fakebank handle, but doesn't start the fakebank
+   * service yet.
+   */
   static async create(
     gc: GlobalTestState,
     bc: BankConfig,
diff --git a/packages/taler-harness/src/harness/helpers.ts 
b/packages/taler-harness/src/harness/helpers.ts
index 3e91c8bd9..dd2c85ce1 100644
--- a/packages/taler-harness/src/harness/helpers.ts
+++ b/packages/taler-harness/src/harness/helpers.ts
@@ -55,6 +55,7 @@ import {
   MerchantService,
   MerchantServiceInterface,
   setupDb,
+  setupSharedDb,
   WalletCli,
   WalletClient,
   WalletService,
@@ -204,6 +205,90 @@ export async function createSimpleTestkudosEnvironment(
   };
 }
 
+export async function useSharedTestkudosEnvironment(t: GlobalTestState) {
+  const coinConfig: CoinConfig[] = defaultCoinConfig.map((x) => 
x("TESTKUDOS"));
+
+  const db = await setupSharedDb(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,
+  });
+
+  const exchangeBankAccount = await bank.createExchangeAccount(
+    "myexchange",
+    "x",
+  );
+  await exchange.addBankAccount("1", exchangeBankAccount);
+
+  bank.setSuggestedExchange(exchange, exchangeBankAccount.accountPaytoUri);
+
+  await bank.start();
+
+  await bank.pingUntilAvailable();
+
+  exchange.addCoinConfigList(coinConfig);
+
+  await exchange.start();
+  await exchange.pingUntilAvailable();
+
+  merchant.addExchange(exchange);
+
+  await merchant.start();
+  await merchant.pingUntilAvailable();
+
+  await merchant.addInstance({
+    id: "default",
+    name: "Default Instance",
+    paytoUris: [getPayto("merchant-default")],
+    defaultWireTransferDelay: Duration.toTalerProtocolDuration(
+      Duration.fromSpec({ minutes: 1 }),
+    ),
+  });
+
+  await merchant.addInstance({
+    id: "minst1",
+    name: "minst1",
+    paytoUris: [getPayto("minst1")],
+    defaultWireTransferDelay: Duration.toTalerProtocolDuration(
+      Duration.fromSpec({ minutes: 1 }),
+    ),
+  });
+
+  const { walletClient, walletService } = await createWalletDaemonWithClient(
+    t,
+    { name: "wallet" },
+  );
+
+  console.log("setup done!");
+
+  return {
+    commonDb: db,
+    exchange,
+    merchant,
+    walletClient,
+    walletService,
+    bank,
+    exchangeBankAccount,
+  };
+}
+
 /**
  * Run a test case with a simple TESTKUDOS Taler environment, consisting
  * of one exchange, one bank and one merchant.
diff --git a/packages/taler-harness/src/integrationtests/test-simple-payment.ts 
b/packages/taler-harness/src/integrationtests/test-simple-payment.ts
index 82fa5f21d..58ab61435 100644
--- a/packages/taler-harness/src/integrationtests/test-simple-payment.ts
+++ b/packages/taler-harness/src/integrationtests/test-simple-payment.ts
@@ -1,6 +1,6 @@
 /*
  This file is part of GNU Taler
- (C) 2020 Taler Systems S.A.
+ (C) 2023 Taler Systems S.A.
 
  GNU Taler is free software; you can redistribute it and/or modify it under the
  terms of the GNU General Public License as published by the Free Software
@@ -20,11 +20,10 @@
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { GlobalTestState } from "../harness/harness.js";
 import {
-  createSimpleTestkudosEnvironmentV2,
   withdrawViaBankV2,
   makeTestPaymentV2,
+  useSharedTestkudosEnvironment,
 } from "../harness/helpers.js";
-import { j2s } from "@gnu-taler/taler-util";
 
 /**
  * Run test for basic, bank-integrated withdrawal and payment.
@@ -33,7 +32,7 @@ export async function runSimplePaymentTest(t: 
GlobalTestState) {
   // Set up test environment
 
   const { walletClient, bank, exchange, merchant } =
-    await createSimpleTestkudosEnvironmentV2(t);
+    await useSharedTestkudosEnvironment(t);
 
   // Withdraw digital cash into the wallet.
 
diff --git a/packages/taler-wallet-core/src/bank-api-client.ts 
b/packages/taler-wallet-core/src/bank-api-client.ts
index a7484b0b2..01c28e8e8 100644
--- a/packages/taler-wallet-core/src/bank-api-client.ts
+++ b/packages/taler-wallet-core/src/bank-api-client.ts
@@ -330,7 +330,7 @@ export class WireGatewayApiClient {
  * but it will be nice to have in utils to be used by others
  */
 export class BankAccessApiClient {
-  httpLib;
+  httpLib: HttpRequestLibrary;
 
   constructor(private args: BankAccessApiClientArgs) {
     this.httpLib = createPlatformHttpLib({

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.