diff options
author | Florian Dold <florian@dold.me> | 2023-07-01 01:43:29 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2023-07-01 01:43:29 +0200 |
commit | 5695ae0a9f469ddbcd86e675f8f74b30032be457 (patch) | |
tree | daf5f7de0d9c3549ac9acf6dde4189a2ddbe3ec9 /packages/taler-harness/src/integrationtests/test-payment.ts | |
parent | f93ab03a1b946af441e35b9c057f129d25311273 (diff) | |
download | wallet-core-5695ae0a9f469ddbcd86e675f8f74b30032be457.tar.xz |
wallet-core: use testingWaitTransactionsFinal to wait for transactions
Diffstat (limited to 'packages/taler-harness/src/integrationtests/test-payment.ts')
-rw-r--r-- | packages/taler-harness/src/integrationtests/test-payment.ts | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/packages/taler-harness/src/integrationtests/test-payment.ts b/packages/taler-harness/src/integrationtests/test-payment.ts index f184e57e7..9d1ce0e22 100644 --- a/packages/taler-harness/src/integrationtests/test-payment.ts +++ b/packages/taler-harness/src/integrationtests/test-payment.ts @@ -20,9 +20,9 @@ import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { GlobalTestState } from "../harness/harness.js"; import { - createSimpleTestkudosEnvironment, - withdrawViaBank, - makeTestPayment, + createSimpleTestkudosEnvironmentV2, + withdrawViaBankV2, + makeTestPaymentV2, } from "../harness/helpers.js"; import { j2s } from "@gnu-taler/taler-util"; @@ -32,12 +32,14 @@ import { j2s } from "@gnu-taler/taler-util"; export async function runPaymentTest(t: GlobalTestState) { // Set up test environment - const { wallet, bank, exchange, merchant } = - await createSimpleTestkudosEnvironment(t); + const { walletClient, bank, exchange, merchant } = + await createSimpleTestkudosEnvironmentV2(t); // Withdraw digital cash into the wallet. - await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:20" }); + await withdrawViaBankV2(t, { walletClient, bank, exchange, amount: "TESTKUDOS:20" }); + + await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {}); const order = { summary: "Buy me!", @@ -45,8 +47,8 @@ export async function runPaymentTest(t: GlobalTestState) { fulfillment_url: "taler://fulfillment-success/thx", }; - await makeTestPayment(t, { wallet, merchant, order }); - await wallet.runUntilDone(); + await makeTestPaymentV2(t, { walletClient, merchant, order }); + await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {}); // Test JSON normalization of contract terms: Does the wallet // agree with the merchant? @@ -56,8 +58,8 @@ export async function runPaymentTest(t: GlobalTestState) { fulfillment_url: "taler://fulfillment-success/thx", }; - await makeTestPayment(t, { wallet, merchant, order: order2 }); - await wallet.runUntilDone(); + await makeTestPaymentV2(t, { walletClient, merchant, order: order2 }); + await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {}); // Test JSON normalization of contract terms: Does the wallet // agree with the merchant? @@ -67,11 +69,10 @@ export async function runPaymentTest(t: GlobalTestState) { fulfillment_url: "taler://fulfillment-success/thx", }; - await makeTestPayment(t, { wallet, merchant, order: order3 }); - - await wallet.runUntilDone(); + await makeTestPaymentV2(t, { walletClient, merchant, order: order3 }); + await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {}); - const bal = await wallet.client.call(WalletApiOperation.GetBalances, {}); + const bal = await walletClient.call(WalletApiOperation.GetBalances, {}); console.log(`balance after 3 payments: ${j2s(bal)}`); t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:3.8"); t.assertAmountEquals(bal.balances[0].pendingIncoming, "TESTKUDOS:0"); |