diff options
author | Florian Dold <florian.dold@gmail.com> | 2020-04-02 20:33:01 +0530 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2020-04-02 20:33:01 +0530 |
commit | ef0acf06bfb7820a21c4719dba0d659f600be3c7 (patch) | |
tree | 216d34722240f682e5ee58632947fa75e9b4fcee /src/headless/integrationtest.ts | |
parent | 1728e5011e16f226c6e3675aa196872af39f6c4e (diff) | |
download | wallet-core-ef0acf06bfb7820a21c4719dba0d659f600be3c7.tar.xz |
model reserve history in the exchange, improve reserve handling logic
Diffstat (limited to 'src/headless/integrationtest.ts')
-rw-r--r-- | src/headless/integrationtest.ts | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/headless/integrationtest.ts b/src/headless/integrationtest.ts index 191e48ff6..6e45b76e2 100644 --- a/src/headless/integrationtest.ts +++ b/src/headless/integrationtest.ts @@ -22,9 +22,9 @@ import { getDefaultNodeWallet, withdrawTestBalance } from "./helpers"; import { MerchantBackendConnection } from "./merchant"; import { Logger } from "../util/logging"; import { NodeHttpLib } from "./NodeHttpLib"; -import * as Amounts from "../util/amounts"; import { Wallet } from "../wallet"; import { Configuration } from "../util/talerconfig"; +import { Amounts, AmountJson } from "../util/amounts"; const logger = new Logger("integrationtest.ts"); @@ -127,31 +127,31 @@ export async function runIntegrationTest(args: IntegrationTestArgs) { await myWallet.runUntilDone(); console.log("withdrawing test balance for refund"); - const withdrawAmountTwo: Amounts.AmountJson = { + const withdrawAmountTwo: AmountJson = { currency, value: 18, fraction: 0, }; - const spendAmountTwo: Amounts.AmountJson = { + const spendAmountTwo: AmountJson = { currency, value: 7, fraction: 0, }; - const refundAmount: Amounts.AmountJson = { + const refundAmount: AmountJson = { currency, value: 6, fraction: 0, }; - const spendAmountThree: Amounts.AmountJson = { + const spendAmountThree: AmountJson = { currency, value: 3, fraction: 0, }; await withdrawTestBalance( myWallet, - Amounts.toString(withdrawAmountTwo), + Amounts.stringify(withdrawAmountTwo), args.bankBaseUrl, args.exchangeBaseUrl, ); @@ -162,14 +162,14 @@ export async function runIntegrationTest(args: IntegrationTestArgs) { let { orderId: refundOrderId } = await makePayment( myWallet, myMerchant, - Amounts.toString(spendAmountTwo), + Amounts.stringify(spendAmountTwo), "order that will be refunded", ); const refundUri = await myMerchant.refund( refundOrderId, "test refund", - Amounts.toString(refundAmount), + Amounts.stringify(refundAmount), ); console.log("refund URI", refundUri); @@ -182,7 +182,7 @@ export async function runIntegrationTest(args: IntegrationTestArgs) { await makePayment( myWallet, myMerchant, - Amounts.toString(spendAmountThree), + Amounts.stringify(spendAmountThree), "payment after refund", ); @@ -240,7 +240,7 @@ export async function runIntegrationTestBasic(cfg: Configuration) { logger.info("withdrawing test balance"); await withdrawTestBalance( myWallet, - Amounts.toString(parsedWithdrawAmount), + Amounts.stringify(parsedWithdrawAmount), bankBaseUrl, exchangeBaseUrl, ); @@ -258,7 +258,7 @@ export async function runIntegrationTestBasic(cfg: Configuration) { await makePayment( myWallet, myMerchant, - Amounts.toString(parsedSpendAmount), + Amounts.stringify(parsedSpendAmount), "hello world", ); @@ -266,24 +266,24 @@ export async function runIntegrationTestBasic(cfg: Configuration) { await myWallet.runUntilDone(); console.log("withdrawing test balance for refund"); - const withdrawAmountTwo: Amounts.AmountJson = { + const withdrawAmountTwo: AmountJson = { currency, value: 18, fraction: 0, }; - const spendAmountTwo: Amounts.AmountJson = { + const spendAmountTwo: AmountJson = { currency, value: 7, fraction: 0, }; - const refundAmount: Amounts.AmountJson = { + const refundAmount: AmountJson = { currency, value: 6, fraction: 0, }; - const spendAmountThree: Amounts.AmountJson = { + const spendAmountThree: AmountJson = { currency, value: 3, fraction: 0, @@ -291,7 +291,7 @@ export async function runIntegrationTestBasic(cfg: Configuration) { await withdrawTestBalance( myWallet, - Amounts.toString(withdrawAmountTwo), + Amounts.stringify(withdrawAmountTwo), bankBaseUrl, exchangeBaseUrl, ); @@ -302,14 +302,14 @@ export async function runIntegrationTestBasic(cfg: Configuration) { let { orderId: refundOrderId } = await makePayment( myWallet, myMerchant, - Amounts.toString(spendAmountTwo), + Amounts.stringify(spendAmountTwo), "order that will be refunded", ); const refundUri = await myMerchant.refund( refundOrderId, "test refund", - Amounts.toString(refundAmount), + Amounts.stringify(refundAmount), ); console.log("refund URI", refundUri); @@ -322,7 +322,7 @@ export async function runIntegrationTestBasic(cfg: Configuration) { await makePayment( myWallet, myMerchant, - Amounts.toString(spendAmountThree), + Amounts.stringify(spendAmountThree), "payment after refund", ); |