d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-06-08 23:16:54 +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

2
exchanges/coinbasepro/coinbasepro_test.go
View File

@@ -441,6 +441,7 @@ func TestGetActiveOrders(t *testing.T) {
Type: order.AnyType,
AssetType: asset.Spot,
Pairs: []currency.Pair{testPair},
Side: order.AnySide,
}
_, err := c.GetActiveOrders(context.Background(), &getOrdersRequest)
@@ -456,6 +457,7 @@ func TestGetOrderHistory(t *testing.T) {
Type: order.AnyType,
AssetType: asset.Spot,
Pairs: []currency.Pair{testPair},
Side: order.AnySide,
}
_, err := c.GetOrderHistory(context.Background(), &getOrdersRequest)

49
exchanges/coinbasepro/coinbasepro_wrapper.go
View File

@@ -750,20 +750,23 @@ func (c *CoinbasePro) GetFeeByType(ctx context.Context, feeBuilder *exchange.Fee
}
// GetActiveOrders retrieves any orders that are active/open
func (c *CoinbasePro) GetActiveOrders(ctx context.Context, req *order.GetOrdersRequest) ([]order.Detail, error) {
if err := req.Validate(); err != nil {
func (c *CoinbasePro) GetActiveOrders(ctx context.Context, req *order.GetOrdersRequest) (order.FilteredOrders, error) {
err := req.Validate()
if err != nil {
return nil, err
}
var respOrders []GeneralizedOrderResponse
var fPair currency.Pair
for i := range req.Pairs {
fpair, err := c.FormatExchangeCurrency(req.Pairs[i], asset.Spot)
fPair, err = c.FormatExchangeCurrency(req.Pairs[i], asset.Spot)
if err != nil {
return nil, err
}
resp, err := c.GetOrders(ctx,
var resp []GeneralizedOrderResponse
resp, err = c.GetOrders(ctx,
[]string{"open", "pending", "active"},
fpair.String())
fPair.String())
if err != nil {
return nil, err
}
@@ -804,45 +807,36 @@ func (c *CoinbasePro) GetActiveOrders(ctx context.Context, req *order.GetOrdersR
Exchange: c.Name,
}
}
order.FilterOrdersByType(&orders, req.Type)
err = order.FilterOrdersByTimeRange(&orders, req.StartTime, req.EndTime)
if err != nil {
log.Errorf(log.ExchangeSys, "%s %v", c.Name, err)
}
order.FilterOrdersBySide(&orders, req.Side)
return orders, nil
return req.Filter(c.Name, orders), nil
}
// GetOrderHistory retrieves account order information
// Can Limit response to specific order status
func (c *CoinbasePro) GetOrderHistory(ctx context.Context, req *order.GetOrdersRequest) ([]order.Detail, error) {
if err := req.Validate(); err != nil {
func (c *CoinbasePro) GetOrderHistory(ctx context.Context, req *order.GetOrdersRequest) (order.FilteredOrders, error) {
err := req.Validate()
if err != nil {
return nil, err
}
var respOrders []GeneralizedOrderResponse
if len(req.Pairs) > 0 {
var fPair currency.Pair
var resp []GeneralizedOrderResponse
for i := range req.Pairs {
fpair, err := c.FormatExchangeCurrency(req.Pairs[i], asset.Spot)
fPair, err = c.FormatExchangeCurrency(req.Pairs[i], asset.Spot)
if err != nil {
return nil, err
}
resp, err := c.GetOrders(ctx,
[]string{"done"},
fpair.String())
resp, err = c.GetOrders(ctx, []string{"done"}, fPair.String())
if err != nil {
return nil, err
}
respOrders = append(respOrders, resp...)
}
} else {
resp, err := c.GetOrders(ctx,
[]string{"done"},
"")
respOrders, err = c.GetOrders(ctx, []string{"done"}, "")
if err != nil {
return nil, err
}
respOrders = resp
}
format, err := c.GetPairFormat(asset.Spot, false)
@@ -894,14 +888,7 @@ func (c *CoinbasePro) GetOrderHistory(ctx context.Context, req *order.GetOrdersR
detail.InferCostsAndTimes()
orders[i] = detail
}
order.FilterOrdersByType(&orders, req.Type)
err = order.FilterOrdersByTimeRange(&orders, req.StartTime, req.EndTime)
if err != nil {
log.Errorf(log.ExchangeSys, "%s %v", c.Name, err)
}
order.FilterOrdersBySide(&orders, req.Side)
return orders, nil
return req.Filter(c.Name, orders), nil
}
// checkInterval checks allowable interval