wallet-core: unify handling of run-until-done, simplify waiter implementation

2 files changed, 4 insertions, 13 deletions

diff --git a/packages/taler-harness/src/bench1.ts b/packages/taler-harness/src/bench1.ts
index 428114e0e..216760260 100644
--- a/packages/taler-harness/src/bench1.ts
+++ b/packages/taler-harness/src/bench1.ts
@@ -29,7 +29,6 @@ import {
 } from "@gnu-taler/taler-util";
 import {
   AccessStats,
-  applyRunConfigDefaults,
   createNativeWalletHost2,
   Wallet,
   WalletApiOperation,
@@ -105,9 +104,7 @@ export async function runBench1(configJson: any): Promise<void> {
       exchangeBaseUrl: b1conf.exchange,
     });
 
-    await wallet.runTaskLoop({
-      stopWhenDone: true,
-    });
+    await wallet.client.call(WalletApiOperation.TestingWaitTasksDone, {});
 
     logger.info(
       `Finished withdrawal amount=${withdrawAmount} time=${Date.now() - start}`,
@@ -123,9 +120,7 @@ export async function runBench1(configJson: any): Promise<void> {
           depositPaytoUri: b1conf.payto,
         });
 
-        await wallet.runTaskLoop({
-          stopWhenDone: true,
-        });
+        await wallet.client.call(WalletApiOperation.TestingWaitTasksDone, {});
 
         logger.info(`Finished deposit amount=10 time=${Date.now() - start}`);
       }
diff --git a/packages/taler-harness/src/bench3.ts b/packages/taler-harness/src/bench3.ts
index f138dff68..a5bc094df 100644
--- a/packages/taler-harness/src/bench3.ts
+++ b/packages/taler-harness/src/bench3.ts
@@ -115,9 +115,7 @@ export async function runBench3(configJson: any): Promise<void> {
       exchangeBaseUrl: b3conf.exchange,
     });
 
-    await wallet.runTaskLoop({
-      stopWhenDone: true,
-    });
+    await wallet.client.call(WalletApiOperation.TestingWaitTasksDone, {});
 
     logger.info(
       `Finished withdrawal amount=${withdrawAmount} time=${Date.now() - start}`,
@@ -135,9 +133,7 @@ export async function runBench3(configJson: any): Promise<void> {
         depositPaytoUri: payto,
       });
 
-      await wallet.runTaskLoop({
-        stopWhenDone: true,
-      });
+      await wallet.client.call(WalletApiOperation.TestingWaitTasksDone, {});
 
       logger.info(`Finished deposit amount=10 time=${Date.now() - start}`);
     }