From fb2e2f89935240666de66e4b2c11125cb3b2943d Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 7 Apr 2020 13:37:32 +0530 Subject: more lint fixes --- src/types/ReserveStatus.ts | 8 +-- src/types/ReserveTransaction.ts | 129 +++++++++++++++++++++------------------- src/types/dbTypes.ts | 2 +- src/types/history.ts | 1 - src/types/notifications.ts | 9 ++- src/types/pending.ts | 1 - src/types/talerTypes.ts | 30 +++++----- src/types/walletTypes.ts | 20 +++---- 8 files changed, 103 insertions(+), 97 deletions(-) (limited to 'src/types') diff --git a/src/types/ReserveStatus.ts b/src/types/ReserveStatus.ts index 5a3011b37..18601b9a7 100644 --- a/src/types/ReserveStatus.ts +++ b/src/types/ReserveStatus.ts @@ -51,7 +51,7 @@ export interface ReserveStatus { } export const codecForReserveStatus = (): Codec => - makeCodecForObject() - .property("balance", codecForString) - .property("history", makeCodecForList(codecForReserveTransaction())) - .build("ReserveStatus"); + makeCodecForObject() + .property("balance", codecForString) + .property("history", makeCodecForList(codecForReserveTransaction())) + .build("ReserveStatus"); diff --git a/src/types/ReserveTransaction.ts b/src/types/ReserveTransaction.ts index acbd502ea..bdd9b0f93 100644 --- a/src/types/ReserveTransaction.ts +++ b/src/types/ReserveTransaction.ts @@ -179,67 +179,72 @@ export type ReserveTransaction = | ReserveClosingTransaction | ReserveRecoupTransaction; -export const codecForReserveWithdrawTransaction = (): Codec => - makeCodecForObject() - .property("amount", codecForString) - .property("h_coin_envelope", codecForString) - .property("h_denom_pub", codecForString) - .property("reserve_sig", codecForString) - .property( - "type", - makeCodecForConstString(ReserveTransactionType.Withdraw), - ) - .property("withdraw_fee", codecForString) - .build("ReserveWithdrawTransaction"); - -export const codecForReserveCreditTransaction = (): Codec => - makeCodecForObject() - .property("amount", codecForString) - .property("sender_account_url", codecForString) - .property("timestamp", codecForTimestamp) - .property("wire_reference", codecForString) - .property("type", makeCodecForConstString(ReserveTransactionType.Credit)) - .build("ReserveCreditTransaction"); - -export const codecForReserveClosingTransaction = (): Codec => - makeCodecForObject() - .property("amount", codecForString) - .property("closing_fee", codecForString) - .property("exchange_pub", codecForString) - .property("exchange_sig", codecForString) - .property("h_wire", codecForString) - .property("timestamp", codecForTimestamp) - .property("type", makeCodecForConstString(ReserveTransactionType.Closing)) - .property("wtid", codecForString) - .build("ReserveClosingTransaction"); - -export const codecForReserveRecoupTransaction = (): Codec => - makeCodecForObject() - .property("amount", codecForString) - .property("coin_pub", codecForString) - .property("exchange_pub", codecForString) - .property("exchange_sig", codecForString) - .property("timestamp", codecForTimestamp) - .property("type", makeCodecForConstString(ReserveTransactionType.Recoup)) - .build("ReserveRecoupTransaction"); +export const codecForReserveWithdrawTransaction = (): Codec< + ReserveWithdrawTransaction +> => + makeCodecForObject() + .property("amount", codecForString) + .property("h_coin_envelope", codecForString) + .property("h_denom_pub", codecForString) + .property("reserve_sig", codecForString) + .property("type", makeCodecForConstString(ReserveTransactionType.Withdraw)) + .property("withdraw_fee", codecForString) + .build("ReserveWithdrawTransaction"); + +export const codecForReserveCreditTransaction = (): Codec< + ReserveCreditTransaction +> => + makeCodecForObject() + .property("amount", codecForString) + .property("sender_account_url", codecForString) + .property("timestamp", codecForTimestamp) + .property("wire_reference", codecForString) + .property("type", makeCodecForConstString(ReserveTransactionType.Credit)) + .build("ReserveCreditTransaction"); + +export const codecForReserveClosingTransaction = (): Codec< + ReserveClosingTransaction +> => + makeCodecForObject() + .property("amount", codecForString) + .property("closing_fee", codecForString) + .property("exchange_pub", codecForString) + .property("exchange_sig", codecForString) + .property("h_wire", codecForString) + .property("timestamp", codecForTimestamp) + .property("type", makeCodecForConstString(ReserveTransactionType.Closing)) + .property("wtid", codecForString) + .build("ReserveClosingTransaction"); + +export const codecForReserveRecoupTransaction = (): Codec< + ReserveRecoupTransaction +> => + makeCodecForObject() + .property("amount", codecForString) + .property("coin_pub", codecForString) + .property("exchange_pub", codecForString) + .property("exchange_sig", codecForString) + .property("timestamp", codecForTimestamp) + .property("type", makeCodecForConstString(ReserveTransactionType.Recoup)) + .build("ReserveRecoupTransaction"); export const codecForReserveTransaction = (): Codec => - makeCodecForUnion() - .discriminateOn("type") - .alternative( - ReserveTransactionType.Withdraw, - codecForReserveWithdrawTransaction(), - ) - .alternative( - ReserveTransactionType.Closing, - codecForReserveClosingTransaction(), - ) - .alternative( - ReserveTransactionType.Recoup, - codecForReserveRecoupTransaction(), - ) - .alternative( - ReserveTransactionType.Credit, - codecForReserveCreditTransaction(), - ) - .build("ReserveTransaction"); + makeCodecForUnion() + .discriminateOn("type") + .alternative( + ReserveTransactionType.Withdraw, + codecForReserveWithdrawTransaction(), + ) + .alternative( + ReserveTransactionType.Closing, + codecForReserveClosingTransaction(), + ) + .alternative( + ReserveTransactionType.Recoup, + codecForReserveRecoupTransaction(), + ) + .alternative( + ReserveTransactionType.Credit, + codecForReserveCreditTransaction(), + ) + .build("ReserveTransaction"); diff --git a/src/types/dbTypes.ts b/src/types/dbTypes.ts index 434993cb5..009b05315 100644 --- a/src/types/dbTypes.ts +++ b/src/types/dbTypes.ts @@ -43,7 +43,6 @@ import { ReserveRecoupTransaction, } from "./ReserveTransaction"; import { Timestamp, Duration, getTimestampNow } from "../util/time"; -import { Wallet } from "../wallet"; export enum ReserveRecordStatus { /** @@ -1524,6 +1523,7 @@ export class WalletImportRecord { /** * The stores and indices for the wallet database. */ +// eslint-disable-next-line @typescript-eslint/no-namespace export namespace Stores { class ExchangesStore extends Store { constructor() { diff --git a/src/types/history.ts b/src/types/history.ts index 8179f6261..a5f4e9d3f 100644 --- a/src/types/history.ts +++ b/src/types/history.ts @@ -22,7 +22,6 @@ * Imports. */ import { RefreshReason } from "./walletTypes"; -import { ReserveTransaction } from "./ReserveTransaction"; import { WithdrawalSource } from "./dbTypes"; import { Timestamp } from "../util/time"; diff --git a/src/types/notifications.ts b/src/types/notifications.ts index 05d3c273a..3cd5be898 100644 --- a/src/types/notifications.ts +++ b/src/types/notifications.ts @@ -1,6 +1,3 @@ -import { OperationError } from "./walletTypes"; -import { WithdrawCoinSource, WithdrawalSource } from "./dbTypes"; - /* This file is part of GNU Taler (C) 2019 GNUnet e.V. @@ -22,6 +19,12 @@ import { WithdrawCoinSource, WithdrawalSource } from "./dbTypes"; * of the wallet. */ +/** + * Imports. + */ +import { OperationError } from "./walletTypes"; +import { WithdrawalSource } from "./dbTypes"; + export const enum NotificationType { CoinWithdrawn = "coin-withdrawn", ProposalAccepted = "proposal-accepted", diff --git a/src/types/pending.ts b/src/types/pending.ts index 5bca8c391..4ff82f55e 100644 --- a/src/types/pending.ts +++ b/src/types/pending.ts @@ -25,7 +25,6 @@ import { OperationError, WalletBalance } from "./walletTypes"; import { WithdrawalSource, RetryInfo, ReserveRecordStatus } from "./dbTypes"; import { Timestamp, Duration } from "../util/time"; import { ReserveType } from "./history"; -import { AmountString } from "./talerTypes"; export const enum PendingOperationType { Bug = "bug", diff --git a/src/types/talerTypes.ts b/src/types/talerTypes.ts index 74157b18b..799c84dc5 100644 --- a/src/types/talerTypes.ts +++ b/src/types/talerTypes.ts @@ -963,22 +963,22 @@ export const codecForWithdrawOperationStatusResponse = (): Codec< .build("WithdrawOperationStatusResponse"); export const codecForTipPickupGetResponse = (): Codec => - makeCodecForObject() - .property("extra", codecForAny) - .property("amount", codecForString) - .property("amount_left", codecForString) - .property("exchange_url", codecForString) - .property("stamp_expire", codecForTimestamp) - .property("stamp_created", codecForTimestamp) - .build("TipPickupGetResponse"); + makeCodecForObject() + .property("extra", codecForAny) + .property("amount", codecForString) + .property("amount_left", codecForString) + .property("exchange_url", codecForString) + .property("stamp_expire", codecForTimestamp) + .property("stamp_created", codecForTimestamp) + .build("TipPickupGetResponse"); export const codecForRecoupConfirmation = (): Codec => - makeCodecForObject() - .property("reserve_pub", makeCodecOptional(codecForString)) - .property("old_coin_pub", makeCodecOptional(codecForString)) - .build("RecoupConfirmation"); + makeCodecForObject() + .property("reserve_pub", makeCodecOptional(codecForString)) + .property("old_coin_pub", makeCodecOptional(codecForString)) + .build("RecoupConfirmation"); export const codecForWithdrawResponse = (): Codec => - makeCodecForObject() - .property("ev_sig", codecForString) - .build("WithdrawResponse"); + makeCodecForObject() + .property("ev_sig", codecForString) + .build("WithdrawResponse"); diff --git a/src/types/walletTypes.ts b/src/types/walletTypes.ts index 3d919c6f1..113a137ca 100644 --- a/src/types/walletTypes.ts +++ b/src/types/walletTypes.ts @@ -260,13 +260,13 @@ export interface CreateReserveRequest { } export const codecForCreateReserveRequest = (): Codec => - makeCodecForObject() - .property("amount", codecForAmountJson()) - .property("exchange", codecForString) - .property("exchangeWire", codecForString) - .property("senderWire", makeCodecOptional(codecForString)) - .property("bankWithdrawStatusUrl", makeCodecOptional(codecForString)) - .build("CreateReserveRequest"); + makeCodecForObject() + .property("amount", codecForAmountJson()) + .property("exchange", codecForString) + .property("exchangeWire", codecForString) + .property("senderWire", makeCodecOptional(codecForString)) + .property("bankWithdrawStatusUrl", makeCodecOptional(codecForString)) + .build("CreateReserveRequest"); /** * Request to mark a reserve as confirmed. @@ -280,9 +280,9 @@ export interface ConfirmReserveRequest { } export const codecForConfirmReserveRequest = (): Codec => - makeCodecForObject() - .property("reservePub", codecForString) - .build("ConfirmReserveRequest"); + makeCodecForObject() + .property("reservePub", codecForString) + .build("ConfirmReserveRequest"); /** * Wire coins to the user's own bank account. -- cgit v1.2.3