d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-06-09 15:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

orders: add Filter() method to GetOrdersRequest and force FilteredOrders return type on wrapper functions (#1055)

Browse Source 
* orders: filter options return on validate

* exchanges: force filter usage by wrapper return type and shift method functionality

* exchanges: update tests and fix err shadow

* exchanges: shadowland

* exchanges: more shadow land spookyness

* glorious: nits and ftx upgrade

* linter: fix

* orders: preserve unpopulated fields through filtering operation

* glorious: nits

Co-authored-by: Ryan O'Hara-Reid <ryan.oharareid@thrasher.io>
This commit is contained in:
Ryan O'Hara-Reid
2022-10-24 13:28:32 +11:00
committed by GitHub
parent 4e135c9590
commit 558a70e87f
65 changed files with 705 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
exchanges/yobit/yobit_test.go
View File

@@ -334,10 +334,10 @@ func TestFormatWithdrawPermissions(t *testing.T) {
func TestGetActiveOrders(t *testing.T) {
var getOrdersRequest = order.GetOrdersRequest{
Type: order.AnyType,
Pairs: []currency.Pair{currency.NewPair(currency.LTC,
currency.BTC)},
Type: order.AnyType,
Pairs: []currency.Pair{currency.NewPair(currency.LTC, currency.BTC)},
AssetType: asset.Spot,
Side: order.AnySide,
}
_, err := y.GetActiveOrders(context.Background(), &getOrdersRequest)
@@ -352,10 +352,10 @@ func TestGetOrderHistory(t *testing.T) {
var getOrdersRequest = order.GetOrdersRequest{
Type: order.AnyType,
AssetType: asset.Spot,
Pairs: []currency.Pair{currency.NewPair(currency.LTC,
currency.BTC)},
Pairs: []currency.Pair{currency.NewPair(currency.LTC, currency.BTC)},
StartTime: time.Unix(0, 0),
EndTime: time.Unix(math.MaxInt64, 0),
Side: order.AnySide,
}
_, err := y.GetOrderHistory(context.Background(), &getOrdersRequest)

33
exchanges/yobit/yobit_wrapper.go
View File

@@ -571,18 +571,18 @@ func (y *Yobit) GetFeeByType(ctx context.Context, feeBuilder *exchange.FeeBuilde
}
// GetActiveOrders retrieves any orders that are active/open
func (y *Yobit) GetActiveOrders(ctx context.Context, req *order.GetOrdersRequest) ([]order.Detail, error) {
if err := req.Validate(); err != nil {
func (y *Yobit) GetActiveOrders(ctx context.Context, req *order.GetOrdersRequest) (order.FilteredOrders, error) {
err := req.Validate()
if err != nil {
return nil, err
}
var orders []order.Detail
format, err := y.GetPairFormat(asset.Spot, false)
if err != nil {
return nil, err
}
var orders []order.Detail
for x := range req.Pairs {
var fCurr currency.Pair
fCurr, err = y.FormatExchangeCurrency(req.Pairs[x], asset.Spot)
@@ -617,36 +617,33 @@ func (y *Yobit) GetActiveOrders(ctx context.Context, req *order.GetOrdersRequest
})
}
}
err = order.FilterOrdersByTimeRange(&orders, req.StartTime, req.EndTime)
if err != nil {
log.Errorf(log.ExchangeSys, "%s %v", y.Name, err)
}
order.FilterOrdersBySide(&orders, req.Side)
return orders, nil
return req.Filter(y.Name, orders), nil
}
// GetOrderHistory retrieves account order information
// Can Limit response to specific order status
func (y *Yobit) GetOrderHistory(ctx context.Context, req *order.GetOrdersRequest) ([]order.Detail, error) {
if err := req.Validate(); err != nil {
func (y *Yobit) GetOrderHistory(ctx context.Context, req *order.GetOrdersRequest) (order.FilteredOrders, error) {
err := req.Validate()
if err != nil {
return nil, err
}
var allOrders []TradeHistory
for x := range req.Pairs {
fpair, err := y.FormatExchangeCurrency(req.Pairs[x], asset.Spot)
var fPair currency.Pair
fPair, err = y.FormatExchangeCurrency(req.Pairs[x], asset.Spot)
if err != nil {
return nil, err
}
resp, err := y.GetTradeHistory(ctx,
var resp map[string]TradeHistory
resp, err = y.GetTradeHistory(ctx,
0,
10000,
math.MaxInt64,
req.StartTime.Unix(),
req.EndTime.Unix(),
"DESC",
fpair.String())
fPair.String())
if err != nil {
return nil, err
}
@@ -689,9 +686,7 @@ func (y *Yobit) GetOrderHistory(ctx context.Context, req *order.GetOrdersRequest
detail.InferCostsAndTimes()
orders[i] = detail
}
order.FilterOrdersBySide(&orders, req.Side)
return orders, nil
return req.Filter(y.Name, orders), nil
}
// ValidateCredentials validates current credentials used for wrapper