[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] 01/02: cleanup
From: |
gnunet |
Subject: |
[taler-wallet-core] 01/02: cleanup |
Date: |
Wed, 11 Mar 2020 20:14:34 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-core.
commit 6e2881fabf74a3c1da8e94dcbe3e68fce6080d9e
Author: Florian Dold <address@hidden>
AuthorDate: Tue Mar 10 14:47:46 2020 +0530
cleanup
---
src/operations/{payback.ts => recoup.ts} | 2 +-
src/wallet.ts | 6 +-----
src/webex/messages.ts | 4 ----
src/webex/wxApi.ts | 7 -------
src/webex/wxBackend.ts | 28 ++++++++++++++--------------
tsconfig.json | 2 +-
6 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/src/operations/payback.ts b/src/operations/recoup.ts
similarity index 99%
rename from src/operations/payback.ts
rename to src/operations/recoup.ts
index 18152769..2b646a4d 100644
--- a/src/operations/payback.ts
+++ b/src/operations/recoup.ts
@@ -30,7 +30,7 @@ import { NotificationType } from "../types/notifications";
const logger = new Logger("payback.ts");
-export async function payback(
+export async function recoup(
ws: InternalWalletState,
coinPub: string,
): Promise<void> {
diff --git a/src/wallet.ts b/src/wallet.ts
index 12bc2ccb..23ac8490 100644
--- a/src/wallet.ts
+++ b/src/wallet.ts
@@ -95,7 +95,7 @@ import { getHistory } from "./operations/history";
import { getPendingOperations } from "./operations/pending";
import { getBalances } from "./operations/balance";
import { acceptTip, getTipStatus, processTip } from "./operations/tip";
-import { payback } from "./operations/payback";
+import { recoup } from "./operations/recoup";
import { TimerGroup } from "./util/timer";
import { AsyncCondition } from "./util/promiseUtils";
import { AsyncOpMemoSingle } from "./util/asyncMemo";
@@ -577,10 +577,6 @@ export class Wallet {
return await this.db.iter(Stores.coins).toArray();
}
- async payback(coinPub: string): Promise<void> {
- return payback(this.ws, coinPub);
- }
-
async getPaybackReserves(): Promise<ReserveRecord[]> {
return await this.db.iter(Stores.reserves).filter(r => r.hasPayback);
}
diff --git a/src/webex/messages.ts b/src/webex/messages.ts
index 579dd434..132c8c58 100644
--- a/src/webex/messages.ts
+++ b/src/webex/messages.ts
@@ -118,10 +118,6 @@ export interface MessageMap {
request: { exchangeBaseUrl: string };
response: dbTypes.DenominationRecord[];
};
- "payback-coin": {
- request: { coinPub: string };
- response: void;
- };
"check-upgrade": {
request: {};
response: UpgradeResponse;
diff --git a/src/webex/wxApi.ts b/src/webex/wxApi.ts
index bb5222a2..7464b1f7 100644
--- a/src/webex/wxApi.ts
+++ b/src/webex/wxApi.ts
@@ -193,13 +193,6 @@ export function refresh(coinPub: string): Promise<void> {
}
-/**
- * Request payback for a coin. Only works for non-refreshed coins.
- */
-export function payback(coinPub: string): Promise<void> {
- return callBackend("payback-coin", { coinPub });
-}
-
/**
* Pay for a proposal.
*/
diff --git a/src/webex/wxBackend.ts b/src/webex/wxBackend.ts
index 053b8296..faf917f8 100644
--- a/src/webex/wxBackend.ts
+++ b/src/webex/wxBackend.ts
@@ -24,9 +24,18 @@
* Imports.
*/
import { BrowserCryptoWorkerFactory } from "../crypto/workers/cryptoApi";
-import { deleteTalerDatabase, openTalerDatabase, WALLET_DB_VERSION } from
"../db";
-import { ConfirmReserveRequest, CreateReserveRequest, ReturnCoinsRequest,
WalletDiagnostics, codecForCreateReserveRequest, codecForConfirmReserveRequest
} from "../types/walletTypes";
-import { AmountJson, codecForAmountJson } from "../util/amounts";
+import {
+ deleteTalerDatabase,
+ openTalerDatabase,
+ WALLET_DB_VERSION,
+} from "../db";
+import {
+ ReturnCoinsRequest,
+ WalletDiagnostics,
+ codecForCreateReserveRequest,
+ codecForConfirmReserveRequest,
+} from "../types/walletTypes";
+import { codecForAmountJson } from "../util/amounts";
import { BrowserHttpLib } from "../util/http";
import { OpenedPromise, openPromise } from "../util/promiseUtils";
import { classifyTalerUri, TalerUriType } from "../util/taleruri";
@@ -67,7 +76,7 @@ async function handleMessage(
}
case "dump-db": {
const db = needsWallet().db;
- return db.exportDatabase()
+ return db.exportDatabase();
}
case "import-db": {
const db = needsWallet().db;
@@ -166,12 +175,6 @@ async function handleMessage(
}
return needsWallet().refresh(detail.coinPub);
}
- case "payback-coin": {
- if (typeof detail.coinPub !== "string") {
- return Promise.reject(Error("coinPub missing"));
- }
- return needsWallet().payback(detail.coinPub);
- }
case "get-sender-wire-infos": {
return needsWallet().getSenderWireInfos();
}
@@ -399,10 +402,7 @@ async function reinitWallet() {
setBadgeText({ text: "" });
const badge = new ChromeBadge();
try {
- currentDatabase = await openTalerDatabase(
- indexedDB,
- reinitWallet,
- );
+ currentDatabase = await openTalerDatabase(indexedDB, reinitWallet);
} catch (e) {
console.error("could not open database", e);
walletInit.reject(e);
diff --git a/tsconfig.json b/tsconfig.json
index ec15f8dd..a6cd7b26 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -51,8 +51,8 @@
"src/operations/exchanges.ts",
"src/operations/history.ts",
"src/operations/pay.ts",
- "src/operations/payback.ts",
"src/operations/pending.ts",
+ "src/operations/recoup.ts",
"src/operations/refresh.ts",
"src/operations/refund.ts",
"src/operations/reserves.ts",
--
To stop receiving notification emails like this one, please contact
address@hidden.