commit 81a6a9048d280da63052139cb9b82f08cbd2a2be parent c08a5c8214e8f97a89d277bf11c6495a94190567 Author: Florian Dold <florian@dold.me> Date: Thu, 12 Mar 2026 20:58:01 +0100 harness: adjust amounts in tests Diffstat:
21 files changed, 178 insertions(+), 116 deletions(-)
diff --git a/packages/taler-harness/src/harness/denomStructures.ts b/packages/taler-harness/src/harness/denomStructures.ts @@ -65,7 +65,7 @@ export const coin_ct10 = (curr: string): CoinConfig => ({ value: `${curr}:0.10`, feeDeposit: `${curr}:0.01`, feeRefresh: `${curr}:0.01`, - feeRefund: `${curr}:0.00`, + feeRefund: `${curr}:0.01`, feeWithdraw: `${curr}:0.01`, }); @@ -73,50 +73,50 @@ export const coin_u1 = (curr: string): CoinConfig => ({ ...coinRsaCommon, name: `${curr}_u1`, value: `${curr}:1`, - feeDeposit: `${curr}:0.02`, - feeRefresh: `${curr}:0.02`, - feeRefund: `${curr}:0.02`, - feeWithdraw: `${curr}:0.02`, + feeDeposit: `${curr}:0.01`, + feeRefresh: `${curr}:0.01`, + feeRefund: `${curr}:0.01`, + feeWithdraw: `${curr}:0.01`, }); export const coin_u2 = (curr: string): CoinConfig => ({ ...coinRsaCommon, name: `${curr}_u2`, value: `${curr}:2`, - feeDeposit: `${curr}:0.02`, - feeRefresh: `${curr}:0.02`, - feeRefund: `${curr}:0.02`, - feeWithdraw: `${curr}:0.02`, + feeDeposit: `${curr}:0.01`, + feeRefresh: `${curr}:0.01`, + feeRefund: `${curr}:0.01`, + feeWithdraw: `${curr}:0.01`, }); export const coin_u4 = (curr: string): CoinConfig => ({ ...coinRsaCommon, name: `${curr}_u4`, value: `${curr}:4`, - feeDeposit: `${curr}:0.02`, - feeRefresh: `${curr}:0.02`, - feeRefund: `${curr}:0.02`, - feeWithdraw: `${curr}:0.02`, + feeDeposit: `${curr}:0.01`, + feeRefresh: `${curr}:0.01`, + feeRefund: `${curr}:0.01`, + feeWithdraw: `${curr}:0.01`, }); export const coin_u8 = (curr: string): CoinConfig => ({ ...coinRsaCommon, name: `${curr}_u8`, value: `${curr}:8`, - feeDeposit: `${curr}:0.16`, - feeRefresh: `${curr}:0.16`, - feeRefund: `${curr}:0.16`, - feeWithdraw: `${curr}:0.16`, + feeDeposit: `${curr}:0.01`, + feeRefresh: `${curr}:0.01`, + feeRefund: `${curr}:0.01`, + feeWithdraw: `${curr}:0.01`, }); const coin_u10 = (curr: string): CoinConfig => ({ ...coinRsaCommon, name: `${curr}_u10`, value: `${curr}:10`, - feeDeposit: `${curr}:0.2`, - feeRefresh: `${curr}:0.2`, - feeRefund: `${curr}:0.2`, - feeWithdraw: `${curr}:0.2`, + feeDeposit: `${curr}:0.01`, + feeRefresh: `${curr}:0.01`, + feeRefund: `${curr}:0.01`, + feeWithdraw: `${curr}:0.01`, }); export const defaultCoinConfig = [ diff --git a/packages/taler-harness/src/integrationtests/test-deposit-merge.ts b/packages/taler-harness/src/integrationtests/test-deposit-merge.ts @@ -55,7 +55,7 @@ export async function runDepositMergeTest(t: GlobalTestState) { const depositPaytoUri = getTestHarnessPaytoForLabel("foo"); const bal = await walletClient.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:49.01"); + t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:49.83"); /** * first deposit diff --git a/packages/taler-harness/src/integrationtests/test-deposit.ts b/packages/taler-harness/src/integrationtests/test-deposit.ts @@ -58,7 +58,7 @@ export async function runDepositTest(t: GlobalTestState) { const bal = await walletClient.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:19.53"); + t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:19.84"); const maxDepositResp = await walletClient.call( WalletApiOperation.GetMaxDepositAmount, @@ -68,8 +68,8 @@ export async function runDepositTest(t: GlobalTestState) { }, ); - t.assertAmountEquals(maxDepositResp.rawAmount, "TESTKUDOS:19.09"); - t.assertAmountEquals(maxDepositResp.effectiveAmount, "TESTKUDOS:19.53"); + t.assertAmountEquals(maxDepositResp.rawAmount, "TESTKUDOS:19.72"); + t.assertAmountEquals(maxDepositResp.effectiveAmount, "TESTKUDOS:19.84"); const dgIdResp = await walletClient.client.call( WalletApiOperation.GenerateDepositGroupTxId, @@ -128,7 +128,7 @@ export async function runDepositTest(t: GlobalTestState) { t.assertDeepEqual(transactions.transactions[1].type, "deposit"); // The raw amount is what ends up on the bank account, which includes // deposit and wire fees. - t.assertDeepEqual(transactions.transactions[1].amountRaw, "TESTKUDOS:9.79"); + t.assertDeepEqual(transactions.transactions[1].amountRaw, "TESTKUDOS:9.98"); const balAfter = await walletClient.call(WalletApiOperation.GetBalances, {}); console.log(`balances after deposit: ${j2s(balAfter)}`); diff --git a/packages/taler-harness/src/integrationtests/test-kyc-wallet-deposit-abort.ts b/packages/taler-harness/src/integrationtests/test-kyc-wallet-deposit-abort.ts @@ -147,7 +147,7 @@ export async function runKycWalletDepositAbortTest(t: GlobalTestState) { const bal = await walletClient.call(WalletApiOperation.GetBalances, {}); console.log(j2s(bal)); - t.assertDeepEqual(bal.balances[0].available, "TESTKUDOS:18.93"); + t.assertDeepEqual(bal.balances[0].available, "TESTKUDOS:19.05"); } runKycWalletDepositAbortTest.suites = ["wallet", "kyc"]; diff --git a/packages/taler-harness/src/integrationtests/test-merchant-wire.ts b/packages/taler-harness/src/integrationtests/test-merchant-wire.ts @@ -149,7 +149,7 @@ export async function runMerchantWireTest(t: GlobalTestState) { t.assertDeepEqual(resp.incoming.length, 1); const det = resp.incoming[0]; t.assertTrue(det.expected_credit_amount != null); - t.assertAmountEquals(det.expected_credit_amount, "TESTKUDOS:4.79"); + t.assertAmountEquals(det.expected_credit_amount, "TESTKUDOS:4.89"); incomingAmount = det.expected_credit_amount; incomingWtid = det.wtid; incomingPayto = det.payto_uri; diff --git a/packages/taler-harness/src/integrationtests/test-payment-expired.ts b/packages/taler-harness/src/integrationtests/test-payment-expired.ts @@ -126,7 +126,7 @@ export async function runPaymentExpiredTest(t: GlobalTestState) { const bal = await walletClient.call(WalletApiOperation.GetBalances, {}); console.log(j2s(bal)); - t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:18.93"); + t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:19.05"); } runPaymentExpiredTest.suites = ["wallet"]; diff --git a/packages/taler-harness/src/integrationtests/test-payment-fault.ts b/packages/taler-harness/src/integrationtests/test-payment-fault.ts @@ -48,7 +48,8 @@ import { } from "../harness/harness.js"; /** - * Run test for basic, bank-integrated withdrawal. + * FIXME: Clarify why this test is necessary. + * Possible duplication with payment-transient. */ export async function runPaymentFaultTest(t: GlobalTestState) { // Set up test environment @@ -139,11 +140,12 @@ export async function runPaymentFaultTest(t: GlobalTestState) { await merchant.start(); await merchant.pingUntilAvailable(); - const { accessToken: merchantAdminAccessToken } = await merchant.addInstanceWithWireAccount({ - id: "admin", - name: "Default Instance", - paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], - }); + const { accessToken: merchantAdminAccessToken } = + await merchant.addInstanceWithWireAccount({ + id: "admin", + name: "Default Instance", + paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], + }); const merchantClient = new TalerMerchantInstanceHttpClient( merchant.makeInstanceBaseUrl(), @@ -179,7 +181,10 @@ export async function runPaymentFaultTest(t: GlobalTestState) { ); let orderStatus = succeedOrThrow( - await merchantClient.getOrderDetails(merchantAdminAccessToken, orderResp.order_id), + await merchantClient.getOrderDetails( + merchantAdminAccessToken, + orderResp.order_id, + ), ); t.assertTrue(orderStatus.order_status === "unpaid"); @@ -193,7 +198,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) { }, ); - // Drop 3 responses from the exchange. + // Drop one response from the exchange. let faultCount = 0; faultyExchange.faultProxy.addFault({ async modifyResponse(ctx: FaultInjectionResponseContext) { @@ -204,7 +209,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) { ) { return; } - if (faultCount < 3) { + if (faultCount < 1) { console.log(`blocking /deposit request #${faultCount}`); faultCount++; ctx.dropResponse = true; @@ -230,7 +235,10 @@ export async function runPaymentFaultTest(t: GlobalTestState) { // Check if payment was successful. orderStatus = succeedOrThrow( - await merchantClient.getOrderDetails(merchantAdminAccessToken, orderResp.order_id), + await merchantClient.getOrderDetails( + merchantAdminAccessToken, + orderResp.order_id, + ), ); t.assertTrue(orderStatus.order_status === "paid"); diff --git a/packages/taler-harness/src/integrationtests/test-payment-share-idempotency.ts b/packages/taler-harness/src/integrationtests/test-payment-share-idempotency.ts @@ -44,7 +44,7 @@ export async function runPaymentShareIdempotencyTest(t: GlobalTestState) { bankClient, exchange, merchant, - merchantAdminAccessToken + merchantAdminAccessToken, } = await createSimpleTestkudosEnvironmentV3(t); const merchantClient = new TalerMerchantInstanceHttpClient( @@ -75,8 +75,8 @@ export async function runPaymentShareIdempotencyTest(t: GlobalTestState) { { const first = await firstWallet.call(WalletApiOperation.GetBalances, {}); const second = await secondWallet.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.53"); - t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:19.53"); + t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.84"); + t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:19.84"); } t.logStep("setup-done"); @@ -98,7 +98,10 @@ export async function runPaymentShareIdempotencyTest(t: GlobalTestState) { ); const orderStatus = succeedOrThrow( - await merchantClient.getOrderDetails(merchantAdminAccessToken, orderResp.order_id), + await merchantClient.getOrderDetails( + merchantAdminAccessToken, + orderResp.order_id, + ), ); t.assertTrue(orderStatus.order_status === "unpaid"); @@ -193,8 +196,8 @@ export async function runPaymentShareIdempotencyTest(t: GlobalTestState) { WalletApiOperation.GetBalances, {}, ); - t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.53"); - t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:14.23"); + t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.84"); + t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:14.72"); } t.logStep("wait-for-payment"); @@ -270,8 +273,8 @@ export async function runPaymentShareIdempotencyTest(t: GlobalTestState) { WalletApiOperation.GetBalances, {}, ); - t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.53"); - t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:8.95"); + t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.84"); + t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:9.61"); } t.logStep("wait-for-payment"); diff --git a/packages/taler-harness/src/integrationtests/test-payment-share.ts b/packages/taler-harness/src/integrationtests/test-payment-share.ts @@ -75,8 +75,8 @@ export async function runPaymentShareTest(t: GlobalTestState) { { const first = await firstWallet.call(WalletApiOperation.GetBalances, {}); const second = await secondWallet.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.53"); - t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:19.53"); + t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.84"); + t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:19.84"); } t.logStep("setup-done"); @@ -98,7 +98,10 @@ export async function runPaymentShareTest(t: GlobalTestState) { ); const orderStatus = succeedOrThrow( - await merchantClient.getOrderDetails(merchantAdminAccessToken, orderResp.order_id), + await merchantClient.getOrderDetails( + merchantAdminAccessToken, + orderResp.order_id, + ), ); t.assertTrue(orderStatus.order_status === "unpaid"); @@ -172,8 +175,8 @@ export async function runPaymentShareTest(t: GlobalTestState) { WalletApiOperation.GetBalances, {}, ); - t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.53"); - t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:14.23"); + t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.84"); + t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:14.72"); } t.logStep("wait-for-payment"); @@ -218,8 +221,8 @@ export async function runPaymentShareTest(t: GlobalTestState) { WalletApiOperation.GetBalances, {}, ); - t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.53"); - t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:14.23"); + t.assertAmountEquals(first.balances[0].available, "TESTKUDOS:19.84"); + t.assertAmountEquals(second.balances[0].available, "TESTKUDOS:14.72"); } } @@ -282,8 +285,8 @@ export async function runPaymentShareTest(t: GlobalTestState) { */ const bal1 = await firstWallet.call(WalletApiOperation.GetBalances, {}); const bal2 = await secondWallet.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(bal1.balances[0].available, "TESTKUDOS:16.18"); - t.assertAmountEquals(bal2.balances[0].available, "TESTKUDOS:14.23"); + t.assertAmountEquals(bal1.balances[0].available, "TESTKUDOS:16.72"); + t.assertAmountEquals(bal2.balances[0].available, "TESTKUDOS:14.72"); t.logStep("wait-for-payment"); diff --git a/packages/taler-harness/src/integrationtests/test-payment.ts b/packages/taler-harness/src/integrationtests/test-payment.ts @@ -19,12 +19,12 @@ */ import { TalerMerchantApi, j2s } from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; -import { GlobalTestState } from "../harness/harness.js"; import { createSimpleTestkudosEnvironmentV3, makeTestPaymentV2, withdrawViaBankV3, } from "../harness/environments.js"; +import { GlobalTestState } from "../harness/harness.js"; /** * Run test for basic, bank-integrated withdrawal and payment. @@ -32,8 +32,13 @@ import { export async function runPaymentTest(t: GlobalTestState) { // Set up test environment - const { bankClient, walletClient, exchange, merchant, merchantAdminAccessToken } = - await createSimpleTestkudosEnvironmentV3(t); + const { + bankClient, + walletClient, + exchange, + merchant, + merchantAdminAccessToken, + } = await createSimpleTestkudosEnvironmentV3(t); // Withdraw digital cash into the wallet. @@ -53,7 +58,12 @@ export async function runPaymentTest(t: GlobalTestState) { fulfillment_url: "taler://fulfillment-success/thx", } satisfies TalerMerchantApi.Order; - await makeTestPaymentV2(t, { walletClient, merchant, order, merchantAdminAccessToken }); + await makeTestPaymentV2(t, { + walletClient, + merchant, + order, + merchantAdminAccessToken, + }); await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {}); // Test JSON normalization of contract terms: Does the wallet @@ -64,7 +74,12 @@ export async function runPaymentTest(t: GlobalTestState) { fulfillment_url: "taler://fulfillment-success/thx", } satisfies TalerMerchantApi.Order; - await makeTestPaymentV2(t, { walletClient, merchant, order: order2, merchantAdminAccessToken }); + await makeTestPaymentV2(t, { + walletClient, + merchant, + order: order2, + merchantAdminAccessToken, + }); await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {}); // Test JSON normalization of contract terms: Does the wallet @@ -75,12 +90,17 @@ export async function runPaymentTest(t: GlobalTestState) { fulfillment_url: "taler://fulfillment-success/thx", } satisfies TalerMerchantApi.Order; - await makeTestPaymentV2(t, { walletClient, merchant, order: order3, merchantAdminAccessToken }); + await makeTestPaymentV2(t, { + walletClient, + merchant, + order: order3, + merchantAdminAccessToken, + }); await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {}); 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].available, "TESTKUDOS:4.52"); t.assertAmountEquals(bal.balances[0].pendingIncoming, "TESTKUDOS:0"); t.assertAmountEquals(bal.balances[0].pendingOutgoing, "TESTKUDOS:0"); } diff --git a/packages/taler-harness/src/integrationtests/test-peer-push.ts b/packages/taler-harness/src/integrationtests/test-peer-push.ts @@ -112,14 +112,14 @@ export async function runPeerPushTest(t: GlobalTestState) { ]); t.assertDeepEqual(maxpeer.exchangeBaseUrl, exchange.baseUrl); - t.assertAmountEquals(maxpeer.rawAmount, "TESTKUDOS:192.27"); - t.assertAmountEquals(maxpeer.effectiveAmount, "TESTKUDOS:196.12"); + t.assertAmountEquals(maxpeer.rawAmount, "TESTKUDOS:199.43"); + t.assertAmountEquals(maxpeer.effectiveAmount, "TESTKUDOS:199.71"); t.assertAmountEquals(checkzero.amountRaw, "TESTKUDOS:0"); t.assertAmountEquals(checkzero.amountEffective, "TESTKUDOS:0"); t.assertAmountEquals(checkfive.amountRaw, "TESTKUDOS:5"); - t.assertAmountEquals(checkfive.amountEffective, "TESTKUDOS:5.49"); + t.assertAmountEquals(checkfive.amountEffective, "TESTKUDOS:5.19"); } t.logStep("P2P push errors"); @@ -148,7 +148,7 @@ export async function runPeerPushTest(t: GlobalTestState) { // FIXME this should fail with a proper error code t.assertTrue( unknown_purse.errorDetail.code === - TalerErrorCode.WALLET_UNEXPECTED_EXCEPTION, + TalerErrorCode.WALLET_UNEXPECTED_EXCEPTION, ); } @@ -159,7 +159,7 @@ export async function runPeerPushTest(t: GlobalTestState) { // Check balance update { const bal = await wallet1.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(bal.balances[0].pendingOutgoing, "TESTKUDOS:5.49"); + t.assertAmountEquals(bal.balances[0].pendingOutgoing, "TESTKUDOS:5.19"); } const [prepare2, prepare3, prepare4] = await Promise.all( @@ -241,7 +241,7 @@ export async function runPeerPushTest(t: GlobalTestState) { { const bal = await wallet1.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:190.63"); + t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:194.52"); } // Check scan after completion @@ -260,11 +260,11 @@ export async function runPeerPushTest(t: GlobalTestState) { const tx = await initPeerPushDebit("self"); const prepare = await wallet1.call( WalletApiOperation.PreparePeerPushCredit, - { talerUri: tx.talerUri! } + { talerUri: tx.talerUri! }, ); await wallet1.call(WalletApiOperation.ConfirmPeerPushCredit, { transactionId: prepare.transactionId, - }) + }); await Promise.all([ wallet1.call(WalletApiOperation.TestingWaitTransactionState, { transactionId: tx.transactionId, @@ -281,8 +281,9 @@ export async function runPeerPushTest(t: GlobalTestState) { ]); // Check scan after completion - const idempotent = await wallet1.call(WalletApiOperation.PreparePeerPushCredit, - { talerUri: tx.talerUri! } + const idempotent = await wallet1.call( + WalletApiOperation.PreparePeerPushCredit, + { talerUri: tx.talerUri! }, ); t.assertTrue(prepare.transactionId === idempotent.transactionId); } @@ -291,11 +292,12 @@ export async function runPeerPushTest(t: GlobalTestState) { { const tx = await initPeerPushDebit("conflict"); - const [prepare2, prepare3] = await Promise.all([wallet2, wallet3].map(w => - w.call( - WalletApiOperation.PreparePeerPushCredit, - { talerUri: tx.talerUri! } - )) + const [prepare2, prepare3] = await Promise.all( + [wallet2, wallet3].map((w) => + w.call(WalletApiOperation.PreparePeerPushCredit, { + talerUri: tx.talerUri!, + }), + ), ); await exchange.stop(); @@ -309,7 +311,7 @@ export async function runPeerPushTest(t: GlobalTestState) { }), ]); - await exchange.start() + await exchange.start(); await Promise.all([ wallet1.call(WalletApiOperation.TestingWaitTransactionState, { transactionId: tx.transactionId, @@ -345,8 +347,8 @@ export async function runPeerPushTest(t: GlobalTestState) { major: TransactionMajorState.Done, }, }), - ]) - ]) + ]), + ]), ]); } @@ -500,7 +502,7 @@ export async function runPeerPushTest(t: GlobalTestState) { }); t.assertDeepEqual(txn2.transactions.length, 0); }; - await Promise.all([wallet1, wallet2, wallet3, wallet4].map(delAll)) + await Promise.all([wallet1, wallet2, wallet3, wallet4].map(delAll)); }); } diff --git a/packages/taler-harness/src/integrationtests/test-refund-incremental.ts b/packages/taler-harness/src/integrationtests/test-refund-incremental.ts @@ -37,8 +37,13 @@ import { delayMs, GlobalTestState } from "../harness/harness.js"; export async function runRefundIncrementalTest(t: GlobalTestState) { // Set up test environment - const { walletClient, bankClient, exchange, merchant, merchantAdminAccessToken } = - await createSimpleTestkudosEnvironmentV3(t); + const { + walletClient, + bankClient, + exchange, + merchant, + merchantAdminAccessToken, + } = await createSimpleTestkudosEnvironmentV3(t); const merchantClient = new TalerMerchantInstanceHttpClient( merchant.makeInstanceBaseUrl(), @@ -71,7 +76,10 @@ export async function runRefundIncrementalTest(t: GlobalTestState) { ); let orderStatus = succeedOrThrow( - await merchantClient.getOrderDetails(merchantAdminAccessToken, orderResp.order_id), + await merchantClient.getOrderDetails( + merchantAdminAccessToken, + orderResp.order_id, + ), ); t.assertTrue(orderStatus.order_status === "unpaid"); @@ -89,16 +97,23 @@ export async function runRefundIncrementalTest(t: GlobalTestState) { // Check if payment was successful. orderStatus = succeedOrThrow( - await merchantClient.getOrderDetails(merchantAdminAccessToken, orderResp.order_id), + await merchantClient.getOrderDetails( + merchantAdminAccessToken, + orderResp.order_id, + ), ); t.assertTrue(orderStatus.order_status === "paid"); let ref = succeedOrThrow( - await merchantClient.addRefund(merchantAdminAccessToken, orderResp.order_id, { - refund: "TESTKUDOS:2.5", - reason: "foo", - }), + await merchantClient.addRefund( + merchantAdminAccessToken, + orderResp.order_id, + { + refund: "TESTKUDOS:2.5", + reason: "foo", + }, + ), ); console.log("first refund increase response", ref); @@ -124,10 +139,14 @@ export async function runRefundIncrementalTest(t: GlobalTestState) { await delayMs(1200); ref = succeedOrThrow( - await merchantClient.addRefund(merchantAdminAccessToken, orderResp.order_id, { - refund: "TESTKUDOS:5", - reason: "bar", - }), + await merchantClient.addRefund( + merchantAdminAccessToken, + orderResp.order_id, + { + refund: "TESTKUDOS:5", + reason: "bar", + }, + ), ); console.log("second refund increase response", ref); @@ -137,10 +156,14 @@ export async function runRefundIncrementalTest(t: GlobalTestState) { await delayMs(1200); ref = succeedOrThrow( - await merchantClient.addRefund(merchantAdminAccessToken, orderResp.order_id, { - refund: "TESTKUDOS:10", - reason: "bar", - }), + await merchantClient.addRefund( + merchantAdminAccessToken, + orderResp.order_id, + { + refund: "TESTKUDOS:10", + reason: "bar", + }, + ), ); console.log("third refund increase response", ref); @@ -157,7 +180,10 @@ export async function runRefundIncrementalTest(t: GlobalTestState) { } orderStatus = succeedOrThrow( - await merchantClient.getOrderDetails(merchantAdminAccessToken, orderResp.order_id), + await merchantClient.getOrderDetails( + merchantAdminAccessToken, + orderResp.order_id, + ), ); t.assertTrue(orderStatus.order_status === "paid"); @@ -199,7 +225,7 @@ export async function runRefundIncrementalTest(t: GlobalTestState) { .map((x) => x.amountEffective), ).amount; - t.assertAmountEquals("TESTKUDOS:8.59", effective); + t.assertAmountEquals("TESTKUDOS:9.66", effective); } await t.shutdown(); diff --git a/packages/taler-harness/src/integrationtests/test-wallet-balance-notifications.ts b/packages/taler-harness/src/integrationtests/test-wallet-balance-notifications.ts @@ -112,8 +112,8 @@ export async function runWalletBalanceNotificationsTest(t: GlobalTestState) { ); const bal = await walletClient.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:19.53"); - t.assertAmountEquals(bal.balances[0].pendingIncoming, "TESTKUDOS:4.85"); + t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:19.84"); + t.assertAmountEquals(bal.balances[0].pendingIncoming, "TESTKUDOS:4.90"); await walletService.stop(); } diff --git a/packages/taler-harness/src/integrationtests/test-wallet-insufficient-balance.ts b/packages/taler-harness/src/integrationtests/test-wallet-insufficient-balance.ts @@ -145,7 +145,7 @@ export async function runWalletInsufficientBalanceTest(t: GlobalTestState) { t.assertAmountEquals( insufficientBalanceDetails.balanceAvailable, - "TESTKUDOS:9.72", + "TESTKUDOS:9.85", ); t.assertAmountEquals( insufficientBalanceDetails.balanceExchangeDepositable, @@ -189,11 +189,11 @@ export async function runWalletInsufficientBalanceTest(t: GlobalTestState) { ); t.assertAmountEquals( insufficientBalanceDetails.maxEffectiveSpendAmount, - "TESTKUDOS:14.22", + "TESTKUDOS:14.55", ); t.assertAmountEquals( perMyExchange.maxEffectiveSpendAmount, - "TESTKUDOS:9.47", + "TESTKUDOS:9.75", ); } @@ -242,23 +242,23 @@ export async function runWalletInsufficientBalanceTest(t: GlobalTestState) { t.assertAmountEquals( insufficientBalanceDetails.balanceAvailable, - "TESTKUDOS:14.57", + "TESTKUDOS:14.75", ); t.assertAmountEquals( insufficientBalanceDetails.balanceReceiverAcceptable, - "TESTKUDOS:9.72", + "TESTKUDOS:9.85", ); t.assertAmountEquals( insufficientBalanceDetails.perExchange[exchange.baseUrl].balanceAvailable, - "TESTKUDOS:9.72", + "TESTKUDOS:9.85", ); t.assertAmountEquals( insufficientBalanceDetails.perExchange[exchangeTwo.baseUrl] .balanceAvailable, - "TESTKUDOS:4.85", + "TESTKUDOS:4.90", ); } } diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-amount.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-amount.ts @@ -83,7 +83,7 @@ export async function runWithdrawalAmountTest(t: GlobalTestState) { const balResp = await walletClient.call(WalletApiOperation.GetBalances, {}); // We managed to withdraw the actually transferred amount! - t.assertAmountEquals(balResp.balances[0].available, "TESTKUDOS:4.85"); + t.assertAmountEquals(balResp.balances[0].available, "TESTKUDOS:4.90"); await t.shutdown(); } diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts @@ -218,7 +218,7 @@ export async function runWithdrawalBankIntegratedTest(t: GlobalTestState) { t.logStep("Check balance"); const balResp = await wallet1.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(balResp.balances[0].available, "TESTKUDOS:9.72"); + t.assertAmountEquals(balResp.balances[0].available, "TESTKUDOS:9.85"); const txn = await wallet1.call(WalletApiOperation.GetTransactions, {}); console.log(`transactions: ${j2s(txn)}`); diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-cashacceptor.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-cashacceptor.ts @@ -110,7 +110,7 @@ export async function runWithdrawalCashacceptorTest(t: GlobalTestState) { const bal = await walletClient.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:9.72"); + t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:9.85"); // It's a withdrawal from an external account, so it must not // show up in the list of bank accounts known to the wallet. diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-conversion.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-conversion.ts @@ -314,7 +314,7 @@ export async function runWithdrawalConversionTest(t: GlobalTestState) { // Check balance const balResp = await walletClient.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals("TESTKUDOS:9.72", balResp.balances[0].available); + t.assertAmountEquals("TESTKUDOS:9.85", balResp.balances[0].available); } runWithdrawalConversionTest.suites = ["wallet"]; diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-fakebank.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-fakebank.ts @@ -97,7 +97,7 @@ export async function runWithdrawalFakebankTest(t: GlobalTestState) { // Check balance const balResp = await wallet.client.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals("TESTKUDOS:9.72", balResp.balances[0].available); + t.assertAmountEquals(balResp.balances[0].available, "TESTKUDOS:9.85"); } runWithdrawalFakebankTest.suites = ["wallet"]; diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-flex.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-flex.ts @@ -82,7 +82,7 @@ export async function runWithdrawalFlexTest(t: GlobalTestState) { const bal = await walletClient.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:9.72"); + t.assertAmountEquals(bal.balances[0].available, "TESTKUDOS:9.85"); } runWithdrawalFlexTest.suites = ["wallet"]; diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts @@ -121,7 +121,7 @@ export async function runWithdrawalManualTest(t: GlobalTestState) { // Check balance const balResp = await walletClient.call(WalletApiOperation.GetBalances, {}); - t.assertAmountEquals("TESTKUDOS:9.72", balResp.balances[0].available); + t.assertAmountEquals(balResp.balances[0].available, "TESTKUDOS:9.85"); { const accounts = await walletClient.call(