taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

simplify matching

Browse Source
This commit is contained in:
Florian Dold 2020-04-02 20:42:33 +05:30
parent 1be738b843
commit 05e43bb259
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/util/reserveHistoryUtil.ts
View File

@ -56,6 +56,10 @@ export interface ReserveReconciliationResult {
newMatchedItems: WalletReserveHistoryItem[]; newMatchedItems: WalletReserveHistoryItem[];
} }
/**
* Various totals computed from the wallet's view
* on the reserve history.
*/
export interface ReserveHistorySummary { export interface ReserveHistorySummary {
/** /**
* Balance computed by the wallet, should match the balance * Balance computed by the wallet, should match the balance
@ -80,7 +84,10 @@ export interface ReserveHistorySummary {
withdrawnAmount: Amounts.AmountJson; withdrawnAmount: Amounts.AmountJson;
} }
export function isRemoteHistoryMatch( /**
* Check if two reserve history items (exchange's version) match.
*/
function isRemoteHistoryMatch(
t1: ReserveTransaction, t1: ReserveTransaction,
t2: ReserveTransaction, t2: ReserveTransaction,
): boolean { ): boolean {
@ -104,7 +111,10 @@ export function isRemoteHistoryMatch(
} }
} }
export function isLocalRemoteHistoryPreferredMatch( /**
* Check a local reserve history item and a remote history item are a match.
*/
export function isLocalRemoteHistoryMatch(
t1: WalletReserveHistoryItem, t1: WalletReserveHistoryItem,
t2: ReserveTransaction, t2: ReserveTransaction,
): boolean { ): boolean {
@ -121,7 +131,7 @@ export function isLocalRemoteHistoryPreferredMatch(
t2.type === ReserveTransactionType.Withdraw && t2.type === ReserveTransactionType.Withdraw &&
!!t1.expectedAmount && !!t1.expectedAmount &&
Amounts.cmp(t1.expectedAmount, Amounts.parseOrThrow(t2.amount)) === 0 Amounts.cmp(t1.expectedAmount, Amounts.parseOrThrow(t2.amount)) === 0
) );
case WalletReserveHistoryItemType.Recoup: { case WalletReserveHistoryItemType.Recoup: {
return ( return (
t2.type === ReserveTransactionType.Recoup && t2.type === ReserveTransactionType.Recoup &&
@ -133,22 +143,6 @@ export function isLocalRemoteHistoryPreferredMatch(
return false; return false;
} }
export function isLocalRemoteHistoryAcceptableMatch(
t1: WalletReserveHistoryItem,
t2: ReserveTransaction,
): boolean {
switch (t1.type) {
case WalletReserveHistoryItemType.Closing:
throw Error("invariant violated");
case WalletReserveHistoryItemType.Credit:
return !t1.expectedAmount && t2.type == ReserveTransactionType.Credit;
case WalletReserveHistoryItemType.Recoup:
return !t1.expectedAmount && t2.type == ReserveTransactionType.Recoup;
case WalletReserveHistoryItemType.Withdraw:
return !t1.expectedAmount && t2.type == ReserveTransactionType.Withdraw;
}
}
export function summarizeReserveHistory( export function summarizeReserveHistory(
localHistory: WalletReserveHistoryItem[], localHistory: WalletReserveHistoryItem[],
currency: string, currency: string,
@ -197,7 +191,9 @@ export function summarizeReserveHistory(
negAmounts.push( negAmounts.push(
Amounts.parseOrThrow(item.matchedExchangeTransaction.amount), Amounts.parseOrThrow(item.matchedExchangeTransaction.amount),
); );
withdrawnAmounts.push(Amounts.parseOrThrow(item.matchedExchangeTransaction.amount)); withdrawnAmounts.push(
Amounts.parseOrThrow(item.matchedExchangeTransaction.amount),
);
} else if (item.expectedAmount) { } else if (item.expectedAmount) {
expectedNegAmounts.push(item.expectedAmount); expectedNegAmounts.push(item.expectedAmount);
} else { } else {
@ -299,33 +295,7 @@ export function reconcileReserveHistory(
if (remoteMatched[remoteIndex]) { if (remoteMatched[remoteIndex]) {
continue; continue;
} }
if (isLocalRemoteHistoryPreferredMatch(lhi, rhi)) { if (isLocalRemoteHistoryMatch(lhi, rhi)) {
localMatched[localIndex] = true;
remoteMatched[remoteIndex] = true;
updatedLocalHistory[localIndex].matchedExchangeTransaction = rhi as any;
newMatchedItems.push(lhi);
break;
}
}
}
// Next, find out if there are any acceptable new matches between local and remote
// history items
for (let localIndex = 0; localIndex < localHistory.length; localIndex++) {
if (localMatched[localIndex]) {
continue;
}
const lhi = localHistory[localIndex];
for (
let remoteIndex = 0;
remoteIndex < remoteHistory.length;
remoteIndex++
) {
const rhi = remoteHistory[remoteIndex];
if (remoteMatched[remoteIndex]) {
continue;
}
if (isLocalRemoteHistoryAcceptableMatch(lhi, rhi)) {
localMatched[localIndex] = true; localMatched[localIndex] = true;
remoteMatched[remoteIndex] = true; remoteMatched[remoteIndex] = true;
updatedLocalHistory[localIndex].matchedExchangeTransaction = rhi as any; updatedLocalHistory[localIndex].matchedExchangeTransaction = rhi as any;