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

fixing import db when pkey is number

Browse Source
This commit is contained in:
Sebastian 2022-11-22 15:15:40 -03:00
parent 299ca60f1e
commit dc08d7d20e
No known key found for this signature in database
GPG Key ID: BE4FF68352439FC1
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/taler-wallet-core/src/db.ts
View File

@ -2258,7 +2258,10 @@ export async function importDb(db: IDBDatabase, object: any): Promise<void> {
dump.stores[name] = storeDump; dump.stores[name] = storeDump;
talerDb.objectStores[name].records.map((r: any) => { talerDb.objectStores[name].records.map((r: any) => {
const pkey = r.primaryKey; const pkey = r.primaryKey;
const key = typeof pkey === "string" ? pkey : pkey.join(","); const key =
typeof pkey === "string" || typeof pkey === "number"
? pkey
: pkey.join(",");
storeDump[key] = r.value; storeDump[key] = r.value;
}); });
} }

15
packages/taler-wallet-core/src/util/denominations.ts
View File

@ -96,8 +96,8 @@ export function createPairTimeline(
//FIXME: we need to create a copy of the array because //FIXME: we need to create a copy of the array because
//this algorithm is using splice, remove splice and //this algorithm is using splice, remove splice and
//remove this array duplication //remove this array duplication
left = [...left] left = [...left];
right = [...right] right = [...right];
//both list empty, discarded //both list empty, discarded
if (left.length === 0 && right.length === 0) return []; if (left.length === 0 && right.length === 0) return [];
@ -108,7 +108,10 @@ export function createPairTimeline(
let ri = 0; //right list index let ri = 0; //right list index
while (li < left.length && ri < right.length) { while (li < left.length && ri < right.length) {
const currentGroup = Number.parseFloat(left[li].group) < Number.parseFloat(right[ri].group) ? left[li].group : right[ri].group; const currentGroup =
Number.parseFloat(left[li].group) < Number.parseFloat(right[ri].group)
? left[li].group
: right[ri].group;
const lgs = li; //left group start index const lgs = li; //left group start index
const rgs = ri; //right group start index const rgs = ri; //right group start index
@ -182,7 +185,7 @@ export function createPairTimeline(
} }
//now both lists are non empty and (starts,ends) at the same time //now both lists are non empty and (starts,ends) at the same time
while (li < (lgs + lgl) && ri < (rgs + rgl)) { while (li < lgs + lgl && ri < rgs + rgl) {
if ( if (
AbsoluteTime.cmp(left[li].from, timeCut) !== 0 && AbsoluteTime.cmp(left[li].from, timeCut) !== 0 &&
AbsoluteTime.cmp(right[ri].from, timeCut) !== 0 AbsoluteTime.cmp(right[ri].from, timeCut) !== 0
@ -233,7 +236,7 @@ export function createPairTimeline(
if (li < left.length) { if (li < left.length) {
let timeCut = let timeCut =
pairList.length > 0 && pairList.length > 0 &&
pairList[pairList.length - 1].group === left[li].group pairList[pairList.length - 1].group === left[li].group
? pairList[pairList.length - 1].until ? pairList[pairList.length - 1].until
: left[li].from; : left[li].from;
while (li < left.length) { while (li < left.length) {
@ -251,7 +254,7 @@ export function createPairTimeline(
if (ri < right.length) { if (ri < right.length) {
let timeCut = let timeCut =
pairList.length > 0 && pairList.length > 0 &&
pairList[pairList.length - 1].group === right[ri].group pairList[pairList.length - 1].group === right[ri].group
? pairList[pairList.length - 1].until ? pairList[pairList.length - 1].until
: right[ri].from; : right[ri].from;
while (ri < right.length) { while (ri < right.length) {