1 files changed, 17 insertions, 14 deletions

diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts
index cda5a012b..7f73a14b0 100644
--- a/packages/taler-wallet-core/src/operations/backup/import.ts
+++ b/packages/taler-wallet-core/src/operations/backup/import.ts
@@ -62,7 +62,7 @@ import { InternalWalletState } from "../../internal-wallet-state.js";
 import { assertUnreachable } from "../../util/assertUnreachable.js";
 import { checkLogicInvariant } from "../../util/invariants.js";
 import { GetReadOnlyAccess, GetReadWriteAccess } from "../../util/query.js";
-import { makeCoinAvailable, makeTombstoneId, TombstoneTag } from "../common.js";
+import { constructTombstone, makeCoinAvailable, TombstoneTag } from "../common.js";
 import { getExchangeDetails } from "../exchanges.js";
 import { extractContractData } from "../pay-merchant.js";
 import { provideBackupState } from "./state.js";
@@ -472,7 +472,10 @@ export async function importBackup(
       for (const backupWg of backupBlob.withdrawal_groups) {
         const reservePub = cryptoComp.reservePrivToPub[backupWg.reserve_priv];
         checkLogicInvariant(!!reservePub);
-        const ts = makeTombstoneId(TombstoneTag.DeleteReserve, reservePub);
+        const ts = constructTombstone({
+          tag: TombstoneTag.DeleteReserve,
+          reservePub,
+        });
         if (tombstoneSet.has(ts)) {
           continue;
         }
@@ -558,10 +561,10 @@ export async function importBackup(
       }
 
       for (const backupPurchase of backupBlob.purchases) {
-        const ts = makeTombstoneId(
-          TombstoneTag.DeletePayment,
-          backupPurchase.proposal_id,
-        );
+        const ts = constructTombstone({
+          tag: TombstoneTag.DeletePayment,
+          proposalId: backupPurchase.proposal_id,
+        });
         if (tombstoneSet.has(ts)) {
           continue;
         }
@@ -704,10 +707,10 @@ export async function importBackup(
       }
 
       for (const backupRefreshGroup of backupBlob.refresh_groups) {
-        const ts = makeTombstoneId(
-          TombstoneTag.DeleteRefreshGroup,
-          backupRefreshGroup.refresh_group_id,
-        );
+        const ts = constructTombstone({
+          tag: TombstoneTag.DeleteRefreshGroup,
+          refreshGroupId: backupRefreshGroup.refresh_group_id,
+        });
         if (tombstoneSet.has(ts)) {
           continue;
         }
@@ -800,10 +803,10 @@ export async function importBackup(
       }
 
       for (const backupTip of backupBlob.tips) {
-        const ts = makeTombstoneId(
-          TombstoneTag.DeleteTip,
-          backupTip.wallet_tip_id,
-        );
+        const ts = constructTombstone({
+          tag: TombstoneTag.DeleteTip,
+          walletTipId: backupTip.wallet_tip_id,
+        });
         if (tombstoneSet.has(ts)) {
           continue;
         }