diff options
Diffstat (limited to 'packages/taler-harness/src/integrationtests/test-wallettesting.ts')
-rw-r--r-- | packages/taler-harness/src/integrationtests/test-wallettesting.ts | 70 |
1 files changed, 11 insertions, 59 deletions
diff --git a/packages/taler-harness/src/integrationtests/test-wallettesting.ts b/packages/taler-harness/src/integrationtests/test-wallettesting.ts index bc5ed1004..ef9bb9073 100644 --- a/packages/taler-harness/src/integrationtests/test-wallettesting.ts +++ b/packages/taler-harness/src/integrationtests/test-wallettesting.ts @@ -26,15 +26,12 @@ import { AmountString, Amounts, CoinStatus } from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js"; import { - ExchangeService, GlobalTestState, - MerchantService, setupDb, - generateRandomPayto, - FakebankService, } from "../harness/harness.js"; import { - SimpleTestEnvironmentNg, + SimpleTestEnvironmentNg3, + createSimpleTestkudosEnvironmentV3, createWalletDaemonWithClient, } from "../harness/helpers.js"; @@ -47,57 +44,12 @@ const merchantAuthToken = "secret-token:sandbox"; export async function createMyEnvironment( t: GlobalTestState, coinConfig: CoinConfig[] = defaultCoinConfig.map((x) => x("TESTKUDOS")), -): Promise<SimpleTestEnvironmentNg> { +): Promise<SimpleTestEnvironmentNg3> { const db = await setupDb(t); - const bank = await FakebankService.create(t, { - allowRegistrations: true, - currency: "TESTKUDOS", - database: db.connStr, - httpPort: 8082, - }); - - const exchange = ExchangeService.create(t, { - name: "testexchange-1", - currency: "TESTKUDOS", - httpPort: 8081, - database: db.connStr, - }); - - const merchant = await MerchantService.create(t, { - name: "testmerchant-1", - currency: "TESTKUDOS", - httpPort: 8083, - database: db.connStr, - }); - - const exchangeBankAccount = await bank.createExchangeAccount( - "myexchange", - "x", - ); - exchange.addBankAccount("1", exchangeBankAccount); - - bank.setSuggestedExchange(exchange, exchangeBankAccount.accountPaytoUri); + const {bankClient, exchange, merchant, exchangeBankAccount} = + await createSimpleTestkudosEnvironmentV3(t, coinConfig, {}); - await bank.start(); - - await bank.pingUntilAvailable(); - - exchange.addCoinConfigList(coinConfig); - - await exchange.start(); - await exchange.pingUntilAvailable(); - - merchant.addExchange(exchange); - - await merchant.start(); - await merchant.pingUntilAvailable(); - - await merchant.addInstanceWithWireAccount({ - id: "default", - name: "Default Instance", - paytoUris: [generateRandomPayto("merchant-default")], - }); console.log("setup done!"); @@ -114,7 +66,7 @@ export async function createMyEnvironment( merchant, walletClient, walletService, - bank, + bankClient, exchangeBankAccount, }; } @@ -123,13 +75,13 @@ export async function createMyEnvironment( * Run test for basic, bank-integrated withdrawal. */ export async function runWallettestingTest(t: GlobalTestState) { - const { walletClient, bank, exchange, merchant } = + const { walletClient, bankClient, exchange, merchant } = await createMyEnvironment(t); await walletClient.call(WalletApiOperation.RunIntegrationTest, { amountToSpend: "TESTKUDOS:5" as AmountString, amountToWithdraw: "TESTKUDOS:10" as AmountString, - corebankApiBaseUrl: bank.corebankApiBaseUrl, + corebankApiBaseUrl: bankClient.baseUrl, exchangeBaseUrl: exchange.baseUrl, merchantAuthToken: merchantAuthToken, merchantBaseUrl: merchant.makeInstanceBaseUrl(), @@ -152,7 +104,7 @@ export async function runWallettestingTest(t: GlobalTestState) { await walletClient.call(WalletApiOperation.WithdrawTestBalance, { amount: "TESTKUDOS:10" as AmountString, - corebankApiBaseUrl: bank.corebankApiBaseUrl, + corebankApiBaseUrl: bankClient.baseUrl, exchangeBaseUrl: exchange.baseUrl, }); @@ -177,7 +129,7 @@ export async function runWallettestingTest(t: GlobalTestState) { await walletClient.call(WalletApiOperation.WithdrawTestBalance, { amount: "TESTKUDOS:10" as AmountString, - corebankApiBaseUrl: bank.corebankApiBaseUrl, + corebankApiBaseUrl: bankClient.baseUrl, exchangeBaseUrl: exchange.baseUrl, }); @@ -237,7 +189,7 @@ export async function runWallettestingTest(t: GlobalTestState) { await walletClient.call(WalletApiOperation.RunIntegrationTestV2, { amountToSpend: "TESTKUDOS:5" as AmountString, amountToWithdraw: "TESTKUDOS:10" as AmountString, - corebankApiBaseUrl: bank.corebankApiBaseUrl, + corebankApiBaseUrl: bankClient.baseUrl, exchangeBaseUrl: exchange.baseUrl, merchantAuthToken: merchantAuthToken, merchantBaseUrl: merchant.makeInstanceBaseUrl(), |