wallet-core: improve insufficient balance reporting

1 files changed, 38 insertions, 24 deletions

diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts
index 291cd4c6d..3d9e7fb8a 100644
--- a/packages/taler-harness/src/harness/harness.ts
+++ b/packages/taler-harness/src/harness/harness.ts
@@ -605,6 +605,11 @@ export interface HarnessExchangeBankAccount {
 
   debitRestrictions?: AccountRestriction[];
   creditRestrictions?: AccountRestriction[];
+
+  /**
+   * If set, the harness will not automatically configure the wire fee for this account.
+   */
+  skipWireFeeCreation?: boolean;
 }
 
 /**
@@ -1320,7 +1325,6 @@ export class ExchangeService implements ExchangeServiceInterface {
       if (!p) {
         throw Error(`invalid payto uri in exchange config: ${paytoUri}`);
       }
-      accountTargetTypes.add(p?.targetType);
       const optArgs: string[] = [];
       if (acct.conversionUrl != null) {
         optArgs.push("conversion-url", acct.conversionUrl);
@@ -1339,33 +1343,43 @@ export class ExchangeService implements ExchangeServiceInterface {
           "upload",
         ],
       );
-    }
 
-    const year = new Date().getFullYear();
-    for (const accTargetType of accountTargetTypes.values()) {
-      for (let i = year; i < year + 5; i++) {
-        await runCommand(
-          this.globalState,
-          "exchange-offline",
-          "taler-exchange-offline",
-          [
-            "-c",
-            this.configFilename,
-            "wire-fee",
-            // Year
-            `${i}`,
-            // Wire method
-            accTargetType,
-            // Wire fee
-            `${this.exchangeConfig.currency}:0.01`,
-            // Closing fee
-            `${this.exchangeConfig.currency}:0.01`,
-            "upload",
-          ],
-        );
+      const accTargetType = p.targetType;
+
+      const covered = accountTargetTypes.has(p.targetType);
+      if (!covered && !acct.skipWireFeeCreation) {
+        const year = new Date().getFullYear();
+
+        for (let i = year; i < year + 5; i++) {
+          await runCommand(
+            this.globalState,
+            "exchange-offline",
+            "taler-exchange-offline",
+            [
+              "-c",
+              this.configFilename,
+              "wire-fee",
+              // Year
+              `${i}`,
+              // Wire method
+              accTargetType,
+              // Wire fee
+              `${this.exchangeConfig.currency}:0.01`,
+              // Closing fee
+              `${this.exchangeConfig.currency}:0.01`,
+              "upload",
+            ],
+          );
+          accountTargetTypes.add(accTargetType);
+        }
       }
     }
 
+    const wireTypeConfigured: Set<string> = new Set();
+
+    for (const acct of this.exchangeBankAccounts) {
+    }
+
     await runCommand(
       this.globalState,
       "exchange-offline",