taler-typescript-core

commit 0b854299d150aef448ec80943382e678699e418a
parent 969951036905997f9df51845c0eeceb83b4c1e19
Author: Florian Dold <florian@dold.me>
Date:   Mon,  5 Jul 2021 11:08:58 +0200

formatting

Diffstat:
M
packages/taler-wallet-core/src/operations/backup/import.ts
 | 
11
++++++++---

1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts
@@ -48,7 +48,10 @@ import {
 } from "../../db.js";
 import { PayCoinSelection } from "../../util/coinSelection.js";
 import { j2s } from "@gnu-taler/taler-util";
-import { checkDbInvariant, checkLogicInvariant } from "../../util/invariants.js";
+import {
+  checkDbInvariant,
+  checkLogicInvariant,
+} from "../../util/invariants.js";
 import { Logger } from "@gnu-taler/taler-util";
 import { initRetryInfo } from "../../util/retries.js";
 import { InternalWalletState } from "../../common.js";
@@ -244,7 +247,9 @@ export async function importBackup(
         });
       }
 
-      const tombstoneSet = new Set(backupBlob.tombstones);
+      const tombstoneSet = new Set(
+        (await tx.tombstones.iter().toArray()).map((x) => x.id),
+      );
 
       // FIXME:  Validate that the "details pointer" is correct
 
@@ -877,7 +882,7 @@ export async function importBackup(
       // importing things that are tombstoned,
       // but we do tombstone processing last just to be sure.
 
-      for (const tombstone of backupBlob.tombstones) {
+      for (const tombstone of tombstoneSet) {
         const [type, ...rest] = tombstone.split(":");
         if (type === TombstoneTag.DeleteDepositGroup) {
           await tx.depositGroups.delete(rest[0]);