formatting code

This commit is contained in:
MS 2021-02-05 11:11:39 +01:00
parent 006948801e
commit a8ac8d2925
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
3 changed files with 36 additions and 20 deletions

View File

@ -101,9 +101,7 @@ import { CoinConfig } from "./denomStructures";
const exec = util.promisify(require("child_process").exec); const exec = util.promisify(require("child_process").exec);
export async function delayMs( export async function delayMs(ms: number): Promise<void> {
ms: number,
): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
setTimeout(() => resolve(), ms); setTimeout(() => resolve(), ms);
}); });

View File

@ -116,7 +116,10 @@ export class LibeufinSandboxService implements LibeufinSandboxServiceInterface {
"libeufin-sandbox", "libeufin-sandbox",
["serve", "--port", `${this.sandboxConfig.httpPort}`], ["serve", "--port", `${this.sandboxConfig.httpPort}`],
"libeufin-sandbox", "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",
"libeufin-nexus", "libeufin-nexus",
["superuser", "admin", "--password", "test"], ["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( this.nexusProc = this.globalTestState.spawnService(
"libeufin-nexus", "libeufin-nexus",
["serve", "--port", `${this.nexusConfig.httpPort}`], ["serve", "--port", `${this.nexusConfig.httpPort}`],
"libeufin-nexus", "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, this.globalTestState,
"libeufin-nexus", "libeufin-nexus",
`libeufin-nexus superuser ${details.username} --password=${details.password}`, `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); console.log(stdout);
} }
@ -315,10 +327,12 @@ export class LibeufinCli {
` --host-id=${connectionDetails.subscriberDetails.hostId}` + ` --host-id=${connectionDetails.subscriberDetails.hostId}` +
` --partner-id=${connectionDetails.subscriberDetails.partnerId}` + ` --partner-id=${connectionDetails.subscriberDetails.partnerId}` +
` --ebics-user-id=${connectionDetails.subscriberDetails.partnerId}` + ` --ebics-user-id=${connectionDetails.subscriberDetails.partnerId}` +
` ${connectionDetails.connectionName}`, { ` ${connectionDetails.connectionName}`,
...process.env, LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl, {
LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username, ...process.env,
LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password, LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl,
LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username,
LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password,
}, },
); );
console.log(stdout); console.log(stdout);
@ -331,10 +345,12 @@ export class LibeufinCli {
`libeufin-cli connections export-backup` + `libeufin-cli connections export-backup` +
` --passphrase=${details.passphrase}` + ` --passphrase=${details.passphrase}` +
` --output-file=${details.outputFile}` + ` --output-file=${details.outputFile}` +
` ${details.connectionName}`, { ` ${details.connectionName}`,
...process.env, LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl, {
LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username, ...process.env,
LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password, LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl,
LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username,
LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password,
}, },
); );
console.log(stdout); console.log(stdout);
@ -345,10 +361,12 @@ export class LibeufinCli {
this.globalTestState, this.globalTestState,
"libeufin-cli-createkeyletter", "libeufin-cli-createkeyletter",
`libeufin-cli connections get-key-letter` + `libeufin-cli connections get-key-letter` +
` ${details.connectionName} ${details.outputFile}`, { ` ${details.connectionName} ${details.outputFile}`,
...process.env, LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl, {
LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username, ...process.env,
LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password, LIBEUFIN_NEXUS_URL: this.cliDetails.nexusUrl,
LIBEUFIN_NEXUS_USERNAME: this.cliDetails.user.username,
LIBEUFIN_NEXUS_PASSWORD: this.cliDetails.user.password,
}, },
); );
console.log(stdout); console.log(stdout);

View File

@ -201,4 +201,4 @@ export async function runRevocationTest(t: GlobalTestState) {
await makeTestPayment(t, { wallet, merchant, order }); await makeTestPayment(t, { wallet, merchant, order });
} }
runRevocationTest.timeoutMs = 120000; runRevocationTest.timeoutMs = 120000;