diff options
author | Florian Dold <florian@dold.me> | 2021-07-05 11:08:58 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2021-07-12 15:13:04 +0200 |
commit | 0b854299d150aef448ec80943382e678699e418a (patch) | |
tree | 588e9958ee6b7cca1507d23e8051eb0d547402db /packages/taler-wallet-core/src/operations/backup/import.ts | |
parent | 969951036905997f9df51845c0eeceb83b4c1e19 (diff) | |
download | wallet-core-0b854299d150aef448ec80943382e678699e418a.tar.xz |
formatting
Diffstat (limited to 'packages/taler-wallet-core/src/operations/backup/import.ts')
-rw-r--r-- | packages/taler-wallet-core/src/operations/backup/import.ts | 11 |
1 files 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 28bd5ec0a..e2064a80f 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]); |