From a8ac8d2925dbcaedb30ce279ca52dc4686e33325 Mon Sep 17 00:00:00 2001 From: MS Date: Fri, 5 Feb 2021 11:11:39 +0100 Subject: formatting code --- .../src/integrationtests/harness.ts | 4 +- .../src/integrationtests/libeufin.ts | 50 +++++++++++++++------- .../src/integrationtests/test-revocation.ts | 2 +- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/packages/taler-wallet-cli/src/integrationtests/harness.ts b/packages/taler-wallet-cli/src/integrationtests/harness.ts index 76a6a0fc1..518326f93 100644 --- a/packages/taler-wallet-cli/src/integrationtests/harness.ts +++ b/packages/taler-wallet-cli/src/integrationtests/harness.ts @@ -101,9 +101,7 @@ import { CoinConfig } from "./denomStructures"; const exec = util.promisify(require("child_process").exec); -export async function delayMs( - ms: number, -): Promise { +export async function delayMs(ms: number): Promise { return new Promise((resolve, reject) => { setTimeout(() => resolve(), ms); }); diff --git a/packages/taler-wallet-cli/src/integrationtests/libeufin.ts b/packages/taler-wallet-cli/src/integrationtests/libeufin.ts index ba5ce6e75..ad26a74ed 100644 --- a/packages/taler-wallet-cli/src/integrationtests/libeufin.ts +++ b/packages/taler-wallet-cli/src/integrationtests/libeufin.ts @@ -116,7 +116,10 @@ export class LibeufinSandboxService implements LibeufinSandboxServiceInterface { "libeufin-sandbox", ["serve", "--port", `${this.sandboxConfig.httpPort}`], "libeufin-sandbox", - { ...process.env, LIBEUFIN_SANDBOX_DB_CONNECTION: this.sandboxConfig.databaseJdbcUri }, + { + ...process.env, + LIBEUFIN_SANDBOX_DB_CONNECTION: this.sandboxConfig.databaseJdbcUri, + }, ); } @@ -151,14 +154,20 @@ export class LibeufinNexusService { "libeufin-nexus-superuser", "libeufin-nexus", ["superuser", "admin", "--password", "test"], - { ...process.env, LIBEUFIN_NEXUS_DB_CONNECTION: this.nexusConfig.databaseJdbcUri } + { + ...process.env, + LIBEUFIN_NEXUS_DB_CONNECTION: this.nexusConfig.databaseJdbcUri, + }, ); this.nexusProc = this.globalTestState.spawnService( "libeufin-nexus", ["serve", "--port", `${this.nexusConfig.httpPort}`], "libeufin-nexus", - { ...process.env, LIBEUFIN_NEXUS_DB_CONNECTION: this.nexusConfig.databaseJdbcUri } + { + ...process.env, + LIBEUFIN_NEXUS_DB_CONNECTION: this.nexusConfig.databaseJdbcUri, + }, ); } @@ -172,7 +181,10 @@ export class LibeufinNexusService { this.globalTestState, "libeufin-nexus", `libeufin-nexus superuser ${details.username} --password=${details.password}`, - { ...process.env, LIBEUFIN_NEXUS_DB_CONNECTION: this.nexusConfig.databaseJdbcUri } + { + ...process.env, + LIBEUFIN_NEXUS_DB_CONNECTION: this.nexusConfig.databaseJdbcUri, + }, ); console.log(stdout); } @@ -315,10 +327,12 @@ export class LibeufinCli { ` --host-id=${connectionDetails.subscriberDetails.hostId}` + ` --partner-id=${connectionDetails.subscriberDetails.partnerId}` + ` --ebics-user-id=${connectionDetails.subscriberDetails.partnerId}` + - ` ${connectionDetails.connectionName}`, { - ...process.env, LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl, - LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username, - LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password, + ` ${connectionDetails.connectionName}`, + { + ...process.env, + LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl, + LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username, + LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password, }, ); console.log(stdout); @@ -331,10 +345,12 @@ export class LibeufinCli { `libeufin-cli connections export-backup` + ` --passphrase=${details.passphrase}` + ` --output-file=${details.outputFile}` + - ` ${details.connectionName}`, { - ...process.env, LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl, - LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username, - LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password, + ` ${details.connectionName}`, + { + ...process.env, + LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl, + LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username, + LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password, }, ); console.log(stdout); @@ -345,10 +361,12 @@ export class LibeufinCli { this.globalTestState, "libeufin-cli-createkeyletter", `libeufin-cli connections get-key-letter` + - ` ${details.connectionName} ${details.outputFile}`, { - ...process.env, LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl, - LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username, - LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password, + ` ${details.connectionName} ${details.outputFile}`, + { + ...process.env, + LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl, + LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username, + LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password, }, ); console.log(stdout); diff --git a/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts b/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts index 54f330c68..6cd4174a4 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts @@ -201,4 +201,4 @@ export async function runRevocationTest(t: GlobalTestState) { await makeTestPayment(t, { wallet, merchant, order }); } -runRevocationTest.timeoutMs = 120000; \ No newline at end of file +runRevocationTest.timeoutMs = 120000; -- cgit v1.2.3