aboutsummaryrefslogtreecommitdiff
path: root/packages/taler-wallet-core/src/operations/backup
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2022-10-14 22:47:11 +0200
committerFlorian Dold <florian@dold.me>2022-10-14 22:47:11 +0200
commit0c8e56c32457ea9b9229a8a3607fcf8e7618bc17 (patch)
treed0b4bbe4e199d62426e722b803fdfa178cd6f3a0 /packages/taler-wallet-core/src/operations/backup
parenteec6695be0409669fcad36c6cc7ea01f48d41c97 (diff)
downloadwallet-core-0c8e56c32457ea9b9229a8a3607fcf8e7618bc17.tar.xz
wallet-core: properly separate different types of IDs
Diffstat (limited to 'packages/taler-wallet-core/src/operations/backup')
-rw-r--r--packages/taler-wallet-core/src/operations/backup/import.ts10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts
index 775a8ac42..3bbb7d798 100644
--- a/packages/taler-wallet-core/src/operations/backup/import.ts
+++ b/packages/taler-wallet-core/src/operations/backup/import.ts
@@ -63,7 +63,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, makeEventId, TombstoneTag } from "../common.js";
+import { makeCoinAvailable, makeTombstoneId, makeTransactionId, TombstoneTag } from "../common.js";
import { getExchangeDetails } from "../exchanges.js";
import { extractContractData } from "../pay-merchant.js";
import { provideBackupState } from "./state.js";
@@ -493,7 +493,7 @@ export async function importBackup(
for (const backupWg of backupBlob.withdrawal_groups) {
const reservePub = cryptoComp.reservePrivToPub[backupWg.reserve_priv];
checkLogicInvariant(!!reservePub);
- const ts = makeEventId(TombstoneTag.DeleteReserve, reservePub);
+ const ts = makeTombstoneId(TombstoneTag.DeleteReserve, reservePub);
if (tombstoneSet.has(ts)) {
continue;
}
@@ -574,7 +574,7 @@ export async function importBackup(
}
for (const backupPurchase of backupBlob.purchases) {
- const ts = makeEventId(
+ const ts = makeTombstoneId(
TombstoneTag.DeletePayment,
backupPurchase.proposal_id,
);
@@ -705,7 +705,7 @@ export async function importBackup(
}
for (const backupRefreshGroup of backupBlob.refresh_groups) {
- const ts = makeEventId(
+ const ts = makeTombstoneId(
TombstoneTag.DeleteRefreshGroup,
backupRefreshGroup.refresh_group_id,
);
@@ -791,7 +791,7 @@ export async function importBackup(
}
for (const backupTip of backupBlob.tips) {
- const ts = makeEventId(TombstoneTag.DeleteTip, backupTip.wallet_tip_id);
+ const ts = makeTombstoneId(TombstoneTag.DeleteTip, backupTip.wallet_tip_id);
if (tombstoneSet.has(ts)) {
continue;
}