[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] 01/04: formatting
From: |
gnunet |
Subject: |
[taler-wallet-core] 01/04: formatting |
Date: |
Mon, 12 Jul 2021 15:55:36 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-core.
commit 0b854299d150aef448ec80943382e678699e418a
Author: Florian Dold <florian@dold.me>
AuthorDate: Mon Jul 5 11:08:58 2021 +0200
formatting
---
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
index 28bd5ec0..e2064a80 100644
--- 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]);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.