diff --git a/engine/rpcserver.go b/engine/rpcserver.go index 5e862b55..7008807c 100644 --- a/engine/rpcserver.go +++ b/engine/rpcserver.go @@ -621,7 +621,12 @@ func (s *RPCServer) GetOrders(ctx context.Context, r *gctrpc.GetOrdersRequest) ( return nil, errors.New("exchange is not loaded/doesn't exist") } - resp, err := exch.GetActiveOrders(&order.GetOrdersRequest{}) + resp, err := exch.GetActiveOrders(&order.GetOrdersRequest{ + Currencies: []currency.Pair{ + currency.NewPairWithDelimiter(r.Pair.Base, + r.Pair.Quote, r.Pair.Delimiter), + }, + }) if err != nil { return nil, err } diff --git a/exchanges/order/order_test.go b/exchanges/order/order_test.go index ed019e9d..d2061f5d 100644 --- a/exchanges/order/order_test.go +++ b/exchanges/order/order_test.go @@ -501,9 +501,9 @@ var stringsToOrderStatus = []struct { {"filled", Filled, nil}, {"FILLED", Filled, nil}, {"fIlLeD", Filled, nil}, - {"canceled", Cancelled, nil}, - {"CANCELED", Cancelled, nil}, - {"cAnCelEd", Cancelled, nil}, + {"cancelled", Cancelled, nil}, + {"CANCELlED", Cancelled, nil}, + {"cAnCellEd", Cancelled, nil}, {"pending_cancel", PendingCancel, nil}, {"PENDING_CANCEL", PendingCancel, nil}, {"pENdInG_cAnCeL", PendingCancel, nil}, diff --git a/exchanges/order/order_types.go b/exchanges/order/order_types.go index ef869e02..6df5c9e8 100644 --- a/exchanges/order/order_types.go +++ b/exchanges/order/order_types.go @@ -170,7 +170,7 @@ const ( PartiallyCancelled Status = "PARTIALLY_CANCELLED" PartiallyFilled Status = "PARTIALLY_FILLED" Filled Status = "FILLED" - Cancelled Status = "CANCELED" + Cancelled Status = "CANCELLED" PendingCancel Status = "PENDING_CANCEL" Rejected Status = "REJECTED" Expired Status = "EXPIRED"