gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-wallet-core] branch master updated (63bb6a427 -> 164085959)


From: gnunet
Subject: [taler-wallet-core] branch master updated (63bb6a427 -> 164085959)
Date: Fri, 10 Feb 2023 19:48:06 +0100

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

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

    from 63bb6a427 -resolve error introduced by merge
     new 8d008641a harness: rename test to match convention
     new 164085959 taler-wallet-cli: stop wallet properly

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/integrationtests/test-withdrawal-manual.ts        | 15 ++++++++++-----
 packages/taler-harness/src/integrationtests/testrunner.ts |  4 ++--
 packages/taler-wallet-cli/src/index.ts                    |  4 +++-
 packages/taler-wallet-core/src/operations/withdraw.ts     |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git 
a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts 
b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
index b691ae508..d28ecc91c 100644
--- a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
+++ b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
@@ -21,15 +21,15 @@ import { GlobalTestState } from "../harness/harness.js";
 import { createSimpleTestkudosEnvironment } from "../harness/helpers.js";
 import { WalletApiOperation, BankApi } from "@gnu-taler/taler-wallet-core";
 import {
-  AbsoluteTime,
-  Duration,
-  TalerProtocolTimestamp,
+  AbsoluteTime, j2s, Logger,
 } from "@gnu-taler/taler-util";
 
+const logger = new Logger("test-withdrawal-manual.ts");
+
 /**
  * Run test for basic, bank-integrated withdrawal.
  */
-export async function runTestWithdrawalManualTest(t: GlobalTestState) {
+export async function runWithdrawalManualTest(t: GlobalTestState) {
   // Set up test environment
 
   const { wallet, bank, exchange, exchangeBankAccount } =
@@ -45,7 +45,9 @@ export async function runTestWithdrawalManualTest(t: 
GlobalTestState) {
 
   const tStart = AbsoluteTime.now();
 
+  logger.info("starting AcceptManualWithdrawal request");
   // We expect this to return immediately.
+  
   const wres = await wallet.client.call(
     WalletApiOperation.AcceptManualWithdrawal,
     {
@@ -54,6 +56,9 @@ export async function runTestWithdrawalManualTest(t: 
GlobalTestState) {
     },
   );
 
+  logger.info("AcceptManualWithdrawal finished");
+  logger.info(`result: ${j2s(wres)}`);
+
   // Check that the request did not go into long-polling.
   const duration = AbsoluteTime.difference(tStart, AbsoluteTime.now());
   if (duration.d_ms > 5 * 1000) {
@@ -81,4 +86,4 @@ export async function runTestWithdrawalManualTest(t: 
GlobalTestState) {
   await t.shutdown();
 }
 
-runTestWithdrawalManualTest.suites = ["wallet"];
+runWithdrawalManualTest.suites = ["wallet"];
diff --git a/packages/taler-harness/src/integrationtests/testrunner.ts 
b/packages/taler-harness/src/integrationtests/testrunner.ts
index 4bad3dac2..025f2e514 100644
--- a/packages/taler-harness/src/integrationtests/testrunner.ts
+++ b/packages/taler-harness/src/integrationtests/testrunner.ts
@@ -90,7 +90,7 @@ import { runWallettestingTest } from 
"./test-wallettesting.js";
 import { runWithdrawalAbortBankTest } from "./test-withdrawal-abort-bank.js";
 import { runWithdrawalBankIntegratedTest } from 
"./test-withdrawal-bank-integrated.js";
 import { runWithdrawalFakebankTest } from "./test-withdrawal-fakebank.js";
-import { runTestWithdrawalManualTest } from "./test-withdrawal-manual.js";
+import { runWithdrawalManualTest } from "./test-withdrawal-manual.js";
 import { runAgeRestrictionsPeerTest } from "./test-age-restrictions-peer.js";
 import { runWalletNotificationsTest } from "./test-wallet-notifications.js";
 import { runAgeRestrictionsMixedMerchantTest } from 
"./test-age-restrictions-mixed-merchant.js";
@@ -176,7 +176,7 @@ const allTests: TestMainFunction[] = [
   runRefundIncrementalTest,
   runRefundTest,
   runRevocationTest,
-  runTestWithdrawalManualTest,
+  runWithdrawalManualTest,
   runTimetravelAutorefreshTest,
   runTimetravelWithdrawTest,
   runTippingTest,
diff --git a/packages/taler-wallet-cli/src/index.ts 
b/packages/taler-wallet-cli/src/index.ts
index 48e98264d..6641dab09 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -306,7 +306,9 @@ async function withWallet<T>(
         return w.handleCoreApiRequest(operation, "my-req", payload);
       },
     };
-    return await f(ctx);
+    const result = await f(ctx);
+    w.stop();
+    return result;
   }
 }
 
diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts 
b/packages/taler-wallet-core/src/operations/withdraw.ts
index cb1627c1e..5c9854c0f 100644
--- a/packages/taler-wallet-core/src/operations/withdraw.ts
+++ b/packages/taler-wallet-core/src/operations/withdraw.ts
@@ -2040,7 +2040,7 @@ export async function createManualWithdrawal(
       x.exchangeDetails,
       x.exchangeTrust,
     ])
-    .runReadWrite(async (tx) => {
+    .runReadOnly(async (tx) => {
       return await getFundingPaytoUris(tx, withdrawalGroup.withdrawalGroupId);
     });
 

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]