wallet-core: fix revocation, re-introduce reserves object store

3 files changed, 61 insertions, 62 deletions

diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
index ca7dc33d8..83231b358 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
@@ -243,7 +243,7 @@ export async function runLibeufinBasicTest(t: GlobalTestState) {
     WalletApiOperation.AcceptManualWithdrawal,
     {
       exchangeBaseUrl: exchange.baseUrl,
-      amount: "EUR:10",
+      amount: "EUR:15",
     },
   );
 
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-nexus-balance.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-nexus-balance.ts
index 23d76081f..ff7a50ae6 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-nexus-balance.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-nexus-balance.ts
@@ -17,12 +17,11 @@
 /**
  * Imports.
  */
-import { GlobalTestState, delayMs } from "../harness/harness.js";
+import { GlobalTestState } from "../harness/harness.js";
 import {
   SandboxUserBundle,
   NexusUserBundle,
   launchLibeufinServices,
-  LibeufinSandboxApi,
   LibeufinNexusApi,
 } from "../harness/libeufin";
 
@@ -73,7 +72,7 @@ export async function runLibeufinNexusBalanceTest(t: GlobalTestState) {
     user02sandbox.ebicsBankAccount.label, // debit
     user01sandbox.ebicsBankAccount.label, // credit
     "EUR:10",
-    "first payment",
+    "second payment",
   );
 
   await LibeufinNexusApi.fetchTransactions(
@@ -82,13 +81,13 @@ export async function runLibeufinNexusBalanceTest(t: GlobalTestState) {
     "all", // range
     "report", // level
   );
-  
+
   // Check that user 01 has 20, via Nexus.
   let accountInfo = await LibeufinNexusApi.getBankAccount(
     libeufinServices.libeufinNexus,
-    user01nexus.localAccountName
+    user01nexus.localAccountName,
   );
-  t.assertTrue(accountInfo.data.lastSeenBalance == "EUR:20");
+  t.assertAmountEquals(accountInfo.data.lastSeenBalance, "EUR:20");
 
   // user 01 gives 30
   await libeufinServices.libeufinSandbox.makeTransaction(
@@ -107,8 +106,8 @@ export async function runLibeufinNexusBalanceTest(t: GlobalTestState) {
 
   let accountInfoDebit = await LibeufinNexusApi.getBankAccount(
     libeufinServices.libeufinNexus,
-    user01nexus.localAccountName
+    user01nexus.localAccountName,
   );
-  t.assertTrue(accountInfoDebit.data.lastSeenBalance == "-EUR:10");
+  t.assertDeepEqual(accountInfoDebit.data.lastSeenBalance, "-EUR:10");
 }
 runLibeufinNexusBalanceTest.suites = ["libeufin"];
diff --git a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
index 88e67a8bb..74aa66005 100644
--- a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
@@ -26,71 +26,71 @@ import {
   TestRunResult,
 } from "../harness/harness.js";
 import { runAgeRestrictionsTest } from "./test-age-restrictions.js";
-import { runBankApiTest } from "./test-bank-api";
-import { runClaimLoopTest } from "./test-claim-loop";
+import { runBankApiTest } from "./test-bank-api.js";
+import { runClaimLoopTest } from "./test-claim-loop.js";
 import { runClauseSchnorrTest } from "./test-clause-schnorr.js";
 import { runDenomUnofferedTest } from "./test-denom-unoffered.js";
-import { runDepositTest } from "./test-deposit";
-import { runExchangeManagementTest } from "./test-exchange-management";
+import { runDepositTest } from "./test-deposit.js";
+import { runExchangeManagementTest } from "./test-exchange-management.js";
 import { runExchangeTimetravelTest } from "./test-exchange-timetravel.js";
-import { runFeeRegressionTest } from "./test-fee-regression";
+import { runFeeRegressionTest } from "./test-fee-regression.js";
 import { runForcedSelectionTest } from "./test-forced-selection.js";
-import { runLibeufinApiBankaccountTest } from "./test-libeufin-api-bankaccount";
-import { runLibeufinApiBankconnectionTest } from "./test-libeufin-api-bankconnection";
-import { runLibeufinApiFacadeTest } from "./test-libeufin-api-facade";
-import { runLibeufinApiFacadeBadRequestTest } from "./test-libeufin-api-facade-bad-request";
-import { runLibeufinApiPermissionsTest } from "./test-libeufin-api-permissions";
-import { runLibeufinApiSandboxCamtTest } from "./test-libeufin-api-sandbox-camt";
-import { runLibeufinApiSandboxTransactionsTest } from "./test-libeufin-api-sandbox-transactions";
-import { runLibeufinApiSchedulingTest } from "./test-libeufin-api-scheduling";
-import { runLibeufinApiUsersTest } from "./test-libeufin-api-users";
-import { runLibeufinBadGatewayTest } from "./test-libeufin-bad-gateway";
-import { runLibeufinBasicTest } from "./test-libeufin-basic";
-import { runLibeufinC5xTest } from "./test-libeufin-c5x";
-import { runLibeufinAnastasisFacadeTest } from "./test-libeufin-facade-anastasis";
-import { runLibeufinKeyrotationTest } from "./test-libeufin-keyrotation";
-import { runLibeufinNexusBalanceTest } from "./test-libeufin-nexus-balance";
-import { runLibeufinRefundTest } from "./test-libeufin-refund";
-import { runLibeufinRefundMultipleUsersTest } from "./test-libeufin-refund-multiple-users";
-import { runLibeufinSandboxWireTransferCliTest } from "./test-libeufin-sandbox-wire-transfer-cli";
-import { runLibeufinTutorialTest } from "./test-libeufin-tutorial";
-import { runMerchantExchangeConfusionTest } from "./test-merchant-exchange-confusion";
-import { runMerchantInstancesTest } from "./test-merchant-instances";
+import { runLibeufinApiBankaccountTest } from "./test-libeufin-api-bankaccount.js";
+import { runLibeufinApiBankconnectionTest } from "./test-libeufin-api-bankconnection.js";
+import { runLibeufinApiFacadeTest } from "./test-libeufin-api-facade.js";
+import { runLibeufinApiFacadeBadRequestTest } from "./test-libeufin-api-facade-bad-request.js";
+import { runLibeufinApiPermissionsTest } from "./test-libeufin-api-permissions.js";
+import { runLibeufinApiSandboxCamtTest } from "./test-libeufin-api-sandbox-camt.js";
+import { runLibeufinApiSandboxTransactionsTest } from "./test-libeufin-api-sandbox-transactions.js";
+import { runLibeufinApiSchedulingTest } from "./test-libeufin-api-scheduling.js";
+import { runLibeufinApiUsersTest } from "./test-libeufin-api-users.js";
+import { runLibeufinBadGatewayTest } from "./test-libeufin-bad-gateway.js";
+import { runLibeufinBasicTest } from "./test-libeufin-basic.js";
+import { runLibeufinC5xTest } from "./test-libeufin-c5x.js";
+import { runLibeufinAnastasisFacadeTest } from "./test-libeufin-facade-anastasis.js";
+import { runLibeufinKeyrotationTest } from "./test-libeufin-keyrotation.js";
+import { runLibeufinNexusBalanceTest } from "./test-libeufin-nexus-balance.js";
+import { runLibeufinRefundTest } from "./test-libeufin-refund.js";
+import { runLibeufinRefundMultipleUsersTest } from "./test-libeufin-refund-multiple-users.js";
+import { runLibeufinSandboxWireTransferCliTest } from "./test-libeufin-sandbox-wire-transfer-cli.js";
+import { runLibeufinTutorialTest } from "./test-libeufin-tutorial.js";
+import { runMerchantExchangeConfusionTest } from "./test-merchant-exchange-confusion.js";
+import { runMerchantInstancesTest } from "./test-merchant-instances.js";
 import { runMerchantInstancesDeleteTest } from "./test-merchant-instances-delete";
-import { runMerchantInstancesUrlsTest } from "./test-merchant-instances-urls";
-import { runMerchantLongpollingTest } from "./test-merchant-longpolling";
-import { runMerchantRefundApiTest } from "./test-merchant-refund-api";
+import { runMerchantInstancesUrlsTest } from "./test-merchant-instances-urls.js";
+import { runMerchantLongpollingTest } from "./test-merchant-longpolling.js";
+import { runMerchantRefundApiTest } from "./test-merchant-refund-api.js";
 import { runMerchantSpecPublicOrdersTest } from "./test-merchant-spec-public-orders.js";
-import { runPayAbortTest } from "./test-pay-abort";
-import { runPayPaidTest } from "./test-pay-paid";
-import { runPaymentTest } from "./test-payment";
-import { runPaymentClaimTest } from "./test-payment-claim";
-import { runPaymentFaultTest } from "./test-payment-fault";
+import { runPayAbortTest } from "./test-pay-abort.js";
+import { runPayPaidTest } from "./test-pay-paid.js";
+import { runPaymentTest } from "./test-payment.js";
+import { runPaymentClaimTest } from "./test-payment-claim.js";
+import { runPaymentFaultTest } from "./test-payment-fault.js";
 import { runPaymentForgettableTest } from "./test-payment-forgettable.js";
-import { runPaymentIdempotencyTest } from "./test-payment-idempotency";
-import { runPaymentMultipleTest } from "./test-payment-multiple";
-import { runPaymentDemoTest } from "./test-payment-on-demo";
-import { runPaymentTransientTest } from "./test-payment-transient";
+import { runPaymentIdempotencyTest } from "./test-payment-idempotency.js";
+import { runPaymentMultipleTest } from "./test-payment-multiple.js";
+import { runPaymentDemoTest } from "./test-payment-on-demo.js";
+import { runPaymentTransientTest } from "./test-payment-transient.js";
 import { runPaymentZeroTest } from "./test-payment-zero.js";
-import { runPaywallFlowTest } from "./test-paywall-flow";
+import { runPaywallFlowTest } from "./test-paywall-flow.js";
 import { runPeerToPeerPullTest } from "./test-peer-to-peer-pull.js";
 import { runPeerToPeerPushTest } from "./test-peer-to-peer-push.js";
-import { runRefundTest } from "./test-refund";
-import { runRefundAutoTest } from "./test-refund-auto";
-import { runRefundGoneTest } from "./test-refund-gone";
-import { runRefundIncrementalTest } from "./test-refund-incremental";
-import { runRevocationTest } from "./test-revocation";
-import { runTimetravelAutorefreshTest } from "./test-timetravel-autorefresh";
-import { runTimetravelWithdrawTest } from "./test-timetravel-withdraw";
-import { runTippingTest } from "./test-tipping";
-import { runWalletBackupBasicTest } from "./test-wallet-backup-basic";
-import { runWalletBackupDoublespendTest } from "./test-wallet-backup-doublespend";
+import { runRefundTest } from "./test-refund.js";
+import { runRefundAutoTest } from "./test-refund-auto.js";
+import { runRefundGoneTest } from "./test-refund-gone.js";
+import { runRefundIncrementalTest } from "./test-refund-incremental.js";
+import { runRevocationTest } from "./test-revocation.js";
+import { runTimetravelAutorefreshTest } from "./test-timetravel-autorefresh.js";
+import { runTimetravelWithdrawTest } from "./test-timetravel-withdraw.js";
+import { runTippingTest } from "./test-tipping.js";
+import { runWalletBackupBasicTest } from "./test-wallet-backup-basic.js";
+import { runWalletBackupDoublespendTest } from "./test-wallet-backup-doublespend.js";
 import { runWalletDblessTest } from "./test-wallet-dbless.js";
-import { runWallettestingTest } from "./test-wallettesting";
-import { runWithdrawalAbortBankTest } from "./test-withdrawal-abort-bank";
-import { runWithdrawalBankIntegratedTest } from "./test-withdrawal-bank-integrated";
+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";
+import { runTestWithdrawalManualTest } from "./test-withdrawal-manual.js";
 
 /**
  * Test runner.