From 99550b001178965cae6d5e204783f8d2fd0adc1f Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 17 Jun 2021 21:06:45 +0200 Subject: hide internal wallet state, keep it internal to package --- packages/taler-wallet-android/src/index.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'packages/taler-wallet-android/src/index.ts') diff --git a/packages/taler-wallet-android/src/index.ts b/packages/taler-wallet-android/src/index.ts index 2e24a7c41..94774bcf4 100644 --- a/packages/taler-wallet-android/src/index.ts +++ b/packages/taler-wallet-android/src/index.ts @@ -33,8 +33,7 @@ import { WALLET_EXCHANGE_PROTOCOL_VERSION, WALLET_MERCHANT_PROTOCOL_VERSION, runRetryLoop, - handleCoreApiRequest, - InternalWalletState, + Wallet, } from "@gnu-taler/taler-wallet-core"; import fs from "fs"; @@ -156,8 +155,8 @@ function sendAkonoMessage(ev: CoreApiEnvelope): void { class AndroidWalletMessageHandler { walletArgs: DefaultNodeWalletArgs | undefined; - maybeWallet: InternalWalletState | undefined; - wp = openPromise(); + maybeWallet: Wallet | undefined; + wp = openPromise(); httpLib = new NodeHttpLib(); /** @@ -180,8 +179,8 @@ class AndroidWalletMessageHandler { const reinit = async () => { const w = await getDefaultNodeWallet(this.walletArgs); this.maybeWallet = w; - await handleCoreApiRequest(w, "initWallet", "akono-init", {}); - runRetryLoop(w).catch((e) => { + await w.handleCoreApiRequest("initWallet", "akono-init", {}); + w.runRetryLoop().catch((e) => { console.error("Error during wallet retry loop", e); }); this.wp.resolve(w); @@ -230,14 +229,14 @@ class AndroidWalletMessageHandler { } const wallet = await this.wp.promise; wallet.stop(); - this.wp = openPromise(); + this.wp = openPromise(); this.maybeWallet = undefined; await reinit(); return wrapResponse({}); } default: { const wallet = await this.wp.promise; - return await handleCoreApiRequest(wallet, operation, id, args); + return await wallet.handleCoreApiRequest(operation, id, args); } } } -- cgit v1.2.3