Skip to content

Commit fd59ce5

Browse files
committed
fix: align CoinPayment adapter with TrUAPI names
1 parent 85bc516 commit fd59ce5

2 files changed

Lines changed: 34 additions & 36 deletions

File tree

product-sdk/packages/coin-payment/src/client.ts

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,20 @@ function resolveTruApiHost(
7878
function isCoinPaymentService(
7979
candidate: TrUApiCoinPaymentContainer | TrUApiCoinPaymentService,
8080
): candidate is TrUApiCoinPaymentService {
81-
return "coinPaymentCreatePurse" in candidate;
81+
return "createPurse" in candidate;
8282
}
8383

8484
function hasCompleteCoinPaymentService(service: TrUApiCoinPaymentService): boolean {
8585
const methods = [
86-
"coinPaymentCreatePurse",
87-
"coinPaymentQueryPurse",
88-
"coinPaymentRebalancePurse",
89-
"coinPaymentDeletePurse",
90-
"coinPaymentCreateReceivable",
91-
"coinPaymentCreateCheque",
92-
"coinPaymentDeposit",
93-
"coinPaymentRefund",
94-
"coinPaymentListenFor",
86+
"createPurse",
87+
"queryPurse",
88+
"rebalancePurse",
89+
"deletePurse",
90+
"createReceivable",
91+
"createCheque",
92+
"deposit",
93+
"refund",
94+
"listenFor",
9595
] as const;
9696
return methods.every((method) => typeof service[method] === "function");
9797
}
@@ -102,30 +102,28 @@ function createTruApiCoinPaymentAdapter(
102102
): CoinPaymentHostApi {
103103
return {
104104
async createPurse(name) {
105-
return unwrapResult(await service.coinPaymentCreatePurse({ name })).purse;
105+
return unwrapResult(await service.createPurse({ name })).purse;
106106
},
107107
async queryPurse(purse) {
108-
return unwrapResult(await service.coinPaymentQueryPurse({ purse })).info;
108+
return unwrapResult(await service.queryPurse({ purse })).info;
109109
},
110110
async rebalancePurse(from, to, amount) {
111111
return operationFromObservable(
112-
service.coinPaymentRebalancePurse({ request: { from, to, amount } }),
112+
service.rebalancePurse({ request: { from, to, amount } }),
113113
);
114114
},
115115
async deletePurse(target, drainInto) {
116-
return operationFromObservable(
117-
service.coinPaymentDeletePurse({ request: { target, drainInto } }),
118-
);
116+
return operationFromObservable(service.deletePurse({ request: { target, drainInto } }));
119117
},
120118
async createReceivable(into) {
121119
return bytesFromTruApi(
122-
unwrapResult(await service.coinPaymentCreateReceivable({ into })).receivable,
120+
unwrapResult(await service.createReceivable({ into })).receivable,
123121
);
124122
},
125123
async createCheque(from, to, amount) {
126124
return chequeFromTruApi(
127125
unwrapResult(
128-
await service.coinPaymentCreateCheque({
126+
await service.createCheque({
129127
from,
130128
to: bytesToTruApi(to),
131129
amount,
@@ -135,31 +133,31 @@ function createTruApiCoinPaymentAdapter(
135133
},
136134
async deposit(cheque) {
137135
return operationFromObservable(
138-
service.coinPaymentDeposit({ request: { cheque: chequeToTruApi(cheque) } }),
136+
service.deposit({ request: { cheque: chequeToTruApi(cheque) } }),
139137
);
140138
},
141139
async refund(receivable) {
142140
return operationFromObservable(
143-
service.coinPaymentRefund({ request: { receivable: bytesToTruApi(receivable) } }),
141+
service.refund({ request: { receivable: bytesToTruApi(receivable) } }),
144142
);
145143
},
146144
async listenFor(receivable) {
147145
return listenForFromObservable(
148-
service.coinPaymentListenFor({
146+
service.listenFor({
149147
request: { receivable: bytesToTruApi(receivable) },
150148
}),
151149
);
152150
},
153151
async paymentBalance(purse?: PaymentPurse) {
154152
return firstFromObservable(
155-
requirePayment(payment).paymentBalanceSubscribe({
153+
requirePayment(payment).balanceSubscribe({
156154
request: purse === undefined ? {} : { purse },
157155
}),
158156
);
159157
},
160158
async paymentTopUp(into, amount, source) {
161159
unwrapResult(
162-
await requirePayment(payment).paymentTopUp({
160+
await requirePayment(payment).topUp({
163161
...(into === undefined ? {} : { into }),
164162
amount,
165163
source: paymentTopUpSourceToTruApi(source),
@@ -173,7 +171,7 @@ function createTruApiCoinPaymentAdapter(
173171
},
174172
async paymentRequest(from, amount, destination) {
175173
const receipt = unwrapResult(
176-
await requirePayment(payment).paymentRequest({
174+
await requirePayment(payment).request({
177175
...(from === undefined ? {} : { from }),
178176
amount,
179177
destination: bytesToTruApi(destination),

product-sdk/packages/coin-payment/src/generated/truapi-coinpayment.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@ export interface TrUApiObservable<TItem, TError> {
134134
}
135135

136136
export interface TrUApiCoinPaymentService {
137-
coinPaymentCreatePurse(request: { name: string }): Promise<TrUApiResult<{ purse: PurseId }, TrUApiCoinPaymentError>>;
138-
coinPaymentQueryPurse(request: { purse: PurseId }): Promise<TrUApiResult<{ info: PurseInfo }, TrUApiCoinPaymentError>>;
139-
coinPaymentRebalancePurse(input: { request: { from: PurseId; to: PurseId; amount: Balance } }): TrUApiObservable<TrUApiCoinPaymentStatus, TrUApiCoinPaymentError>;
140-
coinPaymentDeletePurse(input: { request: { target: PurseId; drainInto: PurseId } }): TrUApiObservable<TrUApiCoinPaymentStatus, TrUApiCoinPaymentError>;
141-
coinPaymentCreateReceivable(request: { into: PurseId }): Promise<TrUApiResult<{ receivable: TrUApiBytes }, TrUApiCoinPaymentError>>;
142-
coinPaymentCreateCheque(request: { from: PurseId; to: TrUApiBytes; amount: Balance }): Promise<TrUApiResult<{ cheque: TrUApiCheque }, TrUApiCoinPaymentError>>;
143-
coinPaymentDeposit(input: { request: { cheque: TrUApiCheque } }): TrUApiObservable<TrUApiCoinPaymentStatus, TrUApiCoinPaymentError>;
144-
coinPaymentRefund(input: { request: { receivable: TrUApiBytes } }): TrUApiObservable<TrUApiCoinPaymentStatus, TrUApiCoinPaymentError>;
145-
coinPaymentListenFor(input: { request: { receivable: TrUApiBytes } }): TrUApiObservable<TrUApiListenForItem, TrUApiCoinPaymentError>;
137+
createPurse(request: { name: string }): Promise<TrUApiResult<{ purse: PurseId }, TrUApiCoinPaymentError>>;
138+
queryPurse(request: { purse: PurseId }): Promise<TrUApiResult<{ info: PurseInfo }, TrUApiCoinPaymentError>>;
139+
rebalancePurse(input: { request: { from: PurseId; to: PurseId; amount: Balance } }): TrUApiObservable<TrUApiCoinPaymentStatus, TrUApiCoinPaymentError>;
140+
deletePurse(input: { request: { target: PurseId; drainInto: PurseId } }): TrUApiObservable<TrUApiCoinPaymentStatus, TrUApiCoinPaymentError>;
141+
createReceivable(request: { into: PurseId }): Promise<TrUApiResult<{ receivable: TrUApiBytes }, TrUApiCoinPaymentError>>;
142+
createCheque(request: { from: PurseId; to: TrUApiBytes; amount: Balance }): Promise<TrUApiResult<{ cheque: TrUApiCheque }, TrUApiCoinPaymentError>>;
143+
deposit(input: { request: { cheque: TrUApiCheque } }): TrUApiObservable<TrUApiCoinPaymentStatus, TrUApiCoinPaymentError>;
144+
refund(input: { request: { receivable: TrUApiBytes } }): TrUApiObservable<TrUApiCoinPaymentStatus, TrUApiCoinPaymentError>;
145+
listenFor(input: { request: { receivable: TrUApiBytes } }): TrUApiObservable<TrUApiListenForItem, TrUApiCoinPaymentError>;
146146
}
147147

148148
export interface TrUApiCoinPaymentContainer {
@@ -192,9 +192,9 @@ export interface TrUApiPaymentReceipt {
192192
}
193193

194194
export interface TrUApiPaymentService {
195-
paymentBalanceSubscribe(input: { request: { purse?: PurseId } }): TrUApiObservable<PaymentBalance, TrUApiPaymentError>;
196-
paymentTopUp(request: { into?: PurseId; amount: Balance; source: TrUApiPaymentTopUpSource }): Promise<TrUApiResult<undefined, TrUApiPaymentError>>;
197-
paymentRequest(request: { from?: PurseId; amount: Balance; destination: TrUApiBytes }): Promise<TrUApiResult<TrUApiPaymentReceipt, TrUApiPaymentError>>;
195+
balanceSubscribe(input: { request: { purse?: PurseId } }): TrUApiObservable<PaymentBalance, TrUApiPaymentError>;
196+
topUp(request: { into?: PurseId; amount: Balance; source: TrUApiPaymentTopUpSource }): Promise<TrUApiResult<undefined, TrUApiPaymentError>>;
197+
request(request: { from?: PurseId; amount: Balance; destination: TrUApiBytes }): Promise<TrUApiResult<TrUApiPaymentReceipt, TrUApiPaymentError>>;
198198
}
199199

200200
export type TrUApiPaymentTopUpSource =

0 commit comments

Comments
 (0)