aboutsummaryrefslogtreecommitdiff
path: root/packages/taler-wallet-cli
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2022-11-01 11:34:20 +0100
committerFlorian Dold <florian@dold.me>2022-11-01 11:41:28 +0100
commitdab739a63e032fcf26674dc1bf56533b00c45b6b (patch)
tree06a5bdadc34ebefb324d867a65bc803952870227 /packages/taler-wallet-cli
parent2f6225f6e7cb70f1fd083a5b26143f5c8c2776c5 (diff)
wallet-core: use PeerContractTerms
Diffstat (limited to 'packages/taler-wallet-cli')
-rw-r--r--packages/taler-wallet-cli/src/harness/helpers.ts4
-rw-r--r--packages/taler-wallet-cli/src/harness/merchantApiTypes.ts8
-rw-r--r--packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts4
3 files changed, 8 insertions, 8 deletions
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<ContractTerms>;
+ order: Partial<MerchantContractTerms>;
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<ContractTerms>;
+ order: Partial<MerchantContractTerms>;
// 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<ContractTerms> = {
+ const order: Partial<MerchantContractTerms> = {
summary: "Buy me!",
amount: "EUR:5",
fulfillment_url: "taler://fulfillment-success/thx",