commit 069606273be376a878c8cd9dfceab6f9c28c4db5
parent 567b7dac6cb1dfaeb9f33286c8edecdbbac8cfb7
Author: Antoine A <>
Date: Thu, 10 Apr 2025 17:49:28 +0200
harness: clean withdrawal tests
Diffstat:
2 files changed, 94 insertions(+), 90 deletions(-)
diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts
@@ -43,10 +43,7 @@ export async function runWithdrawalBankIntegratedTest(t: GlobalTestState) {
createSimpleTestkudosEnvironmentV3(t),
createWalletDaemonWithClient(t, {
name: "w2",
- }),
- createWalletDaemonWithClient(t, {
- name: "w3",
- }),
+ })
]);
const user = await bankClient.createRandomBankUser();
bankClient.setAuth(user);
@@ -59,7 +56,7 @@ export async function runWithdrawalBankIntegratedTest(t: GlobalTestState) {
t.logStep("Hand it to the wallet");
- const withdraw_info = await wallet1.call(
+ await wallet1.call(
WalletApiOperation.GetWithdrawalDetailsForUri,
{
talerWithdrawUri: withdrawal.taler_withdraw_uri,
diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-conflict.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-conflict.ts
@@ -1,6 +1,6 @@
/*
This file is part of GNU Taler
- (C) 2020 Taler Systems S.A.
+ (C) 2020-2025 Taler Systems S.A.
GNU Taler is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
@@ -37,56 +37,43 @@ import { GlobalTestState } from "../harness/harness.js";
*/
export async function runWithdrawalConflictTest(t: GlobalTestState) {
// Set up test environment
-
- const { walletClient, bankClient, bank } =
- await createSimpleTestkudosEnvironmentV3(t);
-
- const w2 = await createWalletDaemonWithClient(t, {
- name: "w2",
- });
+ const [
+ { walletClient: wallet1, bankClient, bank },
+ { walletClient: wallet2 },
+ ] = await Promise.all([
+ createSimpleTestkudosEnvironmentV3(t),
+ createWalletDaemonWithClient(t, {
+ name: "w2",
+ })
+ ]);
+ const user = await bankClient.createRandomBankUser();
+ bankClient.setAuth(user);
// Create a withdrawal operation
-
- const user = await bankClient.createRandomBankUser();
- const userBankClient = new TalerCorebankApiClient(bankClient.baseUrl);
- userBankClient.setAuth(user);
const amount = "TESTKUDOS:10";
- const wop = await userBankClient.createWithdrawalOperation(
+ const wop = await bankClient.createWithdrawalOperation(
user.username,
amount,
);
- const wMainCheckResp = await walletClient.call(
- WalletApiOperation.GetWithdrawalDetailsForUri,
- {
- talerWithdrawUri: wop.taler_withdraw_uri,
- },
- );
-
- t.assertTrue(!!wMainCheckResp.defaultExchangeBaseUrl);
-
- const wMainPrepareResp = await walletClient.call(
- WalletApiOperation.PrepareBankIntegratedWithdrawal,
- {
- talerWithdrawUri: wop.taler_withdraw_uri,
- },
- );
-
- console.log(`prepareResp: ${j2s(wMainPrepareResp)}`);
-
- t.assertTrue(!!wMainPrepareResp.transactionId);
-
- const txns1 = await walletClient.call(WalletApiOperation.GetTransactions, {
- sort: "stable-ascending",
- });
- console.log(j2s(txns1));
-
- const w2PrepareResp = await w2.walletClient.call(
- WalletApiOperation.PrepareBankIntegratedWithdrawal,
- {
- talerWithdrawUri: wop.taler_withdraw_uri,
- },
- );
+ const [wdetails, wprepare1, wprepare2] = await Promise.all([
+ wallet1.call(
+ WalletApiOperation.GetWithdrawalDetailsForUri,
+ {
+ talerWithdrawUri: wop.taler_withdraw_uri,
+ },
+ ), wallet1.call(
+ WalletApiOperation.PrepareBankIntegratedWithdrawal,
+ {
+ talerWithdrawUri: wop.taler_withdraw_uri,
+ },
+ ), wallet2.call(
+ WalletApiOperation.PrepareBankIntegratedWithdrawal,
+ {
+ talerWithdrawUri: wop.taler_withdraw_uri,
+ },
+ )
+ ]);
t.logStep("stopping bank");
@@ -94,38 +81,37 @@ export async function runWithdrawalConflictTest(t: GlobalTestState) {
// to register the reserve info with the bank.
await bank.stop();
- await walletClient.call(WalletApiOperation.ConfirmWithdrawal, {
- transactionId: wMainPrepareResp.transactionId,
- amount,
- exchangeBaseUrl: wMainCheckResp.defaultExchangeBaseUrl,
- });
-
- t.assertTrue(!!w2PrepareResp.info.defaultExchangeBaseUrl);
-
- // Also let the second wallet confirm!
- await w2.walletClient.call(WalletApiOperation.ConfirmWithdrawal, {
- transactionId: w2PrepareResp.transactionId,
- amount,
- exchangeBaseUrl: w2PrepareResp.info.defaultExchangeBaseUrl,
- });
+ await Promise.all([
+ wallet1.call(WalletApiOperation.ConfirmWithdrawal, {
+ transactionId: wprepare1.transactionId,
+ amount,
+ exchangeBaseUrl: wdetails.defaultExchangeBaseUrl!,
+ }),
+ wallet2.call(WalletApiOperation.ConfirmWithdrawal, {
+ transactionId: wprepare2.transactionId,
+ amount,
+ exchangeBaseUrl: wprepare2.info.defaultExchangeBaseUrl!,
+ })
+ ]);
t.logStep("withdrawals-confirmed-by-wallets");
- await walletClient.call(WalletApiOperation.TestingWaitTransactionState, {
- transactionId: wMainPrepareResp.transactionId as TransactionIdStr,
- txState: {
- major: TransactionMajorState.Pending,
- minor: TransactionMinorState.BankRegisterReserve,
- },
- });
-
- await w2.walletClient.call(WalletApiOperation.TestingWaitTransactionState, {
- transactionId: w2PrepareResp.transactionId as TransactionIdStr,
- txState: {
- major: TransactionMajorState.Pending,
- minor: TransactionMinorState.BankRegisterReserve,
- },
- });
+ await Promise.all([
+ wallet1.call(WalletApiOperation.TestingWaitTransactionState, {
+ transactionId: wprepare1.transactionId as TransactionIdStr,
+ txState: {
+ major: TransactionMajorState.Pending,
+ minor: TransactionMinorState.BankRegisterReserve,
+ },
+ }),
+ wallet2.call(WalletApiOperation.TestingWaitTransactionState, {
+ transactionId: wprepare2.transactionId as TransactionIdStr,
+ txState: {
+ major: TransactionMajorState.Pending,
+ minor: TransactionMinorState.BankRegisterReserve,
+ },
+ })
+ ]);
await bank.start();
@@ -135,7 +121,7 @@ export async function runWithdrawalConflictTest(t: GlobalTestState) {
// The "aborted(bank)" state is only present because the taler-exchange-fakebank
// returns 404 when one wallet completes the withdrawal, which is a
// bug.
- const expectedFinalStates = [
+ const expectedFinalStates: TransactionStatePattern[] = [
{
major: TransactionMajorState.Done,
},
@@ -147,17 +133,38 @@ export async function runWithdrawalConflictTest(t: GlobalTestState) {
major: TransactionMajorState.Failed,
minor: "*",
},
- ] satisfies TransactionStatePattern[];
-
- await walletClient.call(WalletApiOperation.TestingWaitTransactionState, {
- transactionId: wMainPrepareResp.transactionId as TransactionIdStr,
- txState: expectedFinalStates,
- });
-
- await w2.walletClient.call(WalletApiOperation.TestingWaitTransactionState, {
- transactionId: w2PrepareResp.transactionId as TransactionIdStr,
- txState: expectedFinalStates,
- });
+ ];
+
+ await Promise.all([
+ wallet1.call(WalletApiOperation.TestingWaitTransactionState, {
+ transactionId: wprepare1.transactionId,
+ txState: expectedFinalStates,
+ }),
+ wallet2.call(WalletApiOperation.TestingWaitTransactionState, {
+ transactionId: wprepare2.transactionId,
+ txState: expectedFinalStates,
+ })
+ ]);
+
+ const [tx1, tx2] = await Promise.all([
+ wallet1.call(WalletApiOperation.GetTransactionById, {
+ transactionId: wprepare1.transactionId
+ }),
+ wallet2.call(WalletApiOperation.GetTransactionById, {
+ transactionId: wprepare2.transactionId
+ })
+ ]);
+
+ // FIXME one of them should succeed
+ t.assertTrue(tx1.txState.major === TransactionMajorState.Failed)
+ t.assertTrue(tx2.txState.major === TransactionMajorState.Failed)
+
+ /*if (tx1.txState.major === TransactionMajorState.Done) {
+ t.assertTrue(tx2.txState.major === TransactionMajorState.Aborted || tx2.txState.major === TransactionMajorState.Failed)
+ } else {
+ t.assertTrue(tx2.txState.major === TransactionMajorState.Done)
+ t.assertTrue(tx1.txState.major === TransactionMajorState.Aborted || tx1.txState.major === TransactionMajorState.Failed)
+ }*/
}
runWithdrawalConflictTest.suites = ["wallet"];
