diff options
author | Florian Dold <florian.dold@gmail.com> | 2020-04-02 20:44:12 +0530 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2020-04-02 20:44:12 +0530 |
commit | 95e638f513c6e8e5b4ab32981a1f8900b43700c7 (patch) | |
tree | 6a9a358259815a7de8ded76bad78b934d5f83040 /src | |
parent | 05e43bb259810c305cf69f9323017d6a682c8213 (diff) |
cosmetics and comments
Diffstat (limited to 'src')
-rw-r--r-- | src/operations/history.ts | 5 | ||||
-rw-r--r-- | src/operations/reserves.ts | 5 | ||||
-rw-r--r-- | src/operations/tip.ts | 1 | ||||
-rw-r--r-- | src/operations/withdraw.ts | 34 | ||||
-rw-r--r-- | src/types/dbTypes.ts | 4 | ||||
-rw-r--r-- | src/util/amounts.ts | 2 | ||||
-rw-r--r-- | src/util/reserveHistoryUtil.ts | 8 |
7 files changed, 35 insertions, 24 deletions
diff --git a/src/operations/history.ts b/src/operations/history.ts index 848739334..edb4d9f27 100644 --- a/src/operations/history.ts +++ b/src/operations/history.ts @@ -404,7 +404,10 @@ export async function getHistory( type: ReserveType.Manual, }; } - const s = summarizeReserveHistory(reserve.reserveTransactions, reserve.currency); + const s = summarizeReserveHistory( + reserve.reserveTransactions, + reserve.currency, + ); history.push({ type: HistoryEventType.ReserveBalanceUpdated, eventId: makeEventId( diff --git a/src/operations/reserves.ts b/src/operations/reserves.ts index 2ef902ef2..5c299d112 100644 --- a/src/operations/reserves.ts +++ b/src/operations/reserves.ts @@ -492,7 +492,10 @@ async function updateReserve( reserveInfo.history, ); - console.log("reconciled history:", JSON.stringify(reconciled, undefined, 2)); + console.log( + "reconciled history:", + JSON.stringify(reconciled, undefined, 2), + ); const summary = summarizeReserveHistory( reconciled.updatedLocalHistory, diff --git a/src/operations/tip.ts b/src/operations/tip.ts index d3c98d288..7bfbddb6a 100644 --- a/src/operations/tip.ts +++ b/src/operations/tip.ts @@ -247,7 +247,6 @@ async function processTipImpl( const planchets: PlanchetRecord[] = []; - for (let i = 0; i < tipRecord.planchets.length; i++) { const tipPlanchet = tipRecord.planchets[i]; const coinEvHash = await ws.cryptoApi.hashEncoded(tipPlanchet.coinEv); diff --git a/src/operations/withdraw.ts b/src/operations/withdraw.ts index 48d70db20..fcd9d70c9 100644 --- a/src/operations/withdraw.ts +++ b/src/operations/withdraw.ts @@ -52,7 +52,10 @@ import { timestampCmp, timestampSubtractDuraction, } from "../util/time"; -import { summarizeReserveHistory, ReserveHistorySummary } from "../util/reserveHistoryUtil"; +import { + summarizeReserveHistory, + ReserveHistorySummary, +} from "../util/reserveHistoryUtil"; const logger = new Logger("withdraw.ts"); @@ -372,22 +375,19 @@ async function incrementWithdrawalRetry( withdrawalGroupId: string, err: OperationError | undefined, ): Promise<void> { - await ws.db.runWithWriteTransaction( - [Stores.withdrawalGroups], - async (tx) => { - const wsr = await tx.get(Stores.withdrawalGroups, withdrawalGroupId); - if (!wsr) { - return; - } - if (!wsr.retryInfo) { - return; - } - wsr.retryInfo.retryCounter++; - updateRetryInfoTimeout(wsr.retryInfo); - wsr.lastError = err; - await tx.put(Stores.withdrawalGroups, wsr); - }, - ); + await ws.db.runWithWriteTransaction([Stores.withdrawalGroups], async (tx) => { + const wsr = await tx.get(Stores.withdrawalGroups, withdrawalGroupId); + if (!wsr) { + return; + } + if (!wsr.retryInfo) { + return; + } + wsr.retryInfo.retryCounter++; + updateRetryInfoTimeout(wsr.retryInfo); + wsr.lastError = err; + await tx.put(Stores.withdrawalGroups, wsr); + }); ws.notify({ type: NotificationType.WithdrawOperationError }); } diff --git a/src/types/dbTypes.ts b/src/types/dbTypes.ts index b87ada115..f94fb6c6f 100644 --- a/src/types/dbTypes.ts +++ b/src/types/dbTypes.ts @@ -165,9 +165,9 @@ export interface WalletReserveHistoryWithdrawItem { /** * Hash of the blinded coin. - * + * * When this value is set, it indicates that a withdrawal is active - * in the wallet for the + * in the wallet for the */ expectedCoinEvHash?: string; diff --git a/src/util/amounts.ts b/src/util/amounts.ts index aee7b12b5..f9946393f 100644 --- a/src/util/amounts.ts +++ b/src/util/amounts.ts @@ -348,4 +348,4 @@ export const Amounts = { isZero: isZero, maxAmountValue: maxAmountValue, fromFloat: fromFloat, -};
\ No newline at end of file +}; diff --git a/src/util/reserveHistoryUtil.ts b/src/util/reserveHistoryUtil.ts index 033221874..855b71a3d 100644 --- a/src/util/reserveHistoryUtil.ts +++ b/src/util/reserveHistoryUtil.ts @@ -28,7 +28,6 @@ import { import * as Amounts from "../util/amounts"; import { timestampCmp } from "./time"; import { deepCopy } from "./helpers"; -import { AmountString } from "../types/talerTypes"; import { AmountJson } from "../util/amounts"; /** @@ -143,6 +142,9 @@ export function isLocalRemoteHistoryMatch( return false; } +/** + * Compute totals for the wallet's view of the reserve history. + */ export function summarizeReserveHistory( localHistory: WalletReserveHistoryItem[], currency: string, @@ -231,6 +233,10 @@ export function summarizeReserveHistory( }; } +/** + * Reconcile the wallet's local model of the reserve history + * with the reserve history of the exchange. + */ export function reconcileReserveHistory( localHistory: WalletReserveHistoryItem[], remoteHistory: ReserveTransaction[], |