diff options
Diffstat (limited to 'packages/taler-wallet-cli/src/integrationtests')
6 files changed, 33 insertions, 27 deletions
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-bank-api.ts b/packages/taler-wallet-cli/src/integrationtests/test-bank-api.ts index 8e4109752..8a11b79c6 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-bank-api.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-bank-api.ts @@ -32,6 +32,7 @@ import { BankApi, BankAccessApi, CreditDebitIndicator, + OperationFailedError, } from "@gnu-taler/taler-wallet-core"; /** @@ -106,8 +107,7 @@ export async function runBankApiTest(t: GlobalTestState) { const e = await t.assertThrowsAsync(async () => { await BankApi.registerAccount(bank, "user1", "pw1"); }); - t.assertAxiosError(e); - t.assertTrue(e.response?.status === 409); + t.assertTrue(e.details.httpStatusCode === 409); } let balResp = await BankAccessApi.getAccountBalance(bank, bankUser); diff --git a/packages/taler-wallet-cli/src/integrationtests/test-exchange-timetravel.ts b/packages/taler-wallet-cli/src/integrationtests/test-exchange-timetravel.ts index ed07114eb..e2b81ee6a 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-exchange-timetravel.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-exchange-timetravel.ts @@ -18,11 +18,11 @@ * Imports. */ import { + AbsoluteTime, codecForExchangeKeysJson, DenominationPubKey, Duration, durationFromSpec, - stringifyTimestamp, } from "@gnu-taler/taler-util"; import { NodeHttpLib, @@ -174,27 +174,37 @@ export async function runExchangeTimetravelTest(t: GlobalTestState) { const denomPubs1 = keys1.denoms.map((x) => { return { denomPub: x.denom_pub, - expireDeposit: stringifyTimestamp(x.stamp_expire_deposit), + expireDeposit: AbsoluteTime.stringify( + AbsoluteTime.fromTimestamp(x.stamp_expire_deposit), + ), }; }); const denomPubs2 = keys2.denoms.map((x) => { return { denomPub: x.denom_pub, - expireDeposit: stringifyTimestamp(x.stamp_expire_deposit), + expireDeposit: AbsoluteTime.stringify( + AbsoluteTime.fromTimestamp(x.stamp_expire_deposit), + ), }; }); const dps2 = new Set(denomPubs2.map((x) => x.denomPub)); console.log("=== KEYS RESPONSE 1 ==="); - console.log("list issue date", stringifyTimestamp(keys1.list_issue_date)); + console.log( + "list issue date", + AbsoluteTime.stringify(AbsoluteTime.fromTimestamp(keys1.list_issue_date)), + ); console.log("num denoms", keys1.denoms.length); console.log("denoms", JSON.stringify(denomPubs1, undefined, 2)); console.log("=== KEYS RESPONSE 2 ==="); - console.log("list issue date", stringifyTimestamp(keys2.list_issue_date)); + console.log( + "list issue date", + AbsoluteTime.stringify(AbsoluteTime.fromTimestamp(keys2.list_issue_date)), + ); console.log("num denoms", keys2.denoms.length); console.log("denoms", JSON.stringify(denomPubs2, undefined, 2)); @@ -214,8 +224,8 @@ export async function runExchangeTimetravelTest(t: GlobalTestState) { `denomination with public key ${da.denomPub} is not present in new /keys response`, ); console.log( - `the new /keys response was issued ${stringifyTimestamp( - keys2.list_issue_date, + `the new /keys response was issued ${AbsoluteTime.stringify( + AbsoluteTime.fromTimestamp(keys2.list_issue_date), )}`, ); console.log( diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts index 33aad80d2..8f7d77712 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts @@ -18,9 +18,8 @@ * Imports. */ import { + AbsoluteTime, ContractTerms, - getTimestampNow, - timestampTruncateToSecond, } from "@gnu-taler/taler-util"; import { WalletApiOperation, @@ -277,7 +276,7 @@ export async function runLibeufinBasicTest(t: GlobalTestState) { summary: "Buy me!", amount: "EUR:5", fulfillment_url: "taler://fulfillment-success/thx", - wire_transfer_deadline: timestampTruncateToSecond(getTimestampNow()), + wire_transfer_deadline: AbsoluteTime.toTimestamp(AbsoluteTime.now()), }; await makeTestPayment(t, { wallet, merchant, order }); diff --git a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts index ef926c4af..2bef87b20 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts @@ -25,7 +25,7 @@ import { MerchantApiClient, MerchantService, setupDb, - getPayto + getPayto, } from "../harness/harness.js"; /** diff --git a/packages/taler-wallet-cli/src/integrationtests/test-refund-auto.ts b/packages/taler-wallet-cli/src/integrationtests/test-refund-auto.ts index 230fc942d..574177c8c 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-refund-auto.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-refund-auto.ts @@ -18,7 +18,10 @@ * Imports. */ import { GlobalTestState, MerchantPrivateApi } from "../harness/harness.js"; -import { createSimpleTestkudosEnvironment, withdrawViaBank } from "../harness/helpers.js"; +import { + createSimpleTestkudosEnvironment, + withdrawViaBank, +} from "../harness/helpers.js"; import { durationFromSpec } from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; @@ -28,12 +31,8 @@ import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; export async function runRefundAutoTest(t: GlobalTestState) { // Set up test environment - const { - wallet, - bank, - exchange, - merchant, - } = await createSimpleTestkudosEnvironment(t); + const { wallet, bank, exchange, merchant } = + await createSimpleTestkudosEnvironment(t); // Withdraw digital cash into the wallet. @@ -46,7 +45,7 @@ export async function runRefundAutoTest(t: GlobalTestState) { amount: "TESTKUDOS:5", fulfillment_url: "taler://fulfillment-success/thx", auto_refund: { - d_ms: 3000, + d_us: 3000 * 1000, }, }, refund_delay: durationFromSpec({ minutes: 5 }), diff --git a/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts b/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts index c6442a240..24600384b 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts @@ -24,10 +24,8 @@ import { applyTimeTravel, } from "../harness/helpers.js"; import { + AbsoluteTime, durationFromSpec, - timestampAddDuration, - getTimestampNow, - timestampTruncateToSecond, } from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; @@ -55,9 +53,9 @@ export async function runRefundGoneTest(t: GlobalTestState) { summary: "Buy me!", amount: "TESTKUDOS:5", fulfillment_url: "taler://fulfillment-success/thx", - pay_deadline: timestampTruncateToSecond( - timestampAddDuration( - getTimestampNow(), + pay_deadline: AbsoluteTime.toTimestamp( + AbsoluteTime.addDuration( + AbsoluteTime.now(), durationFromSpec({ minutes: 10, }), |