From dab739a63e032fcf26674dc1bf56533b00c45b6b Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 1 Nov 2022 11:34:20 +0100 Subject: wallet-core: use PeerContractTerms --- packages/taler-wallet-cli/src/harness/helpers.ts | 4 ++-- packages/taler-wallet-cli/src/harness/merchantApiTypes.ts | 8 ++++---- .../taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'packages/taler-wallet-cli/src') diff --git a/packages/taler-wallet-cli/src/harness/helpers.ts b/packages/taler-wallet-cli/src/harness/helpers.ts index aa970f76b..affaccd61 100644 --- a/packages/taler-wallet-cli/src/harness/helpers.ts +++ b/packages/taler-wallet-cli/src/harness/helpers.ts @@ -26,7 +26,7 @@ import { AmountString, ConfirmPayResultType, - ContractTerms, + MerchantContractTerms, Duration, PreparePayResultType, } from "@gnu-taler/taler-util"; @@ -381,7 +381,7 @@ export async function makeTestPayment( args: { merchant: MerchantServiceInterface; wallet: WalletCli; - order: Partial; + order: Partial; instance?: string; }, auth: WithAuthorization = {}, diff --git a/packages/taler-wallet-cli/src/harness/merchantApiTypes.ts b/packages/taler-wallet-cli/src/harness/merchantApiTypes.ts index 8b10bb749..dc9132b3e 100644 --- a/packages/taler-wallet-cli/src/harness/merchantApiTypes.ts +++ b/packages/taler-wallet-cli/src/harness/merchantApiTypes.ts @@ -25,7 +25,7 @@ * Imports. */ import { - ContractTerms, + MerchantContractTerms, Duration, Codec, buildCodecForObject, @@ -50,7 +50,7 @@ import { export interface PostOrderRequest { // The order must at least contain the minimal // order detail, but can override all - order: Partial; + order: Partial; // if set, the backend will then set the refund deadline to the current // time plus the specified delay. @@ -143,7 +143,7 @@ export interface CheckPaymentClaimedResponse { // Wallet claimed the order, but didn't pay yet. order_status: "claimed"; - contract_terms: ContractTerms; + contract_terms: MerchantContractTerms; } export interface CheckPaymentPaidResponse { @@ -175,7 +175,7 @@ export interface CheckPaymentPaidResponse { refund_amount: AmountString; // Contract terms - contract_terms: ContractTerms; + contract_terms: MerchantContractTerms; // Ihe wire transfer status from the exchange for this order if available, otherwise empty array wire_details: TransactionWireTransfer[]; 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 300967c7a..8002f093f 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts @@ -17,7 +17,7 @@ /** * Imports. */ -import { AbsoluteTime, ContractTerms, Duration } from "@gnu-taler/taler-util"; +import { AbsoluteTime, MerchantContractTerms, Duration } from "@gnu-taler/taler-util"; import { WalletApiOperation, HarnessExchangeBankAccount, @@ -271,7 +271,7 @@ export async function runLibeufinBasicTest(t: GlobalTestState) { console.log("balances", JSON.stringify(bal, undefined, 2)); t.assertAmountEquals(bal.balances[0].available, "EUR:14.7"); - const order: Partial = { + const order: Partial = { summary: "Buy me!", amount: "EUR:5", fulfillment_url: "taler://fulfillment-success/thx", -- cgit v1.2.3