From d0d19c2e88c1443feeeec45abbc575f14489f02e Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 23 Aug 2023 14:48:03 +0200
Subject: [PATCH] harness: specify use_stefan in merchant backend

---
 packages/taler-harness/src/harness/harness.ts   | 17 +++--------------
 .../test-merchant-instances-urls.ts             |  8 ++------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts
index d29b30a5b..4e2bae8f2 100644
--- a/packages/taler-harness/src/harness/harness.ts
+++ b/packages/taler-harness/src/harness/harness.ts
@@ -1958,14 +1958,8 @@ export class MerchantService implements MerchantServiceInterface {
       name: instanceConfig.name,
       address: instanceConfig.address ?? {},
       jurisdiction: instanceConfig.jurisdiction ?? {},
-      default_max_wire_fee:
-        instanceConfig.defaultMaxWireFee ??
-        `${this.merchantConfig.currency}:1.0`,
-      default_wire_fee_amortization:
-        instanceConfig.defaultWireFeeAmortization ?? 3,
-      default_max_deposit_fee:
-        instanceConfig.defaultMaxDepositFee ??
-        `${this.merchantConfig.currency}:1.0`,
+      // FIXME: In some tests, we might want to make this configurable
+      use_stefan: true,
       default_wire_transfer_delay:
         instanceConfig.defaultWireTransferDelay ??
         Duration.toTalerProtocolDuration(
@@ -2007,9 +2001,6 @@ export interface PartialMerchantInstanceConfig {
   paytoUris: string[];
   address?: unknown;
   jurisdiction?: unknown;
-  defaultMaxWireFee?: string;
-  defaultMaxDepositFee?: string;
-  defaultWireFeeAmortization?: number;
   defaultWireTransferDelay?: TalerProtocolDuration;
   defaultPayDelay?: TalerProtocolDuration;
 }
@@ -2052,9 +2043,7 @@ export interface MerchantInstanceConfig {
   name: string;
   address: unknown;
   jurisdiction: unknown;
-  default_max_wire_fee: string;
-  default_max_deposit_fee: string;
-  default_wire_fee_amortization: number;
+  use_stefan: boolean;
   default_wire_transfer_delay: TalerProtocolDuration;
   default_pay_delay: TalerProtocolDuration;
 }
diff --git a/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts b/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts
index 1b5d50fd1..534b35278 100644
--- a/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts
+++ b/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts
@@ -67,12 +67,10 @@ export async function runMerchantInstancesUrlsTest(t: GlobalTestState) {
   await clientForDefault.createInstance({
     id: "default",
     address: {},
-    default_max_deposit_fee: "TESTKUDOS:1",
-    default_max_wire_fee: "TESTKUDOS:1",
+    use_stefan: true,
     default_pay_delay: Duration.toTalerProtocolDuration(
       Duration.fromSpec({ seconds: 60 }),
     ),
-    default_wire_fee_amortization: 1,
     default_wire_transfer_delay: Duration.toTalerProtocolDuration(
       Duration.fromSpec({ seconds: 60 }),
     ),
@@ -92,12 +90,10 @@ export async function runMerchantInstancesUrlsTest(t: GlobalTestState) {
   await clientForDefault.createInstance({
     id: "myinst",
     address: {},
-    default_max_deposit_fee: "TESTKUDOS:1",
-    default_max_wire_fee: "TESTKUDOS:1",
     default_pay_delay: Duration.toTalerProtocolDuration(
       Duration.fromSpec({ seconds: 60 }),
     ),
-    default_wire_fee_amortization: 1,
+    use_stefan: true,
     default_wire_transfer_delay: Duration.toTalerProtocolDuration(
       Duration.fromSpec({ seconds: 60 }),
     ),