aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2019-09-01 01:05:38 +0200
committerFlorian Dold <florian.dold@gmail.com>2019-09-01 01:05:38 +0200
commit70912b07250e7c86ace4a0b0b16e90352df93ece (patch)
tree4609e53f86197c7706e803972537488cacb9173c /src
parentaa36fce8a0d1ead29709444527c2d1a4ba9491a6 (diff)
fix error in index iteration
Diffstat (limited to 'src')
-rw-r--r--src/android/index.ts10
-rw-r--r--src/headless/helpers.ts3
-rw-r--r--src/headless/taler-wallet-cli.ts2
-rw-r--r--src/query.ts6
-rw-r--r--src/wallet.ts6
5 files changed, 21 insertions, 6 deletions
diff --git a/src/android/index.ts b/src/android/index.ts
index e7d24c8b4..d3f5cd0d6 100644
--- a/src/android/index.ts
+++ b/src/android/index.ts
@@ -171,6 +171,16 @@ export function installAndroidWalletListener() {
httpLib.handleTunnelResponse(msg.args);
break;
}
+ case "getWithdrawalInfo": {
+ const wallet = await wp.promise;
+ result = await wallet.getWithdrawalInfo(msg.args.talerWithdrawUri);
+ break;
+ }
+ case "acceptWithdrawal": {
+ const wallet = await wp.promise;
+ result = await wallet.acceptWithdrawal(msg.args.talerWithdrawUri, msg.args.selectedExchange);
+ break;
+ }
case "reset": {
const wallet = await wp.promise;
wallet.stop();
diff --git a/src/headless/helpers.ts b/src/headless/helpers.ts
index a86b26738..6716ccef4 100644
--- a/src/headless/helpers.ts
+++ b/src/headless/helpers.ts
@@ -133,8 +133,9 @@ export async function getDefaultNodeWallet(
const myBadge = new ConsoleBadge();
+ BridgeIDBFactory.enableTracing = true;
const myBackend = new MemoryBackend();
- myBackend.enableTracing = false;
+ myBackend.enableTracing = true;
const storagePath = args.persistentStoragePath;
if (storagePath) {
diff --git a/src/headless/taler-wallet-cli.ts b/src/headless/taler-wallet-cli.ts
index bfa1ac4b9..da68f46ae 100644
--- a/src/headless/taler-wallet-cli.ts
+++ b/src/headless/taler-wallet-cli.ts
@@ -135,7 +135,7 @@ program
persistentStoragePath: walletDbPath,
});
- const withdrawInfo = await wallet.downloadWithdrawInfo(withdrawUrl);
+ const withdrawInfo = await wallet.getWithdrawalInfo(withdrawUrl);
console.log("withdraw info", withdrawInfo);
diff --git a/src/query.ts b/src/query.ts
index 7308d9ede..766696874 100644
--- a/src/query.ts
+++ b/src/query.ts
@@ -21,6 +21,7 @@
*/
import { openPromise } from "./promiseUtils";
+import { join } from "path";
/**
* Result of an inner join.
@@ -463,11 +464,14 @@ class QueryStreamIndexJoin<T, S> extends QueryStreamBase<JoinResult<T, S>> {
f(true, undefined, tx);
return;
}
+ const joinKey = this.key(value);
+ console.log("***** JOINING ON", joinKey);
const s = tx.objectStore(this.storeName).index(this.indexName);
- const req = s.openCursor(IDBKeyRange.only(this.key(value)));
+ const req = s.openCursor(IDBKeyRange.only(joinKey));
req.onsuccess = () => {
const cursor = req.result;
if (cursor) {
+ console.log(`join result for ${joinKey}`, { left: value, right: cursor.value });
f(false, { left: value, right: cursor.value }, tx);
cursor.continue();
}
diff --git a/src/wallet.ts b/src/wallet.ts
index 3785f912e..1d231f2df 100644
--- a/src/wallet.ts
+++ b/src/wallet.ts
@@ -1822,7 +1822,7 @@ export class Wallet {
talerWithdrawUri: string,
maybeSelectedExchange?: string,
): Promise<WithdrawDetails> {
- const info = await this.downloadWithdrawInfo(talerWithdrawUri);
+ const info = await this.getWithdrawalInfo(talerWithdrawUri);
let rci: ReserveCreationInfo | undefined = undefined;
if (maybeSelectedExchange) {
rci = await this.getWithdrawDetailsForAmount(
@@ -3551,7 +3551,7 @@ export class Wallet {
// strategy to test it.
}
- async downloadWithdrawInfo(
+ async getWithdrawalInfo(
talerWithdrawUri: string,
): Promise<DownloadedWithdrawInfo> {
const uriResult = parseWithdrawUri(talerWithdrawUri);
@@ -3577,7 +3577,7 @@ export class Wallet {
talerWithdrawUri: string,
selectedExchange: string,
): Promise<AcceptWithdrawalResponse> {
- const withdrawInfo = await this.downloadWithdrawInfo(talerWithdrawUri);
+ const withdrawInfo = await this.getWithdrawalInfo(talerWithdrawUri);
const exchangeWire = await this.getExchangePaytoUri(
selectedExchange,
withdrawInfo.wireTypes,