From e331012c9f8efef86c6a8a9297b44a67ba8cda66 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Fri, 21 Apr 2023 22:46:04 +0200
Subject: -fix harness type errors

---
 packages/taler-harness/src/bench1.ts                         | 12 ++++++++----
 packages/taler-harness/src/bench3.ts                         | 12 ++++++++----
 .../src/integrationtests/test-age-restrictions-peer.ts       |  2 --
 .../src/integrationtests/test-forced-selection.ts            |  1 -
 .../taler-harness/src/integrationtests/test-wallettesting.ts |  3 ---
 5 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'packages/taler-harness/src')

diff --git a/packages/taler-harness/src/bench1.ts b/packages/taler-harness/src/bench1.ts
index 0a4118ec1..941d9244a 100644
--- a/packages/taler-harness/src/bench1.ts
+++ b/packages/taler-harness/src/bench1.ts
@@ -86,13 +86,17 @@ export async function runBench1(configJson: any): Promise<void> {
         // No persistent DB storage.
         persistentStoragePath: undefined,
         httpLib: myHttpLib,
+        config: {
+          testing: {
+            insecureTrustExchange: trustExchange,
+          },
+          features: {
+            batchWithdrawal,
+          }
+        }
       });
       wallet = res.wallet;
       getDbStats = res.getDbStats;
-      if (trustExchange) {
-        wallet.setInsecureTrustExchange();
-      }
-      wallet.setBatchWithdrawal(batchWithdrawal);
       await wallet.client.call(WalletApiOperation.InitWallet, {});
     }
 
diff --git a/packages/taler-harness/src/bench3.ts b/packages/taler-harness/src/bench3.ts
index 5e8fac0e9..2573aec14 100644
--- a/packages/taler-harness/src/bench3.ts
+++ b/packages/taler-harness/src/bench3.ts
@@ -94,13 +94,17 @@ export async function runBench3(configJson: any): Promise<void> {
         // No persistent DB storage.
         persistentStoragePath: undefined,
         httpLib: myHttpLib,
+        config: {
+          features: {
+            batchWithdrawal: batchWithdrawal,
+          },
+          testing: {
+            insecureTrustExchange: trustExchange,
+          },
+        },
       });
       wallet = res.wallet;
       getDbStats = res.getDbStats;
-      if (trustExchange) {
-        wallet.setInsecureTrustExchange();
-      }
-      wallet.setBatchWithdrawal(batchWithdrawal);
       await wallet.client.call(WalletApiOperation.InitWallet, {});
     }
 
diff --git a/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts b/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts
index 524d04c94..d129a5217 100644
--- a/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts
+++ b/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts
@@ -19,7 +19,6 @@
  */
 import { AbsoluteTime, Duration } from "@gnu-taler/taler-util";
 import {
-  getDefaultNodeWallet2,
   WalletApiOperation,
 } from "@gnu-taler/taler-wallet-core";
 import { defaultCoinConfig } from "../harness/denomStructures.js";
@@ -27,7 +26,6 @@ import { GlobalTestState, WalletCli } from "../harness/harness.js";
 import {
   createSimpleTestkudosEnvironment,
   withdrawViaBank,
-  makeTestPayment,
 } from "../harness/helpers.js";
 
 /**
diff --git a/packages/taler-harness/src/integrationtests/test-forced-selection.ts b/packages/taler-harness/src/integrationtests/test-forced-selection.ts
index 91be11a82..d0621f000 100644
--- a/packages/taler-harness/src/integrationtests/test-forced-selection.ts
+++ b/packages/taler-harness/src/integrationtests/test-forced-selection.ts
@@ -38,7 +38,6 @@ export async function runForcedSelectionTest(t: GlobalTestState) {
   await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
     exchangeBaseUrl: exchange.baseUrl,
     amount: "TESTKUDOS:10",
-    bankBaseUrl: bank.baseUrl,
     bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl,
     forcedDenomSel: {
       denoms: [
diff --git a/packages/taler-harness/src/integrationtests/test-wallettesting.ts b/packages/taler-harness/src/integrationtests/test-wallettesting.ts
index 03c446db3..a856df79f 100644
--- a/packages/taler-harness/src/integrationtests/test-wallettesting.ts
+++ b/packages/taler-harness/src/integrationtests/test-wallettesting.ts
@@ -120,7 +120,6 @@ export async function runWallettestingTest(t: GlobalTestState) {
   await wallet.client.call(WalletApiOperation.RunIntegrationTest, {
     amountToSpend: "TESTKUDOS:5",
     amountToWithdraw: "TESTKUDOS:10",
-    bankBaseUrl: bank.baseUrl,
     bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl,
     exchangeBaseUrl: exchange.baseUrl,
     merchantAuthToken: merchantAuthToken,
@@ -144,7 +143,6 @@ export async function runWallettestingTest(t: GlobalTestState) {
 
   await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
     amount: "TESTKUDOS:10",
-    bankBaseUrl: bank.baseUrl,
     bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl,
     exchangeBaseUrl: exchange.baseUrl,
   });
@@ -170,7 +168,6 @@ export async function runWallettestingTest(t: GlobalTestState) {
 
   await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
     amount: "TESTKUDOS:10",
-    bankBaseUrl: bank.baseUrl,
     bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl,
     exchangeBaseUrl: exchange.baseUrl,
   });
-- 
cgit v1.2.3