From f5a8ae33e3c2f1575aa66f990f4e5d538b9532f8 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 19 Aug 2021 18:34:23 +0200
Subject: cleanup / formatting

---
 packages/taler-wallet-cli/src/integrationtests/harness.ts  | 14 +++++++-------
 packages/taler-wallet-cli/src/integrationtests/sync.ts     |  1 -
 .../src/integrationtests/test-revocation.ts                |  2 +-
 .../taler-wallet-cli/src/integrationtests/test-tipping.ts  |  2 +-
 packages/taler-wallet-core/src/operations/refresh.ts       |  4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/taler-wallet-cli/src/integrationtests/harness.ts b/packages/taler-wallet-cli/src/integrationtests/harness.ts
index fef4c27c1..10b93b330 100644
--- a/packages/taler-wallet-cli/src/integrationtests/harness.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/harness.ts
@@ -76,8 +76,8 @@ export async function delayMs(ms: number): Promise<void> {
 }
 
 export interface WithAuthorization {
-  Authorization?: string,
-} ;
+  Authorization?: string;
+}
 
 interface WaitResult {
   code: number | null;
@@ -1220,7 +1220,9 @@ export namespace MerchantPrivateApi {
   ): Promise<PostOrderResponse> {
     const baseUrl = merchantService.makeInstanceBaseUrl(instanceName);
     let url = new URL("private/orders", baseUrl);
-    const resp = await axios.post(url.href, req, { headers: withAuthorization });
+    const resp = await axios.post(url.href, req, {
+      headers: withAuthorization,
+    });
     return codecForPostOrderResponse().decode(resp.data);
   }
 
@@ -1395,10 +1397,8 @@ export class MerchantService implements MerchantServiceInterface {
     }
   }
 
-  async start(
-    withResetTables: boolean = true, // eventually, this should become a named parameter
-  ): Promise<void> {
-    await exec(`taler-merchant-dbinit ${withResetTables ? "-r" : ""} -c "${this.configFilename}"`);
+  async start(): Promise<void> {
+    await exec(`taler-merchant-dbinit -c "${this.configFilename}"`);
 
     this.proc = this.globalState.spawnService(
       "taler-merchant-httpd",
diff --git a/packages/taler-wallet-cli/src/integrationtests/sync.ts b/packages/taler-wallet-cli/src/integrationtests/sync.ts
index 73d3c9ddf..90e6c1391 100644
--- a/packages/taler-wallet-cli/src/integrationtests/sync.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/sync.ts
@@ -17,7 +17,6 @@
 /**
  * Imports.
  */
-import axios from "axios";
 import { URL } from "@gnu-taler/taler-util";
 import * as fs from "fs";
 import * as util from "util";
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts b/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts
index 0b5c47551..fc1ffb267 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts
@@ -53,7 +53,7 @@ async function revokeAllWalletCoins(req: {
   await exchange.keyup();
   await delayMs(1000);
   await merchant.stop();
-  await merchant.start(false); // 'false' prevents DB reset
+  await merchant.start();
   await merchant.pingUntilAvailable();
 }
 
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-tipping.ts b/packages/taler-wallet-cli/src/integrationtests/test-tipping.ts
index 3eb8109e5..2421b462f 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-tipping.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-tipping.ts
@@ -64,7 +64,7 @@ export async function runTippingTest(t: GlobalTestState) {
   await exchange.runWirewatchOnce();
 
   await merchant.stop();
-  await merchant.start(false);
+  await merchant.start();
   await merchant.pingUntilAvailable();
 
   const r = await MerchantPrivateApi.queryTippingReserves(merchant, "default");
diff --git a/packages/taler-wallet-core/src/operations/refresh.ts b/packages/taler-wallet-core/src/operations/refresh.ts
index 2e6e7d80c..5c4ed4f70 100644
--- a/packages/taler-wallet-core/src/operations/refresh.ts
+++ b/packages/taler-wallet-core/src/operations/refresh.ts
@@ -186,8 +186,8 @@ async function refreshCreateSession(
     logger.trace(`printing selected denominations for refresh`);
     logger.trace(`current time: ${stringifyTimestamp(getTimestampNow())}`);
     for (const denom of newCoinDenoms.selectedDenoms) {
-      console.log(`denom ${denom.denom}, count ${denom.count}`);
-      console.log(
+      logger.trace(`denom ${denom.denom}, count ${denom.count}`);
+      logger.trace(
         `withdrawal expiration ${stringifyTimestamp(
           denom.denom.stampExpireWithdraw,
         )}`,
-- 
cgit v1.2.3