-deep rename

packages/taler-util/src/wallet-types.ts

@@ -2030,7 +2030,7 @@ export interface PayCoinSelection {
   customerDepositFees: AmountString;
 }
 
-export interface PreparePeerPushPaymentRequest {
+export interface CheckPeerPushDebitRequest {
   /**
    * Preferred exchange to use for the p2p payment.
    */
@@ -2045,13 +2045,13 @@ export interface PreparePeerPushPaymentRequest {
 }
 
 export const codecForPreparePeerPushPaymentRequest =
-  (): Codec<PreparePeerPushPaymentRequest> =>
+  (): Codec<CheckPeerPushDebitRequest> =>
-    buildCodecForObject<PreparePeerPushPaymentRequest>()
+    buildCodecForObject<CheckPeerPushDebitRequest>()
       .property("exchangeBaseUrl", codecOptional(codecForString()))
       .property("amount", codecForAmountString())
-      .build("InitiatePeerPushPaymentRequest");
+      .build("CheckPeerPushDebitRequest");
 
-export interface PreparePeerPushPaymentResponse {
+export interface CheckPeerPushDebitResponse {
   amountRaw: AmountString;
   amountEffective: AmountString;
 }
@@ -2080,7 +2080,7 @@ export interface CheckPeerPushPaymentRequest {
   talerUri: string;
 }
 
-export interface CheckPeerPullPaymentRequest {
+export interface PreparePeerPullDebitRequest {
   talerUri: string;
 }
 
@@ -2090,7 +2090,7 @@ export interface CheckPeerPushPaymentResponse {
   peerPushPaymentIncomingId: string;
 }
 
-export interface CheckPeerPullPaymentResponse {
+export interface PreparePeerPullDebitResponse {
   contractTerms: PeerContractTerms;
   /**
    * @deprecated Redundant field with bad name, will be removed soon.
@@ -2110,12 +2110,12 @@ export const codecForCheckPeerPushPaymentRequest =
       .build("CheckPeerPushPaymentRequest");
 
 export const codecForCheckPeerPullPaymentRequest =
-  (): Codec<CheckPeerPullPaymentRequest> =>
+  (): Codec<PreparePeerPullDebitRequest> =>
-    buildCodecForObject<CheckPeerPullPaymentRequest>()
+    buildCodecForObject<PreparePeerPullDebitRequest>()
       .property("talerUri", codecForString())
-      .build("CheckPeerPullPaymentRequest");
+      .build("PreparePeerPullDebitRequest");
 
-export interface AcceptPeerPushPaymentRequest {
+export interface ConfirmPeerPushCreditRequest {
   /**
    * Transparent identifier of the incoming peer push payment.
    */
@@ -2130,12 +2130,12 @@ export interface AcceptPeerPullPaymentResponse {
 }
 
 export const codecForAcceptPeerPushPaymentRequest =
-  (): Codec<AcceptPeerPushPaymentRequest> =>
+  (): Codec<ConfirmPeerPushCreditRequest> =>
-    buildCodecForObject<AcceptPeerPushPaymentRequest>()
+    buildCodecForObject<ConfirmPeerPushCreditRequest>()
       .property("peerPushPaymentIncomingId", codecForString())
-      .build("AcceptPeerPushPaymentRequest");
+      .build("ConfirmPeerPushCreditRequest");
 
-export interface AcceptPeerPullPaymentRequest {
+export interface ConfirmPeerPullDebitRequest {
   /**
    * Transparent identifier of the incoming peer pull payment.
    */
@@ -2162,40 +2162,40 @@ export const codecForApplyDevExperiment =
       .build("ApplyDevExperimentRequest");
 
 export const codecForAcceptPeerPullPaymentRequest =
-  (): Codec<AcceptPeerPullPaymentRequest> =>
+  (): Codec<ConfirmPeerPullDebitRequest> =>
-    buildCodecForObject<AcceptPeerPullPaymentRequest>()
+    buildCodecForObject<ConfirmPeerPullDebitRequest>()
       .property("peerPullPaymentIncomingId", codecForString())
-      .build("AcceptPeerPllPaymentRequest");
+      .build("ConfirmPeerPullDebitRequest");
 
-export interface PreparePeerPullPaymentRequest {
+export interface CheckPeerPullCreditRequest {
   exchangeBaseUrl?: string;
   amount: AmountString;
 }
 export const codecForPreparePeerPullPaymentRequest =
-  (): Codec<PreparePeerPullPaymentRequest> =>
+  (): Codec<CheckPeerPullCreditRequest> =>
-    buildCodecForObject<PreparePeerPullPaymentRequest>()
+    buildCodecForObject<CheckPeerPullCreditRequest>()
       .property("amount", codecForAmountString())
       .property("exchangeBaseUrl", codecOptional(codecForString()))
-      .build("PreparePeerPullPaymentRequest");
+      .build("CheckPeerPullCreditRequest");
 
-export interface PreparePeerPullPaymentResponse {
+export interface CheckPeerPullCreditResponse {
   exchangeBaseUrl: string;
   amountRaw: AmountString;
   amountEffective: AmountString;
 }
-export interface InitiatePeerPullPaymentRequest {
+export interface InitiatePeerPullCreditRequest {
   exchangeBaseUrl?: string;
   partialContractTerms: PeerContractTerms;
 }
 
 export const codecForInitiatePeerPullPaymentRequest =
-  (): Codec<InitiatePeerPullPaymentRequest> =>
+  (): Codec<InitiatePeerPullCreditRequest> =>
-    buildCodecForObject<InitiatePeerPullPaymentRequest>()
+    buildCodecForObject<InitiatePeerPullCreditRequest>()
       .property("partialContractTerms", codecForPeerContractTerms())
       .property("exchangeBaseUrl", codecOptional(codecForString()))
-      .build("InitiatePeerPullPaymentRequest");
+      .build("InitiatePeerPullCreditRequest");
 
-export interface InitiatePeerPullPaymentResponse {
+export interface InitiatePeerPullCreditResponse {
   /**
    * Taler URI for the other party to make the payment
    * that was requested.

packages/taler-wallet-core/src/operations/pay-peer.ts

@@ -19,17 +19,17 @@
  */
 import {
   AbsoluteTime,
-  AcceptPeerPullPaymentRequest,
+  ConfirmPeerPullDebitRequest,
   AcceptPeerPullPaymentResponse,
-  AcceptPeerPushPaymentRequest,
+  ConfirmPeerPushCreditRequest,
   AcceptPeerPushPaymentResponse,
   AgeCommitmentProof,
   AmountJson,
   Amounts,
   AmountString,
   buildCodecForObject,
-  CheckPeerPullPaymentRequest,
+  PreparePeerPullDebitRequest,
-  CheckPeerPullPaymentResponse,
+  PreparePeerPullDebitResponse,
   CheckPeerPushPaymentRequest,
   CheckPeerPushPaymentResponse,
   Codec,
@@ -48,8 +48,8 @@ import {
   ExchangePurseMergeRequest,
   ExchangeReservePurseRequest,
   getRandomBytes,
-  InitiatePeerPullPaymentRequest,
+  InitiatePeerPullCreditRequest,
-  InitiatePeerPullPaymentResponse,
+  InitiatePeerPullCreditResponse,
   InitiatePeerPushPaymentRequest,
   InitiatePeerPushPaymentResponse,
   j2s,
@@ -58,10 +58,10 @@ import {
   parsePayPushUri,
   PayPeerInsufficientBalanceDetails,
   PeerContractTerms,
-  PreparePeerPullPaymentRequest,
+  CheckPeerPullCreditRequest,
-  PreparePeerPullPaymentResponse,
+  CheckPeerPullCreditResponse,
-  PreparePeerPushPaymentRequest,
+  CheckPeerPushDebitRequest,
-  PreparePeerPushPaymentResponse,
+  CheckPeerPushDebitResponse,
   RefreshReason,
   strcmp,
   TalerErrorCode,
@@ -389,8 +389,8 @@ export async function getTotalPeerPaymentCost(
 
 export async function preparePeerPushPayment(
   ws: InternalWalletState,
-  req: PreparePeerPushPaymentRequest,
+  req: CheckPeerPushDebitRequest,
-): Promise<PreparePeerPushPaymentResponse> {
+): Promise<CheckPeerPushDebitResponse> {
   const instructedAmount = Amounts.parseOrThrow(req.amount);
   const coinSelRes = await selectPeerCoins(ws, instructedAmount);
   if (coinSelRes.type === "failure") {
@@ -900,7 +900,7 @@ export async function processPeerPushCredit(
 
 export async function acceptPeerPushPayment(
   ws: InternalWalletState,
-  req: AcceptPeerPushPaymentRequest,
+  req: ConfirmPeerPushCreditRequest,
 ): Promise<AcceptPeerPushPaymentResponse> {
   let peerInc: PeerPushPaymentIncomingRecord | undefined;
   let contractTerms: PeerContractTerms | undefined;
@@ -1019,7 +1019,7 @@ export async function processPeerPullDebit(
 
 export async function acceptIncomingPeerPullPayment(
   ws: InternalWalletState,
-  req: AcceptPeerPullPaymentRequest,
+  req: ConfirmPeerPullDebitRequest,
 ): Promise<AcceptPeerPullPaymentResponse> {
   const peerPullInc = await ws.db
     .mktx((x) => [x.peerPullPaymentIncoming])
@@ -1115,8 +1115,8 @@ export async function acceptIncomingPeerPullPayment(
  */
 export async function preparePeerPullCredit(
   ws: InternalWalletState,
-  req: CheckPeerPullPaymentRequest,
+  req: PreparePeerPullDebitRequest,
-): Promise<CheckPeerPullPaymentResponse> {
+): Promise<PreparePeerPullDebitResponse> {
   const uri = parsePayPullUri(req.talerUri);
 
   if (!uri) {
@@ -1389,8 +1389,8 @@ async function getPreferredExchangeForCurrency(
  */
 export async function checkPeerPullPaymentInitiation(
   ws: InternalWalletState,
-  req: PreparePeerPullPaymentRequest,
+  req: CheckPeerPullCreditRequest,
-): Promise<PreparePeerPullPaymentResponse> {
+): Promise<CheckPeerPullCreditResponse> {
   // FIXME: We don't support exchanges with purse fees yet.
   // Select an exchange where we have money in the specified currency
   // FIXME: How do we handle regional currency scopes here? Is it an additional input?
@@ -1419,8 +1419,8 @@ export async function checkPeerPullPaymentInitiation(
  */
 export async function initiatePeerPullPayment(
   ws: InternalWalletState,
-  req: InitiatePeerPullPaymentRequest,
+  req: InitiatePeerPullCreditRequest,
-): Promise<InitiatePeerPullPaymentResponse> {
+): Promise<InitiatePeerPullCreditResponse> {
   const currency = Amounts.currencyOf(req.partialContractTerms.amount);
   let maybeExchangeBaseUrl: string | undefined;
   if (req.exchangeBaseUrl) {

packages/taler-wallet-core/src/wallet-api-types.ts

@@ -29,8 +29,8 @@ import {
   AcceptExchangeTosRequest,
   AcceptManualWithdrawalRequest,
   AcceptManualWithdrawalResult,
-  AcceptPeerPullPaymentRequest as ConfirmPeerPullDebitRequest,
+  ConfirmPeerPullDebitRequest,
-  AcceptPeerPushPaymentRequest as ConfirmPeerPushCreditRequest,
+  ConfirmPeerPushCreditRequest,
   AcceptTipRequest,
   AcceptTipResponse,
   AcceptWithdrawalResponse,
@@ -42,8 +42,8 @@ import {
   ApplyRefundResponse,
   BackupRecovery,
   BalancesResponse,
-  CheckPeerPullPaymentRequest as PreparePeerPullDebitRequest,
+  PreparePeerPullDebitRequest,
-  CheckPeerPullPaymentResponse as PreparePeerPullDebitResponse,
+  PreparePeerPullDebitResponse,
   CheckPeerPushPaymentRequest,
   CheckPeerPushPaymentResponse,
   CoinDumpJson,
@@ -64,8 +64,8 @@ import {
   GetFeeForDepositRequest,
   GetWithdrawalDetailsForAmountRequest,
   GetWithdrawalDetailsForUriRequest,
-  InitiatePeerPullPaymentRequest as InitiatePeerPullCreditRequest,
+  InitiatePeerPullCreditRequest,
-  InitiatePeerPullPaymentResponse as InitiatePeerPullCreditResponse,
+  InitiatePeerPullCreditResponse,
   InitiatePeerPushPaymentRequest,
   InitiatePeerPushPaymentResponse,
   InitRequest,
@@ -79,10 +79,10 @@ import {
   PreparePayRequest,
   PreparePayResult,
   PreparePayTemplateRequest,
-  PreparePeerPullPaymentRequest as CheckPeerPullCreditRequest,
+  CheckPeerPullCreditRequest,
-  PreparePeerPullPaymentResponse as CheckPeerPullCreditResponse,
+  CheckPeerPullCreditResponse,
-  PreparePeerPushPaymentRequest as CheckPeerPushDebitRequest,
+  CheckPeerPushDebitRequest,
-  PreparePeerPushPaymentResponse as CheckPeerPushDebitResponse,
+  CheckPeerPushDebitResponse,
   PrepareRefundRequest,
   PrepareRefundResult,
   PrepareTipRequest,