gnunet-svn
[Top][All Lists]
Advanced

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

[taler-wallet-core] branch master updated (e7beff1a3 -> 3d4d25ed0)


From: gnunet
Subject: [taler-wallet-core] branch master updated (e7beff1a3 -> 3d4d25ed0)
Date: Wed, 11 Dec 2024 16:49:39 +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 e7beff1a3 wallet-core: add getDepositWireTypes request
     new a2b1a5cdd wallet-core: move refresh outside of peer-push-debit 
transaction
     new 3d4d25ed0 test

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:
 ...=> test-kyc-deposit-aggregate-implicit-auth.ts} |  21 +--
 .../src/integrationtests/testrunner.ts             |   4 +-
 packages/taler-util/src/types-taler-exchange.ts    |  22 ++-
 packages/taler-wallet-core/src/balance.ts          |   4 -
 packages/taler-wallet-core/src/db.ts               |  17 +-
 packages/taler-wallet-core/src/deposits.ts         |   4 +
 .../taler-wallet-core/src/pay-peer-push-debit.ts   | 177 +--------------------
 7 files changed, 38 insertions(+), 211 deletions(-)
 copy 
packages/taler-harness/src/integrationtests/{test-kyc-deposit-aggregate.ts => 
test-kyc-deposit-aggregate-implicit-auth.ts} (88%)

