From 5a12edcd5d49029d85c47dc1169a5cc26cc6d10b Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 19 Feb 2016 01:30:02 +0100 Subject: [PATCH] factor out RPC --- extension/lib/wallet/wallet.ts | 35 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/extension/lib/wallet/wallet.ts b/extension/lib/wallet/wallet.ts index 1504258a1..ed719211f 100644 --- a/extension/lib/wallet/wallet.ts +++ b/extension/lib/wallet/wallet.ts @@ -962,12 +962,12 @@ export class Wallet { } return mintInfo.mergeKeys(mintKeysJson, this) - .then(() => { - return Query(this.db) - .put("mints", mintInfo) - .finish() - .then(() => mintInfo); - }); + .then(() => { + return Query(this.db) + .put("mints", mintInfo) + .finish() + .then(() => mintInfo); + }); }); }); @@ -1016,27 +1016,24 @@ export class Wallet { return id; } - - createPreCoin(denom: Denomination, reserve: Reserve): Promise { - return new Promise((resolve, reject) => { + private doRpc(methodName: string, ...args): Promise { + return new Promise((resolve, reject) => { let msg = { - operation: "createPreCoin", + operation: methodName, id: this.registerRpcId(resolve, reject), - args: [denom, reserve] + args: args, }; this.cryptoWorker.postMessage(msg); }); } + + createPreCoin(denom: Denomination, reserve: Reserve): Promise { + return this.doRpc("createPreCoin", denom, reserve); + } + isValidDenom(denom: Denomination, masterPub: string): Promise { - return new Promise((resolve, reject) => { - let msg = { - operation: "isValidDenom", - id: this.registerRpcId(resolve, reject), - args: [denom, masterPub] - }; - this.cryptoWorker.postMessage(msg); - }); + return this.doRpc("isValidDenom", denom, masterPub); } } \ No newline at end of file