[taler-wallet-core] branch master updated: fix integration tests

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository wallet-core.

The following commit(s) were added to refs/heads/master by this push:
     new ee47aa483 fix integration tests
ee47aa483 is described below

commit ee47aa4837fedcaa8257b57138ea34fda220d2b7
Author: Florian Dold <florian@dold.me>
AuthorDate: Thu Aug 3 19:24:04 2023 +0200

    fix integration tests
    
    Instead of using the deprecated runUntilDone, we now wait
    for specific notifications.
    
    The old way doesn't work, since p2p push transactions are not considered
    done until the counterparty has accepted the payment.
---
 .../integrationtests/test-age-restrictions-peer.ts | 66 +++++++++++++++-------
 .../src/integrationtests/test-peer-to-peer-pull.ts | 14 ++++-
 .../src/operations/pay-peer-pull-credit.ts         | 11 +++-
 3 files changed, 68 insertions(+), 23 deletions(-)

diff --git 
a/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts 
b/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts
index eae04cd2e..d15858322 100644
--- a/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts
+++ b/packages/taler-harness/src/integrationtests/test-age-restrictions-peer.ts
@@ -17,13 +17,20 @@
 /**
  * Imports.
  */
-import { AbsoluteTime, Duration } from "@gnu-taler/taler-util";
+import {
+  AbsoluteTime,
+  Duration,
+  NotificationType,
+  TransactionMajorState,
+  TransactionMinorState,
+} from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { defaultCoinConfig } from "../harness/denomStructures.js";
 import { GlobalTestState, WalletCli } from "../harness/harness.js";
 import {
-  createSimpleTestkudosEnvironment,
-  withdrawViaBank,
+  createSimpleTestkudosEnvironmentV2,
+  createWalletDaemonWithClient,
+  withdrawViaBankV2,
 } from "../harness/helpers.js";
 
 /**
@@ -32,12 +39,7 @@ import {
 export async function runAgeRestrictionsPeerTest(t: GlobalTestState) {
   // Set up test environment
 
-  const {
-    wallet: walletOne,
-    bank,
-    exchange,
-    merchant,
-  } = await createSimpleTestkudosEnvironment(
+  const { bank, exchange } = await createSimpleTestkudosEnvironmentV2(
     t,
     defaultCoinConfig.map((x) => x("TESTKUDOS")),
     {
@@ -45,20 +47,29 @@ export async function runAgeRestrictionsPeerTest(t: 
GlobalTestState) {
     },
   );
 
-  const walletTwo = new WalletCli(t, "walletTwo");
-  const walletThree = new WalletCli(t, "walletThree");
+  const w1 = await createWalletDaemonWithClient(t, {
+    name: "w1",
+    persistent: true,
+  });
+  const w2 = await createWalletDaemonWithClient(t, {
+    name: "w2",
+    persistent: true,
+  });
 
-  {
-    const wallet = walletOne;
+  const wallet1 = w1.walletClient;
+  const wallet2 = w2.walletClient;
 
-    await withdrawViaBank(t, {
-      wallet,
+  {
+    const withdrawalRes = await withdrawViaBankV2(t, {
+      walletClient: wallet1,
       bank,
       exchange,
       amount: "TESTKUDOS:20",
       restrictAge: 13,
     });
 
+    await withdrawalRes.withdrawalFinishedCond;
+
     const purse_expiration = AbsoluteTime.toProtocolTimestamp(
       AbsoluteTime.addDuration(
         AbsoluteTime.now(),
@@ -66,7 +77,7 @@ export async function runAgeRestrictionsPeerTest(t: 
GlobalTestState) {
       ),
     );
 
-    const initResp = await wallet.client.call(
+    const initResp = await wallet1.client.call(
       WalletApiOperation.InitiatePeerPushDebit,
       {
         partialContractTerms: {
@@ -77,20 +88,35 @@ export async function runAgeRestrictionsPeerTest(t: 
GlobalTestState) {
       },
     );
 
-    await wallet.runUntilDone();
+    const peerPushReadyCond = wallet1.waitForNotificationCond(
+      (x) =>
+        x.type === NotificationType.TransactionStateTransition &&
+        x.newTxState.major === TransactionMajorState.Pending &&
+        x.newTxState.minor === TransactionMinorState.Ready &&
+        x.transactionId === initResp.transactionId,
+    );
+
+    await peerPushReadyCond;
 
-    const checkResp = await walletTwo.client.call(
+    const checkResp = await wallet2.call(
       WalletApiOperation.PreparePeerPushCredit,
       {
         talerUri: initResp.talerUri,
       },
     );
 
-    await walletTwo.client.call(WalletApiOperation.ConfirmPeerPushCredit, {
+    await wallet2.call(WalletApiOperation.ConfirmPeerPushCredit, {
       peerPushPaymentIncomingId: checkResp.peerPushPaymentIncomingId,
     });
 
-    await walletTwo.runUntilDone();
+    const peerPullCreditDoneCond = wallet2.waitForNotificationCond(
+      (x) =>
+        x.type === NotificationType.TransactionStateTransition &&
+        x.newTxState.major === TransactionMajorState.Done &&
+        x.transactionId === checkResp.transactionId,
+    );
+
+    await peerPullCreditDoneCond;
   }
 }
 
diff --git 
a/packages/taler-harness/src/integrationtests/test-peer-to-peer-pull.ts 
b/packages/taler-harness/src/integrationtests/test-peer-to-peer-pull.ts
index 30287b51b..5b55b1de1 100644
--- a/packages/taler-harness/src/integrationtests/test-peer-to-peer-pull.ts
+++ b/packages/taler-harness/src/integrationtests/test-peer-to-peer-pull.ts
@@ -23,6 +23,7 @@ import {
   j2s,
   NotificationType,
   TransactionMajorState,
+  TransactionMinorState,
   WalletNotification,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
@@ -46,12 +47,14 @@ export async function runPeerToPeerPullTest(t: 
GlobalTestState) {
 
   const w1 = await createWalletDaemonWithClient(t, {
     name: "w1",
+    persistent: true,
     handleNotification(wn) {
       allW1Notifications.push(wn);
     },
   });
   const w2 = await createWalletDaemonWithClient(t, {
     name: "w2",
+    persistent: true,
     handleNotification(wn) {
       allW2Notifications.push(wn);
     },
@@ -89,6 +92,15 @@ export async function runPeerToPeerPullTest(t: 
GlobalTestState) {
     },
   );
 
+  const peerPullCreditReadyCond = wallet1.waitForNotificationCond(
+    (x) => x.type === NotificationType.TransactionStateTransition &&
+      x.transactionId === resp.transactionId &&
+      x.newTxState.major === TransactionMajorState.Pending &&
+      x.newTxState.minor === TransactionMinorState.Ready,
+  );
+
+  await peerPullCreditReadyCond;
+
   const checkResp = await wallet2.client.call(
     WalletApiOperation.PreparePeerPullDebit,
     {
@@ -98,8 +110,6 @@ export async function runPeerToPeerPullTest(t: 
GlobalTestState) {
 
   console.log(`checkResp: ${j2s(checkResp)}`);
 
-  // FIXME: The wallet should emit a more appropriate notification here.
-  // Yes, it's technically a withdrawal.
   const peerPullCreditDoneCond = wallet1.waitForNotificationCond(
     (x) => x.type === NotificationType.TransactionStateTransition &&
       x.transactionId === resp.transactionId &&
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts 
b/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts
index c7e13754f..ac501aae2 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts
+++ b/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts
@@ -436,16 +436,25 @@ async function handlePeerPullCreditCreatePurse(
 
   logger.info(`reserve merge response: ${j2s(resp)}`);
 
-  await ws.db
+  const transactionId = constructTransactionIdentifier({
+    tag: TransactionType.PeerPullCredit,
+    pursePub: pullIni.pursePub,
+  });
+
+  const transitionInfo = await ws.db
     .mktx((x) => [x.peerPullPaymentInitiations])
     .runReadWrite(async (tx) => {
       const pi2 = await tx.peerPullPaymentInitiations.get(pursePub);
       if (!pi2) {
         return;
       }
+      const oldTxState = computePeerPullCreditTransactionState(pi2);
       pi2.status = PeerPullPaymentInitiationStatus.PendingReady;
       await tx.peerPullPaymentInitiations.put(pi2);
+      const newTxState = computePeerPullCreditTransactionState(pi2);
+      return { oldTxState, newTxState };
     });
+  notifyTransition(ws, transactionId, transitionInfo);
 
   return TaskRunResult.finished();
 }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.