diff options
| author | Florian Dold <florian@dold.me> | 2022-09-21 20:46:45 +0200 |
|---|---|---|
| committer | Florian Dold <florian@dold.me> | 2022-09-21 22:50:42 +0200 |
| commit | 7d6bcd42ea9efced6200cf94924aa38bed2dbb02 (patch) | |
| tree | 54b2077512c7d098e558193392a7ac92a6d74d63 /packages/taler-wallet-core/src/operations/backup | |
| parent | 5d31803c92ac085d50ab0942a6cf657a6cd9cc4b (diff) | |
| download | wallet-core-7d6bcd42ea9efced6200cf94924aa38bed2dbb02.tar.xz | |
wallet-core: use numeric status field to allow range queries
Diffstat (limited to 'packages/taler-wallet-core/src/operations/backup')
| -rw-r--r-- | packages/taler-wallet-core/src/operations/backup/export.ts | 4 | ||||
| -rw-r--r-- | packages/taler-wallet-core/src/operations/backup/import.ts | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/packages/taler-wallet-core/src/operations/backup/export.ts b/packages/taler-wallet-core/src/operations/backup/export.ts index b39e6dc27..c8454a62f 100644 --- a/packages/taler-wallet-core/src/operations/backup/export.ts +++ b/packages/taler-wallet-core/src/operations/backup/export.ts @@ -71,6 +71,7 @@ import { RefreshCoinStatus, RefundState, WALLET_BACKUP_STATE_KEY, + WithdrawalGroupStatus, WithdrawalRecordType, } from "../../db.js"; import { InternalWalletState } from "../../internal-wallet-state.js"; @@ -167,8 +168,9 @@ export async function exportBackup( instructed_amount: Amounts.stringify(wg.instructedAmount), reserve_priv: wg.reservePriv, restrict_age: wg.restrictAge, + // FIXME: proper status conversion! operation_status: - wg.operationStatus == OperationStatus.Finished + wg.status == WithdrawalGroupStatus.Finished ? BackupOperationStatus.Finished : BackupOperationStatus.Pending, selected_denoms_uid: wg.denomSelUid, diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts index 20c7316c1..3a92273df 100644 --- a/packages/taler-wallet-core/src/operations/backup/import.ts +++ b/packages/taler-wallet-core/src/operations/backup/import.ts @@ -52,7 +52,7 @@ import { RefreshSessionRecord, RefundState, ReserveBankInfo, - ReserveRecordStatus, + WithdrawalGroupStatus, WalletContractData, WalletRefundItem, WalletStoresV1, @@ -531,9 +531,6 @@ export async function importBackup( exchangeBaseUrl: backupWg.exchange_base_url, instructedAmount: Amounts.parseOrThrow(backupWg.instructed_amount), secretSeed: backupWg.secret_seed, - operationStatus: backupWg.timestamp_finish - ? OperationStatus.Finished - : OperationStatus.Pending, denomsSel: await getDenomSelStateFromBackup( tx, backupWg.exchange_base_url, @@ -545,9 +542,9 @@ export async function importBackup( ), reservePriv: backupWg.reserve_priv, reservePub, - reserveStatus: backupWg.timestamp_finish - ? ReserveRecordStatus.Dormant - : ReserveRecordStatus.QueryingStatus, // FIXME! + status: backupWg.timestamp_finish + ? WithdrawalGroupStatus.Finished + : WithdrawalGroupStatus.QueryingStatus, // FIXME! timestampStart: backupWg.timestamp_created, wgInfo, restrictAge: backupWg.restrict_age, |