commit dccd67f5ff147691f96e9b4dc4bc695a86918373
parent 89fc19fe8a4338650920560c49c6c173c38c3f88
Author: Florian Dold <florian@dold.me>
Date: Mon, 6 Oct 2025 18:59:45 +0200
harness: different amounts in donau test
Diffstat:
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/packages/taler-harness/src/integrationtests/test-donau.ts b/packages/taler-harness/src/integrationtests/test-donau.ts
@@ -19,6 +19,7 @@
*/
import {
AccessToken,
+ AmountString,
ConfirmPayResultType,
DonauHttpClient,
j2s,
@@ -153,7 +154,13 @@ export async function runDonauTest(t: GlobalTestState) {
t.assertDeepEqual(getRes.currentDonauInfo.donauBaseUrl, donau.baseUrl);
}
- for (let i = 0; i < 3; i++) {
+ const amounts: AmountString[] = [
+ "TESTKUDOS:1",
+ "TESTKUDOS:9.42",
+ "TESTKUDOS:0.1",
+ ];
+
+ for (let i = 0; i < amounts.length; i++) {
const orderResp = succeedOrThrow(
await merchantClient.createOrder(merchantAdminAccessToken, {
order: {
@@ -161,11 +168,11 @@ export async function runDonauTest(t: GlobalTestState) {
summary: "Test Donation",
choices: [
{
- amount: "TESTKUDOS:9",
+ amount: amounts[i],
outputs: [
{
type: OrderOutputType.TaxReceipt,
- amount: "TESTKUDOS:9",
+ amount: amounts[i],
donau_urls: [donau.baseUrl],
},
],
@@ -240,4 +247,3 @@ export async function runDonauTest(t: GlobalTestState) {
}
runDonauTest.suites = ["donau"];
-runDonauTest.experimental = true
-\ No newline at end of file
diff --git a/packages/taler-wallet-core/src/donau.ts b/packages/taler-wallet-core/src/donau.ts
@@ -84,6 +84,8 @@ export async function handleGetDonauStatements(
},
);
+ logger.info(`have ${pendingReceipts.length} pending donation receipts`);
+
const donauUrlSet = new Set<string>(
pendingReceipts.map((x) => x.donauBaseUrl),
);
diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts
@@ -172,7 +172,7 @@ import {
WalletDbReadWriteTransaction,
WalletDbStoresArr,
} from "./db.js";
-import { generateDonauPlanchets, acceptDonauBlindSigs } from "./donau.js";
+import { acceptDonauBlindSigs, generateDonauPlanchets } from "./donau.js";
import { getScopeForAllCoins, getScopeForAllExchanges } from "./exchanges.js";
import {
calculateRefreshOutput,
@@ -3417,7 +3417,7 @@ async function processPurchasePay(
year: purchase.donauYear,
budikeypairs,
};
- logger.info(`sending donau data: ${wallet_data.donau}`);
+ logger.info(`sending donau data: ${j2s(wallet_data.donau)}`);
}
// Note that we may have fewer slates that output tokens,
// as there are other output types (e.g. slates).