From 835ac85a28dc11b5d7f5cff041ff7973d244e07e Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 23 Oct 2021 11:35:54 +0200 Subject: Adapt euFin tests to Demobank model. Mostly, this change removes any mention of the currency when bank accounts are created. --- packages/taler-wallet-cli/src/harness/libeufin.ts | 13 ------------- .../src/integrationtests/test-libeufin-api-bankaccount.ts | 1 - .../src/integrationtests/test-libeufin-api-sandbox-camt.ts | 2 -- .../test-libeufin-api-sandbox-transactions.ts | 1 - .../src/integrationtests/test-libeufin-basic.ts | 2 -- .../test-libeufin-sandbox-wire-transfer-cli.ts | 2 -- 6 files changed, 21 deletions(-) diff --git a/packages/taler-wallet-cli/src/harness/libeufin.ts b/packages/taler-wallet-cli/src/harness/libeufin.ts index 11447b389..ea4a2685a 100644 --- a/packages/taler-wallet-cli/src/harness/libeufin.ts +++ b/packages/taler-wallet-cli/src/harness/libeufin.ts @@ -158,7 +158,6 @@ export interface BankAccountInfo { iban: string; bic: string; name: string; - currency: string; label: string; } @@ -209,15 +208,6 @@ export class LibeufinSandboxService implements LibeufinSandboxServiceInterface { } async start(): Promise { - const stdout = await sh( - this.globalTestState, - "libeufin-sandbox-config", - "libeufin-sandbox config localhost", - { - ...process.env, - LIBEUFIN_SANDBOX_DB_CONNECTION: this.sandboxConfig.databaseJdbcUri, - }, - ); this.sandboxProc = this.globalTestState.spawnService( "libeufin-sandbox", ["serve", "--port", `${this.sandboxConfig.httpPort}`], @@ -353,7 +343,6 @@ interface CreateEbicsBankAccountRequest { bic: string; // human name name: string; - currency: string; label: string; } @@ -452,7 +441,6 @@ export class SandboxUserBundle { ebicsBankAccount: CreateEbicsBankAccountRequest; constructor(salt: string) { this.ebicsBankAccount = { - currency: "EUR", bic: "BELADEBEXXX", iban: getRandomIban("DE"), label: `remote-account-${salt}`, @@ -526,7 +514,6 @@ export class LibeufinCli { this.globalTestState, "libeufin-cli-createebicsbankaccount", "libeufin-cli sandbox ebicsbankaccount create" + - ` --currency=${bankAccountDetails.currency}` + ` --iban=${bankAccountDetails.iban}` + ` --bic=${bankAccountDetails.bic}` + ` --person-name='${bankAccountDetails.personName}'` + diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-bankaccount.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-bankaccount.ts index 839ad5fa7..84b401119 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-bankaccount.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-bankaccount.ts @@ -63,7 +63,6 @@ export async function runLibeufinApiBankaccountTest(t: GlobalTestState) { iban: "DE71500105179674997361", bic: "BELADEBEXXX", name: "mock", - currency: "EUR", label: "mock", }); await LibeufinNexusApi.createEbicsBankConnection(nexus, { diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-camt.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-camt.ts index f5df4cfa3..3e0acb62d 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-camt.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-camt.ts @@ -43,14 +43,12 @@ export async function runLibeufinApiSandboxCamtTest(t: GlobalTestState) { bic: "BELADEBEXXX", name: "Mock Name", label: "mock-account-0", - currency: "EUR" }); await LibeufinSandboxApi.createBankAccount(sandbox, { iban: "DE71500105179674997361", bic: "BELADEBEXXX", name: "Mock Name", label: "mock-account-1", - currency: "EUR" }); await sandbox.makeTransaction("mock-account-0", "mock-account-1", "EUR:1", "+1"); await sandbox.makeTransaction("mock-account-0", "mock-account-1", "EUR:1", "+1"); diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-transactions.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-transactions.ts index a90644926..859d26f00 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-transactions.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-transactions.ts @@ -40,7 +40,6 @@ export async function runLibeufinApiSandboxTransactionsTest(t: GlobalTestState) bic: "BELADEBEXXX", name: "Mock Name", label: "mock-account", - currency: "EUR" }); await LibeufinSandboxApi.simulateIncomingTransaction( sandbox, diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts index 9e1842d03..6133bcc19 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts @@ -94,7 +94,6 @@ export async function createLibeufinTestEnvironment( partnerID: "partner01", userID: "user01", }, - currency: "EUR", }); // Subscriber and bank Account for the merchant // (Merchant doesn't need EBICS access, but sandbox right now only supports EBICS @@ -114,7 +113,6 @@ export async function createLibeufinTestEnvironment( partnerID: "partner02", userID: "user02", }, - currency: "EUR", }); await LibeufinNexusApi.createEbicsBankConnection(libeufinNexus, { diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-sandbox-wire-transfer-cli.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-sandbox-wire-transfer-cli.ts index 5560f091a..d784885fd 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-sandbox-wire-transfer-cli.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-sandbox-wire-transfer-cli.ts @@ -40,7 +40,6 @@ export async function runLibeufinSandboxWireTransferCliTest(t: GlobalTestState) bic: "BELADEBEXXX", name: "Mock Name", label: "mock-account", - currency: "EUR" }); await LibeufinSandboxApi.createBankAccount(sandbox, { @@ -48,7 +47,6 @@ export async function runLibeufinSandboxWireTransferCliTest(t: GlobalTestState) bic: "BELADEBEXXX", name: "Mock Name 2", label: "mock-account-2", - currency: "EUR" }); await sandbox.makeTransaction( "mock-account", "mock-account-2", "EUR:1", "one!" -- cgit v1.2.3