diff options
author | Florian Dold <florian.dold@gmail.com> | 2020-08-12 16:02:58 +0530 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2020-08-12 16:02:58 +0530 |
commit | 8d7b171d02e0ab4d5da7dc81eaea6c27106dbc57 (patch) | |
tree | 1ee7138d008cf8dcf2cd2a9f5a646701932d1ee5 /packages/taler-integrationtests/src | |
parent | 56f5a1e3abe2679b4913ac87ff82860bb9675823 (diff) | |
download | wallet-core-8d7b171d02e0ab4d5da7dc81eaea6c27106dbc57.tar.xz |
rename for consistency
Diffstat (limited to 'packages/taler-integrationtests/src')
-rw-r--r-- | packages/taler-integrationtests/src/harness.ts | 8 | ||||
-rw-r--r-- | packages/taler-integrationtests/src/merchantApiTypes.ts | 45 |
2 files changed, 27 insertions, 26 deletions
diff --git a/packages/taler-integrationtests/src/harness.ts b/packages/taler-integrationtests/src/harness.ts index 84b5bc5c4..ecb0758da 100644 --- a/packages/taler-integrationtests/src/harness.ts +++ b/packages/taler-integrationtests/src/harness.ts @@ -35,7 +35,7 @@ import { AmountJson, Amounts, Codec, - makeCodecForObject, + buildCodecForObject, codecForString, Duration, CoreApiResponse, @@ -627,9 +627,9 @@ export interface WithdrawalOperationInfo { } const codecForWithdrawalOperationInfo = (): Codec<WithdrawalOperationInfo> => - makeCodecForObject<WithdrawalOperationInfo>() - .property("withdrawal_id", codecForString) - .property("taler_withdraw_uri", codecForString) + buildCodecForObject<WithdrawalOperationInfo>() + .property("withdrawal_id", codecForString()) + .property("taler_withdraw_uri", codecForString()) .build("WithdrawalOperationInfo"); export const defaultCoinConfig = [ diff --git a/packages/taler-integrationtests/src/merchantApiTypes.ts b/packages/taler-integrationtests/src/merchantApiTypes.ts index 3c0965813..d08c354a1 100644 --- a/packages/taler-integrationtests/src/merchantApiTypes.ts +++ b/packages/taler-integrationtests/src/merchantApiTypes.ts @@ -28,19 +28,20 @@ import { ContractTerms, Duration, Codec, - makeCodecForObject, + buildCodecForObject, codecForString, - makeCodecOptional, - makeCodecForConstString, + codecOptional, + codecForConstString, codecForBoolean, codecForNumber, codecForContractTerms, codecForAny, - makeCodecForUnion, + buildCodecForUnion, AmountString, Timestamp, CoinPublicKeyString, } from "taler-wallet-core"; +import { codecForAmountString } from "taler-wallet-core/lib/util/amounts"; export interface PostOrderRequest { // The order must at least contain the minimal @@ -72,43 +73,43 @@ export interface PostOrderResponse { } export const codecForPostOrderResponse = (): Codec<PostOrderResponse> => - makeCodecForObject<PostOrderResponse>() - .property("order_id", codecForString) - .property("token", makeCodecOptional(codecForString)) + buildCodecForObject<PostOrderResponse>() + .property("order_id", codecForString()) + .property("token", codecOptional(codecForString())) .build("PostOrderResponse"); export const codecForCheckPaymentPaidResponse = (): Codec< CheckPaymentPaidResponse > => - makeCodecForObject<CheckPaymentPaidResponse>() - .property("order_status", makeCodecForConstString("paid")) + buildCodecForObject<CheckPaymentPaidResponse>() + .property("order_status", codecForConstString("paid")) .property("refunded", codecForBoolean) .property("wired", codecForBoolean) - .property("deposit_total", codecForString) - .property("exchange_ec", codecForNumber) - .property("exchange_hc", codecForNumber) - .property("refund_amount", codecForString) + .property("deposit_total", codecForAmountString()) + .property("exchange_ec", codecForNumber()) + .property("exchange_hc", codecForNumber()) + .property("refund_amount", codecForAmountString()) .property("contract_terms", codecForContractTerms()) // FIXME: specify - .property("wire_details", codecForAny) - .property("wire_reports", codecForAny) - .property("refund_details", codecForAny) + .property("wire_details", codecForAny()) + .property("wire_reports", codecForAny()) + .property("refund_details", codecForAny()) .build("CheckPaymentPaidResponse"); export const codecForCheckPaymentUnpaidResponse = (): Codec< CheckPaymentUnpaidResponse > => - makeCodecForObject<CheckPaymentUnpaidResponse>() - .property("order_status", makeCodecForConstString("unpaid")) - .property("taler_pay_uri", codecForString) - .property("order_status_url", codecForString) - .property("already_paid_order_id", makeCodecOptional(codecForString)) + buildCodecForObject<CheckPaymentUnpaidResponse>() + .property("order_status", codecForConstString("unpaid")) + .property("taler_pay_uri", codecForString()) + .property("order_status_url", codecForString()) + .property("already_paid_order_id", codecOptional(codecForString())) .build("CheckPaymentPaidResponse"); export const codecForMerchantOrderPrivateStatusResponse = (): Codec< MerchantOrderPrivateStatusResponse > => - makeCodecForUnion<MerchantOrderPrivateStatusResponse>() + buildCodecForUnion<MerchantOrderPrivateStatusResponse>() .discriminateOn("order_status") .alternative("paid", codecForCheckPaymentPaidResponse()) .alternative("unpaid", codecForCheckPaymentUnpaidResponse()) |