Skip to content

Commit d537206

Browse files
authored
fix: alias missing in streamorders (#1725) (#1962)
1 parent 74a59dc commit d537206

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Diff for: lib/grpc/GrpcService.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -880,10 +880,10 @@ class GrpcService {
880880

881881
const cancelled$ = getCancelled$(call);
882882

883-
this.service.subscribeOrders(call.request.toObject(), (order?: Order, orderRemoval?: OrderPortion) => {
883+
this.service.subscribeOrders(call.request.toObject(), (order?: ServiceOrder, orderRemoval?: OrderPortion) => {
884884
const orderUpdate = new xudrpc.OrderUpdate();
885885
if (order) {
886-
orderUpdate.setOrder(createOrder(order));
886+
orderUpdate.setOrder(createServiceOrder(order));
887887
} else if (orderRemoval) {
888888
const grpcOrderRemoval = new xudrpc.OrderRemoval();
889889
grpcOrderRemoval.setPairId(orderRemoval.pairId);

Diff for: lib/service/Service.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -699,17 +699,17 @@ class Service extends EventEmitter {
699699
*/
700700
public subscribeOrders = (
701701
args: { existing: boolean },
702-
callback: (order?: Order, orderRemoval?: OrderPortion) => void,
702+
callback: (order?: ServiceOrder, orderRemoval?: OrderPortion) => void,
703703
cancelled$: Observable<void>,
704704
) => {
705705
if (args.existing) {
706706
this.orderBook.pairIds.forEach((pair) => {
707707
const ownOrders = this.orderBook.getOwnOrders(pair);
708708
const peerOrders = this.orderBook.getPeersOrders(pair);
709-
ownOrders.buyArray.forEach(order => callback(order));
710-
peerOrders.buyArray.forEach(order => callback(order));
711-
ownOrders.sellArray.forEach(order => callback(order));
712-
peerOrders.sellArray.forEach(order => callback(order));
709+
ownOrders.buyArray.forEach(order => callback(this.toServiceOrder(order, false)));
710+
peerOrders.buyArray.forEach(order => callback(this.toServiceOrder(order, true)));
711+
ownOrders.sellArray.forEach(order => callback(this.toServiceOrder(order, false)));
712+
peerOrders.sellArray.forEach(order => callback(this.toServiceOrder(order, true)));
713713
});
714714
}
715715

@@ -719,7 +719,7 @@ class Service extends EventEmitter {
719719
).pipe(takeUntil(cancelled$)); // cleanup listeners when cancelled$ emits a value
720720

721721
orderAdded$.subscribe({
722-
next: callback,
722+
next: order => callback(this.toServiceOrder(order, true)),
723723
error: this.logger.error,
724724
});
725725

0 commit comments

Comments
 (0)