diff --git 
a/packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate.ts 
b/packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate-implicit-auth.ts
similarity index 88%
copy from 
packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate.ts
copy to 
packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate-implicit-auth.ts
index 070c05971..9024f36aa 100644
--- a/packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate.ts
+++ 
b/packages/taler-harness/src/integrationtests/test-kyc-deposit-aggregate-implicit-auth.ts
@@ -21,7 +21,6 @@ import {
   Configuration,
   TransactionMajorState,
   TransactionMinorState,
-  TransactionType,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import {
@@ -56,7 +55,7 @@ function adjustExchangeConfig(config: Configuration): void {
   config.setString("KYC-CHECK-C1", "fallback", "M1");
 }
 
-export async function runKycDepositAggregateTest(t: GlobalTestState) {
+export async function runKycDepositAggregateImplicitAuthTest(t: 
GlobalTestState) {
   // Set up test environment
 
   const {
@@ -64,7 +63,6 @@ export async function runKycDepositAggregateTest(t: 
GlobalTestState) {
     bankClient,
     exchange,
     amlKeypair,
-    wireGatewayApiClient,
   } = await createKycTestkudosEnvironment(t, {
     adjustExchangeConfig,
   });
@@ -96,21 +94,6 @@ export async function runKycDepositAggregateTest(t: 
GlobalTestState) {
     },
   });
 
-  const depositTx = await walletClient.call(
-    WalletApiOperation.GetTransactionById,
-    {
-      transactionId: depositResp.transactionId,
-    },
-  );
-
-  t.assertDeepEqual(depositTx.type, TransactionType.Deposit);
-
-  await wireGatewayApiClient.adminAddKycauth({
-    amount: "TESTKUDOS:0.1",
-    debitAccountPayto: wres.accountPaytoUri,
-    accountPub: depositTx.accountPub,
-  });
-
   await exchange.runAggregatorOnceWithTimetravel({
     timetravelMicroseconds: 1000 * 1000 * 60 * 60 * 3,
   });
@@ -161,4 +144,4 @@ export async function runKycDepositAggregateTest(t: 
GlobalTestState) {
   });
 }
 
-runKycDepositAggregateTest.suites = ["wallet"];
+runKycDepositAggregateImplicitAuthTest.suites = ["wallet"];
diff --git a/packages/taler-harness/src/integrationtests/testrunner.ts 
b/packages/taler-harness/src/integrationtests/testrunner.ts
index fefb35393..dec0ce1f2 100644
--- a/packages/taler-harness/src/integrationtests/testrunner.ts
+++ b/packages/taler-harness/src/integrationtests/testrunner.ts
@@ -51,6 +51,7 @@ import { runForcedSelectionTest } from 
"./test-forced-selection.js";
 import { runKnownAccountsTest } from "./test-known-accounts.js";
 import { runKycBalanceWithdrawalTest } from "./test-kyc-balance-withdrawal.js";
 import { runKycDecisionsTest } from "./test-kyc-decisions.js";
+import { runKycDepositAggregateImplicitAuthTest } from 
"./test-kyc-deposit-aggregate-implicit-auth.js";
 import { runKycDepositAggregateTest } from "./test-kyc-deposit-aggregate.js";
 import { runKycDepositDepositKyctransferTest } from 
"./test-kyc-deposit-deposit-kyctransfer.js";
 import { runKycDepositDepositTest } from "./test-kyc-deposit-deposit.js";
@@ -64,6 +65,7 @@ import { runKycPeerPullTest } from "./test-kyc-peer-pull.js";
 import { runKycPeerPushTest } from "./test-kyc-peer-push.js";
 import { runKycSkipExpirationTest } from "./test-kyc-skip-expiration.js";
 import { runKycThresholdWithdrawalTest } from 
"./test-kyc-threshold-withdrawal.js";
+import { runKycTwoFormsTest } from "./test-kyc-two-forms.js";
 import { runKycWithdrawalVerbotenTest } from 
"./test-kyc-withdrawal-verboten.js";
 import { runKycTest } from "./test-kyc.js";
 import { runLibeufinBankTest } from "./test-libeufin-bank.js";
@@ -148,7 +150,6 @@ import { runWithdrawalHugeTest } from 
"./test-withdrawal-huge.js";
 import { runWithdrawalIdempotentTest } from "./test-withdrawal-idempotent.js";
 import { runWithdrawalManualTest } from "./test-withdrawal-manual.js";
 import { runWithdrawalPrepareTest } from "./test-withdrawal-prepare.js";
-import { runKycTwoFormsTest } from "./test-kyc-two-forms.js";
 
 /**
  * Test runner.
@@ -288,6 +289,7 @@ const allTests: TestMainFunction[] = [
   runKycMerchantActivateBankAccountTest,
   runKycDecisionsTest,
   runKnownAccountsTest,
+  runKycDepositAggregateImplicitAuthTest,
 ];
 
 export interface TestRunSpec {
diff --git a/packages/taler-util/src/types-taler-exchange.ts 
b/packages/taler-util/src/types-taler-exchange.ts
index 6f50a5c9c..6210c272d 100644
--- a/packages/taler-util/src/types-taler-exchange.ts
+++ b/packages/taler-util/src/types-taler-exchange.ts
@@ -1379,6 +1379,17 @@ export interface TrackTransactionAccepted {
   // Time by which the exchange currently thinks the deposit will be executed.
   // Actual execution may be later if the KYC check is not satisfied by then.
   execution_time: TalerProtocolTimestamp;
+
+  // Public key associated with the account. The client must sign
+  // the initial request for the KYC status using the corresponding
+  // private key.  Will be the merchant (instance) public key.
+  //
+  // Absent if no public key is currently associated
+  // with the account and the client MUST thus first
+  // credit the exchange via an inbound wire transfer
+  // to associate a public key with the debited account.
+  // @since protocol **v20**.
+  account_pub: EddsaPublicKeyString | undefined;
 }
 
 export const codecForTackTransactionAccepted =
@@ -1387,6 +1398,7 @@ export const codecForTackTransactionAccepted =
       .property("requirement_row", codecOptional(codecForNumber()))
       .property("kyc_ok", codecForBoolean())
       .property("execution_time", codecForTimestamp)
+      .property("account_pub", codecOptional(codecForString()))
       .build("TackTransactionAccepted");
 
 export const codecForPeerContractTerms = (): Codec<PeerContractTerms> =>
@@ -2460,7 +2472,10 @@ export const codecForAmlProgramRequirement = (): 
Codec<AmlProgramRequirement> =>
 export const codecForKycCheckInformation = (): Codec<KycCheckInformation> =>
   buildCodecForObject<KycCheckInformation>()
     .property("description", codecForString())
-    .property("description_i18n", 
codecOptional(codecForInternationalizedString()))
+    .property(
+      "description_i18n",
+      codecOptional(codecForInternationalizedString()),
+    )
     .property("fallback", codecForString())
     .property("outputs", codecForList(codecForString()))
     .property("requires", codecForList(codecForString()))
@@ -2607,7 +2622,10 @@ export const codecForKycCheckPublicInformation =
   (): Codec<KycCheckPublicInformation> =>
     buildCodecForObject<KycCheckPublicInformation>()
       .property("description", codecForString())
-      .property("description_i18n", 
codecOptional(codecForInternationalizedString()))
+      .property(
+        "description_i18n",
+        codecOptional(codecForInternationalizedString()),
+      )
       .build("TalerExchangeApi.KycCheckPublicInformation");
 
 export const codecForKycRequirementInformationId =
diff --git a/packages/taler-wallet-core/src/balance.ts 
b/packages/taler-wallet-core/src/balance.ts
index 5f249e843..ddc0fb804 100644
--- a/packages/taler-wallet-core/src/balance.ts
+++ b/packages/taler-wallet-core/src/balance.ts
@@ -438,10 +438,6 @@ export async function getBalancesInsideTransaction(
         case PeerPushDebitStatus.PendingReady:
         case PeerPushDebitStatus.SuspendedReady:
         case PeerPushDebitStatus.PendingCreatePurse:
-        case PeerPushDebitStatus.AbortingRefreshDeleted:
-        case PeerPushDebitStatus.AbortingRefreshExpired:
-        case PeerPushDebitStatus.SuspendedAbortingRefreshDeleted:
-        case PeerPushDebitStatus.SuspendedAbortingRefreshExpired:
         case PeerPushDebitStatus.SuspendedCreatePurse: {
           const currency = Amounts.currencyOf(ppdRecord.amount);
           await balanceStore.addPendingOutgoing(
diff --git a/packages/taler-wallet-core/src/db.ts 
b/packages/taler-wallet-core/src/db.ts
index 31d9bfeda..a510d56cb 100644
--- a/packages/taler-wallet-core/src/db.ts
+++ b/packages/taler-wallet-core/src/db.ts
@@ -1884,25 +1884,22 @@ export enum PeerPushDebitStatus {
   PendingCreatePurse = 0x0100_0000 /* ACTIVE_START */,
   PendingReady = 0x0100_0001,
   AbortingDeletePurse = 0x0103_0000,
-  /**
-   * Refresh after the purse got deleted by the wallet.
-   */
-  AbortingRefreshDeleted = 0x0103_0001,
-  /**
-   * Refresh after the purse expired.
-   */
-  AbortingRefreshExpired = 0x0103_0002,
+
 
   SuspendedCreatePurse = 0x0110_0000,
   SuspendedReady = 0x0110_0001,
   SuspendedAbortingDeletePurse = 0x0113_0000,
-  SuspendedAbortingRefreshDeleted = 0x0113_0001,
-  SuspendedAbortingRefreshExpired = 0x0113_0002,
 
   Done = 0x0500_0000,
   Aborted = 0x0503_0000,
   Failed = 0x0501_0000,
   Expired = 0x0502_0000,
+
+  // Legacy / reserved:
+  // SuspendedAbortingRefreshDeleted = 0x0113_0001,
+  // SuspendedAbortingRefreshExpired = 0x0113_0002,
+  // AbortingRefreshDeleted = 0x0103_0001,
+  // AbortingRefreshExpired = 0x0103_0002,
 }
 
 export interface DbPeerPushPaymentCoinSelection {
diff --git a/packages/taler-wallet-core/src/deposits.ts 
b/packages/taler-wallet-core/src/deposits.ts
index 0df0797d6..0c783b4ae 100644
--- a/packages/taler-wallet-core/src/deposits.ts
+++ b/packages/taler-wallet-core/src/deposits.ts
@@ -1322,6 +1322,10 @@ async function processDepositGroupPendingTrack(
       logger.trace(`track response: ${j2s(track)}`);
       if (track.type === "accepted") {
         if (!track.kyc_ok && track.requirement_row !== undefined) {
+          if (!track.account_pub) {
+            // FIXME: Handle this properly.
+            throw Error("Deposit accepted but KYC auth missing");
+          }
           // FIXME: Take this from the response. If not present, require KYC 
transfer.
           // But: Why did exchange accept deposit in the first place if 
missing?
           const paytoHash = encodeCrock(
diff --git a/packages/taler-wallet-core/src/pay-peer-push-debit.ts 
b/packages/taler-wallet-core/src/pay-peer-push-debit.ts
index fb2c98173..2a087f522 100644
--- a/packages/taler-wallet-core/src/pay-peer-push-debit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-push-debit.ts
@@ -44,7 +44,6 @@ import {
   TransactionType,
   assertUnreachable,
   checkDbInvariant,
-  checkLogicInvariant,
   encodeCrock,
   getRandomBytes,
   j2s,
@@ -74,7 +73,6 @@ import { EncryptContractRequest } from 
"./crypto/cryptoTypes.js";
 import {
   PeerPushDebitRecord,
   PeerPushDebitStatus,
-  RefreshOperationStatus,
   WalletDbAllStoresReadOnlyTransaction,
   WalletDbReadWriteTransaction,
   timestampPreciseFromDb,
@@ -92,7 +90,7 @@ import {
   getTotalPeerPaymentCostInTx,
   queryCoinInfosForSelection,
 } from "./pay-peer-common.js";
-import { createRefreshGroup, waitRefreshFinal } from "./refresh.js";
+import { createRefreshGroup } from "./refresh.js";
 import {
   constructTransactionIdentifier,
   isUnsuccessfulTransaction,
@@ -226,12 +224,6 @@ export class PeerPushDebitTransactionContext implements 
TransactionContext {
           case PeerPushDebitStatus.PendingCreatePurse:
             newStatus = PeerPushDebitStatus.SuspendedCreatePurse;
             break;
-          case PeerPushDebitStatus.AbortingRefreshDeleted:
-            newStatus = PeerPushDebitStatus.SuspendedAbortingRefreshDeleted;
-            break;
-          case PeerPushDebitStatus.AbortingRefreshExpired:
-            newStatus = PeerPushDebitStatus.SuspendedAbortingRefreshExpired;
-            break;
           case PeerPushDebitStatus.AbortingDeletePurse:
             newStatus = PeerPushDebitStatus.SuspendedAbortingDeletePurse;
             break;
@@ -239,8 +231,6 @@ export class PeerPushDebitTransactionContext implements 
TransactionContext {
             newStatus = PeerPushDebitStatus.SuspendedReady;
             break;
           case PeerPushDebitStatus.SuspendedAbortingDeletePurse:
-          case PeerPushDebitStatus.SuspendedAbortingRefreshDeleted:
-          case PeerPushDebitStatus.SuspendedAbortingRefreshExpired:
           case PeerPushDebitStatus.SuspendedReady:
           case PeerPushDebitStatus.SuspendedCreatePurse:
           case PeerPushDebitStatus.Done:
@@ -293,11 +283,7 @@ export class PeerPushDebitTransactionContext implements 
TransactionContext {
             pushDebitRec.abortReason = reason;
             newStatus = PeerPushDebitStatus.AbortingDeletePurse;
             break;
-          case PeerPushDebitStatus.SuspendedAbortingRefreshDeleted:
           case PeerPushDebitStatus.SuspendedAbortingDeletePurse:
-          case PeerPushDebitStatus.SuspendedAbortingRefreshExpired:
-          case PeerPushDebitStatus.AbortingRefreshDeleted:
-          case PeerPushDebitStatus.AbortingRefreshExpired:
           case PeerPushDebitStatus.Done:
           case PeerPushDebitStatus.AbortingDeletePurse:
           case PeerPushDebitStatus.Aborted:
@@ -342,12 +328,6 @@ export class PeerPushDebitTransactionContext implements 
TransactionContext {
           case PeerPushDebitStatus.SuspendedAbortingDeletePurse:
             newStatus = PeerPushDebitStatus.AbortingDeletePurse;
             break;
-          case PeerPushDebitStatus.SuspendedAbortingRefreshDeleted:
-            newStatus = PeerPushDebitStatus.AbortingRefreshDeleted;
-            break;
-          case PeerPushDebitStatus.SuspendedAbortingRefreshExpired:
-            newStatus = PeerPushDebitStatus.AbortingRefreshExpired;
-            break;
           case PeerPushDebitStatus.SuspendedReady:
             newStatus = PeerPushDebitStatus.PendingReady;
             break;
@@ -355,8 +335,6 @@ export class PeerPushDebitTransactionContext implements 
TransactionContext {
             newStatus = PeerPushDebitStatus.PendingCreatePurse;
             break;
           case PeerPushDebitStatus.PendingCreatePurse:
-          case PeerPushDebitStatus.AbortingRefreshDeleted:
-          case PeerPushDebitStatus.AbortingRefreshExpired:
           case PeerPushDebitStatus.AbortingDeletePurse:
           case PeerPushDebitStatus.PendingReady:
           case PeerPushDebitStatus.Done:
@@ -398,15 +376,8 @@ export class PeerPushDebitTransactionContext implements 
TransactionContext {
         }
         let newStatus: PeerPushDebitStatus;
         switch (pushDebitRec.status) {
-          case PeerPushDebitStatus.AbortingRefreshDeleted:
-          case PeerPushDebitStatus.SuspendedAbortingRefreshDeleted:
-            // FIXME: What to do about the refresh group?
-            newStatus = PeerPushDebitStatus.Failed;
-            break;
           case PeerPushDebitStatus.AbortingDeletePurse:
           case PeerPushDebitStatus.SuspendedAbortingDeletePurse:
-          case PeerPushDebitStatus.AbortingRefreshExpired:
-          case PeerPushDebitStatus.SuspendedAbortingRefreshExpired:
           case PeerPushDebitStatus.PendingReady:
           case PeerPushDebitStatus.SuspendedReady:
           case PeerPushDebitStatus.SuspendedCreatePurse:
@@ -937,7 +908,6 @@ async function processPeerPushDebitAbortingDeletePurse(
         RefreshReason.AbortPeerPushDebit,
         ctx.transactionId,
       );
-      ppiRec.status = PeerPushDebitStatus.AbortingRefreshDeleted;
       ppiRec.abortRefreshGroupId = refresh.refreshGroupId;
       await tx.peerPushDebit.put(ppiRec);
       await ctx.updateTransactionMeta(tx);
@@ -989,103 +959,6 @@ async function transitionPeerPushDebitTransaction(
   notifyTransition(wex, ctx.transactionId, transitionInfo);
 }
 
-async function processPeerPushDebitAbortingRefreshDeleted(
-  wex: WalletExecutionContext,
-  peerPushInitiation: PeerPushDebitRecord,
-): Promise<TaskRunResult> {
-  const pursePub = peerPushInitiation.pursePub;
-  const abortRefreshGroupId = peerPushInitiation.abortRefreshGroupId;
-  checkLogicInvariant(!!abortRefreshGroupId);
-  const ctx = new PeerPushDebitTransactionContext(wex, pursePub);
-  if (peerPushInitiation.abortRefreshGroupId) {
-    await waitRefreshFinal(wex, peerPushInitiation.abortRefreshGroupId);
-  }
-  const transitionInfo = await wex.db.runReadWriteTx(
-    { storeNames: ["refreshGroups", "peerPushDebit", "transactionsMeta"] },
-    async (tx) => {
-      const refreshGroup = await tx.refreshGroups.get(abortRefreshGroupId);
-      let newOpState: PeerPushDebitStatus | undefined;
-      if (!refreshGroup) {
-        // Maybe it got manually deleted? Means that we should
-        // just go into failed.
-        logger.warn("no aborting refresh group found for deposit group");
-        newOpState = PeerPushDebitStatus.Failed;
-      } else {
-        if (refreshGroup.operationStatus === RefreshOperationStatus.Finished) {
-          newOpState = PeerPushDebitStatus.Aborted;
-        } else if (
-          refreshGroup.operationStatus === RefreshOperationStatus.Failed
-        ) {
-          newOpState = PeerPushDebitStatus.Failed;
-        }
-      }
-      if (newOpState) {
-        const newDg = await tx.peerPushDebit.get(pursePub);
-        if (!newDg) {
-          return;
-        }
-        const oldTxState = computePeerPushDebitTransactionState(newDg);
-        newDg.status = newOpState;
-        const newTxState = computePeerPushDebitTransactionState(newDg);
-        await tx.peerPushDebit.put(newDg);
-        await ctx.updateTransactionMeta(tx);
-        return { oldTxState, newTxState };
-      }
-      return undefined;
-    },
-  );
-  notifyTransition(wex, ctx.transactionId, transitionInfo);
-  // FIXME: Shouldn't this be finished in some cases?!
-  return TaskRunResult.backoff();
-}
-
-async function processPeerPushDebitAbortingRefreshExpired(
-  wex: WalletExecutionContext,
-  peerPushInitiation: PeerPushDebitRecord,
-): Promise<TaskRunResult> {
-  const pursePub = peerPushInitiation.pursePub;
-  const abortRefreshGroupId = peerPushInitiation.abortRefreshGroupId;
-  checkLogicInvariant(!!abortRefreshGroupId);
-  const ctx = new PeerPushDebitTransactionContext(wex, pursePub);
-  const transitionInfo = await wex.db.runReadWriteTx(
-    { storeNames: ["peerPushDebit", "refreshGroups", "transactionsMeta"] },
-    async (tx) => {
-      const refreshGroup = await tx.refreshGroups.get(abortRefreshGroupId);
-      let newOpState: PeerPushDebitStatus | undefined;
-      if (!refreshGroup) {
-        // Maybe it got manually deleted? Means that we should
-        // just go into failed.
-        logger.warn("no aborting refresh group found for deposit group");
-        newOpState = PeerPushDebitStatus.Failed;
-      } else {
-        if (refreshGroup.operationStatus === RefreshOperationStatus.Finished) {
-          newOpState = PeerPushDebitStatus.Expired;
-        } else if (
-          refreshGroup.operationStatus === RefreshOperationStatus.Failed
-        ) {
-          newOpState = PeerPushDebitStatus.Failed;
-        }
-      }
-      if (newOpState) {
-        const newDg = await tx.peerPushDebit.get(pursePub);
-        if (!newDg) {
-          return;
-        }
-        const oldTxState = computePeerPushDebitTransactionState(newDg);
-        newDg.status = newOpState;
-        const newTxState = computePeerPushDebitTransactionState(newDg);
-        await tx.peerPushDebit.put(newDg);
-        await ctx.updateTransactionMeta(tx);
-        return { oldTxState, newTxState };
-      }
-      return undefined;
-    },
-  );
-  notifyTransition(wex, ctx.transactionId, transitionInfo);
-  // FIXME: Shouldn't this be finished in some cases?!
-  return TaskRunResult.backoff();
-}
-
 /**
  * Process the "pending(ready)" state of a peer-push-debit transaction.
  */
@@ -1178,7 +1051,7 @@ async function processPeerPushDebitReady(
 
           ppiRec.abortRefreshGroupId = refresh.refreshGroupId;
         }
-        ppiRec.status = PeerPushDebitStatus.AbortingRefreshExpired;
+        ppiRec.status = PeerPushDebitStatus.Aborted;
         await tx.peerPushDebit.put(ppiRec);
         await ctx.updateTransactionMeta(tx);
         const newTxState = computePeerPushDebitTransactionState(ppiRec);
@@ -1221,16 +1094,6 @@ export async function processPeerPushDebit(
       return processPeerPushDebitReady(wex, peerPushInitiation);
     case PeerPushDebitStatus.AbortingDeletePurse:
       return processPeerPushDebitAbortingDeletePurse(wex, peerPushInitiation);
-    case PeerPushDebitStatus.AbortingRefreshDeleted:
-      return processPeerPushDebitAbortingRefreshDeleted(
-        wex,
-        peerPushInitiation,
-      );
-    case PeerPushDebitStatus.AbortingRefreshExpired:
-      return processPeerPushDebitAbortingRefreshExpired(
-        wex,
-        peerPushInitiation,
-      );
     default: {
       const txState = computePeerPushDebitTransactionState(peerPushInitiation);
       logger.warn(
@@ -1426,24 +1289,8 @@ export function computePeerPushDebitTransactionActions(
         TransactionAction.Suspend,
         TransactionAction.Fail,
       ];
-    case PeerPushDebitStatus.AbortingRefreshDeleted:
-      return [
-        TransactionAction.Retry,
-        TransactionAction.Suspend,
-        TransactionAction.Fail,
-      ];
-    case PeerPushDebitStatus.AbortingRefreshExpired:
-      return [
-        TransactionAction.Retry,
-        TransactionAction.Suspend,
-        TransactionAction.Fail,
-      ];
-    case PeerPushDebitStatus.SuspendedAbortingRefreshExpired:
-      return [TransactionAction.Resume, TransactionAction.Fail];
     case PeerPushDebitStatus.SuspendedAbortingDeletePurse:
       return [TransactionAction.Resume, TransactionAction.Fail];
-    case PeerPushDebitStatus.SuspendedAbortingRefreshDeleted:
-      return [TransactionAction.Resume, TransactionAction.Fail];
     case PeerPushDebitStatus.SuspendedCreatePurse:
       return [TransactionAction.Resume, TransactionAction.Abort];
     case PeerPushDebitStatus.SuspendedReady:
@@ -1480,31 +1327,11 @@ export function computePeerPushDebitTransactionState(
         major: TransactionMajorState.Aborting,
         minor: TransactionMinorState.DeletePurse,
       };
-    case PeerPushDebitStatus.AbortingRefreshDeleted:
-      return {
-        major: TransactionMajorState.Aborting,
-        minor: TransactionMinorState.Refresh,
-      };
-    case PeerPushDebitStatus.AbortingRefreshExpired:
-      return {
-        major: TransactionMajorState.Aborting,
-        minor: TransactionMinorState.RefreshExpired,
-      };
     case PeerPushDebitStatus.SuspendedAbortingDeletePurse:
       return {
         major: TransactionMajorState.SuspendedAborting,
         minor: TransactionMinorState.DeletePurse,
       };
-    case PeerPushDebitStatus.SuspendedAbortingRefreshExpired:
-      return {
-        major: TransactionMajorState.SuspendedAborting,
-        minor: TransactionMinorState.RefreshExpired,
-      };
-    case PeerPushDebitStatus.SuspendedAbortingRefreshDeleted:
-      return {
-        major: TransactionMajorState.SuspendedAborting,
-        minor: TransactionMinorState.Refresh,
-      };
     case PeerPushDebitStatus.SuspendedCreatePurse:
       return {
         major: TransactionMajorState.Suspended,

-- 
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]