From 359b9860a615b8421dcbb72b763b20f3cae24083 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 11 May 2023 14:29:55 +0200 Subject: wallet-core: remove legacy operation names --- packages/taler-util/src/wallet-types.ts | 12 +++++----- .../taler-wallet-core/src/operations/pay-peer.ts | 10 ++++---- .../taler-wallet-core/src/operations/testing.ts | 4 ++-- packages/taler-wallet-core/src/wallet-api-types.ts | 8 +++---- packages/taler-wallet-core/src/wallet.ts | 27 ++++------------------ 5 files changed, 21 insertions(+), 40 deletions(-) (limited to 'packages') diff --git a/packages/taler-util/src/wallet-types.ts b/packages/taler-util/src/wallet-types.ts index 40476f4cc..82f62ceb7 100644 --- a/packages/taler-util/src/wallet-types.ts +++ b/packages/taler-util/src/wallet-types.ts @@ -2090,12 +2090,12 @@ export interface CheckPeerPushDebitResponse { amountEffective: AmountString; } -export interface InitiatePeerPushPaymentRequest { +export interface InitiatePeerPushDebitRequest { exchangeBaseUrl?: string; partialContractTerms: PeerContractTerms; } -export interface InitiatePeerPushPaymentResponse { +export interface InitiatePeerPushDebitResponse { exchangeBaseUrl: string; pursePub: string; mergePriv: string; @@ -2104,11 +2104,11 @@ export interface InitiatePeerPushPaymentResponse { transactionId: string; } -export const codecForInitiatePeerPushPaymentRequest = - (): Codec => - buildCodecForObject() +export const codecForInitiatePeerPushDebitRequest = + (): Codec => + buildCodecForObject() .property("partialContractTerms", codecForPeerContractTerms()) - .build("InitiatePeerPushPaymentRequest"); + .build("InitiatePeerPushDebitRequest"); export interface PreparePeerPushCredit { talerUri: string; diff --git a/packages/taler-wallet-core/src/operations/pay-peer.ts b/packages/taler-wallet-core/src/operations/pay-peer.ts index 31e395cab..3b4572900 100644 --- a/packages/taler-wallet-core/src/operations/pay-peer.ts +++ b/packages/taler-wallet-core/src/operations/pay-peer.ts @@ -50,8 +50,8 @@ import { getRandomBytes, InitiatePeerPullCreditRequest, InitiatePeerPullCreditResponse, - InitiatePeerPushPaymentRequest, - InitiatePeerPushPaymentResponse, + InitiatePeerPushDebitRequest, + InitiatePeerPushDebitResponse, j2s, Logger, parsePayPullUri, @@ -653,10 +653,10 @@ export async function processPeerPushDebit( /** * Initiate sending a peer-to-peer push payment. */ -export async function initiatePeerPushPayment( +export async function initiatePeerPushDebit( ws: InternalWalletState, - req: InitiatePeerPushPaymentRequest, -): Promise { + req: InitiatePeerPushDebitRequest, +): Promise { const instructedAmount = Amounts.parseOrThrow( req.partialContractTerms.amount, ); diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts index 8341d2f26..e5794ad93 100644 --- a/packages/taler-wallet-core/src/operations/testing.ts +++ b/packages/taler-wallet-core/src/operations/testing.ts @@ -54,7 +54,7 @@ import { confirmPeerPullDebit, confirmPeerPushCredit, initiatePeerPullPayment, - initiatePeerPushPayment, + initiatePeerPushDebit, preparePeerPullDebit, preparePeerPushCredit, } from "./pay-peer.js"; @@ -532,7 +532,7 @@ export async function runIntegrationTest2( await ws.runUntilDone(); - const peerPushInit = await initiatePeerPushPayment(ws, { + const peerPushInit = await initiatePeerPushDebit(ws, { partialContractTerms: { amount: `${currency}:1`, summary: "Payment Peer Push Test", diff --git a/packages/taler-wallet-core/src/wallet-api-types.ts b/packages/taler-wallet-core/src/wallet-api-types.ts index d8424494b..850098daa 100644 --- a/packages/taler-wallet-core/src/wallet-api-types.ts +++ b/packages/taler-wallet-core/src/wallet-api-types.ts @@ -67,8 +67,8 @@ import { InitResponse, InitiatePeerPullCreditRequest, InitiatePeerPullCreditResponse, - InitiatePeerPushPaymentRequest, - InitiatePeerPushPaymentResponse, + InitiatePeerPushDebitRequest, + InitiatePeerPushDebitResponse, IntegrationTestArgs, KnownBankAccounts, ListKnownBankAccountsRequest, @@ -671,8 +671,8 @@ export type CheckPeerPushDebitOp = { */ export type InitiatePeerPushDebitOp = { op: WalletApiOperation.InitiatePeerPushDebit; - request: InitiatePeerPushPaymentRequest; - response: InitiatePeerPushPaymentResponse; + request: InitiatePeerPushDebitRequest; + response: InitiatePeerPushDebitResponse; }; /** diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts index 01df4a5e1..6009ff096 100644 --- a/packages/taler-wallet-core/src/wallet.ts +++ b/packages/taler-wallet-core/src/wallet.ts @@ -80,7 +80,7 @@ import { codecForGetWithdrawalDetailsForUri, codecForImportDbRequest, codecForInitiatePeerPullPaymentRequest, - codecForInitiatePeerPushPaymentRequest, + codecForInitiatePeerPushDebitRequest, codecForIntegrationTestArgs, codecForIntegrationTestV2Args, codecForListKnownBankAccounts, @@ -202,7 +202,7 @@ import { confirmPeerPullDebit, confirmPeerPushCredit, initiatePeerPullPayment, - initiatePeerPushPayment, + initiatePeerPushDebit, preparePeerPullDebit, preparePeerPushCredit, processPeerPullCredit, @@ -1443,8 +1443,8 @@ async function dispatchRequestInternal( return await checkPeerPushDebit(ws, req); } case WalletApiOperation.InitiatePeerPushDebit: { - const req = codecForInitiatePeerPushPaymentRequest().decode(payload); - return await initiatePeerPushPayment(ws, req); + const req = codecForInitiatePeerPushDebitRequest().decode(payload); + return await initiatePeerPushDebit(ws, req); } case WalletApiOperation.PreparePeerPushCredit: { const req = codecForPreparePeerPushCreditRequest().decode(payload); @@ -1502,23 +1502,6 @@ export function getVersion(ws: InternalWalletState): WalletCoreVersion { return version; } -function translateLegacyOperationNames(operation: string): string { - switch (operation) { - case "initiatePeerPullPayment": - return WalletApiOperation.InitiatePeerPullCredit.toString(); - case "initiatePeerPushPayment": - return WalletApiOperation.InitiatePeerPushDebit.toString(); - case "checkPeerPullPayment": - return WalletApiOperation.PreparePeerPullDebit.toString(); - case "acceptPeerPullPayment": - return WalletApiOperation.ConfirmPeerPullDebit.toString(); - case "checkPeerPushPayment": - return WalletApiOperation.PreparePeerPushCredit.toString(); - case "acceptPeerPushPayment": - return WalletApiOperation.ConfirmPeerPushCredit.toString(); - } - return operation; -} /** * Handle a request to the wallet-core API. @@ -1529,8 +1512,6 @@ export async function handleCoreApiRequest( id: string, payload: unknown, ): Promise { - operation = translateLegacyOperationNames(operation); - try { const result = await dispatchRequestInternal(ws, operation as any, payload); return { -- cgit v1.2.3