lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-25 16:25:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

types: add and use OrderError

Browse Source
This commit is contained in:
c9s 2022-01-11 18:00:07 +08:00
parent 857db529af
commit b302adcc7e
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/exchange/binance/exchange.go
View File

@ -545,15 +545,15 @@ func (e *Exchange) CancelOrders(ctx context.Context, orders ...types.Order) (err
if o.OrderID > 0 {
req.OrderID(int64(o.OrderID))
} else {
err = multierr.Append(err, fmt.Errorf(
"can not cancel %s order, order does not contain orderID or clientOrderID. %#v",
o.Symbol, o))
err = multierr.Append(err, types.NewOrderError(
fmt.Errorf("can not cancel %s order, order does not contain orderID or clientOrderID", o.Symbol),
o))
continue
}
_, err2 := req.Do(ctx)
if err2 != nil {
err = multierr.Append(err, err2)
err = multierr.Append(err, types.NewOrderError(err2, o))
}
}
@ -571,20 +571,15 @@ func (e *Exchange) CancelOrders(ctx context.Context, orders ...types.Order) (err
} else if len(o.ClientOrderID) > 0 {
req.OrigClientOrderID(o.ClientOrderID)
} else {
err = multierr.Append(err, fmt.Errorf(
"can not cancel %s order, order does not contain orderID or clientOrderID. %#v",
o.Symbol, o))
err = multierr.Append(err, types.NewOrderError(
fmt.Errorf("can not cancel %s order, order does not contain orderID or clientOrderID", o.Symbol),
o))
continue
}
_, err2 := req.Do(ctx)
if err2 != nil {
err = multierr.Append(err, errors.Wrapf(
err2, "can not cancel %s order. orderID: %d clientOrderID: %s order: %#v",
o.Symbol,
o.OrderID,
o.ClientOrderID,
o))
err = multierr.Append(err, types.NewOrderError(err2, o))
}
} else {
// SPOT
@ -596,20 +591,15 @@ func (e *Exchange) CancelOrders(ctx context.Context, orders ...types.Order) (err
} else if len(o.ClientOrderID) > 0 {
req.OrigClientOrderID(o.ClientOrderID)
} else {
err = multierr.Append(err, fmt.Errorf(
"can not cancel %s order, order does not contain orderID or clientOrderID. order: %#v",
o.Symbol, o))
err = multierr.Append(err, types.NewOrderError(
fmt.Errorf("can not cancel %s order, order does not contain orderID or clientOrderID", o.Symbol),
o))
continue
}
_, err2 := req.Do(ctx)
if err2 != nil {
err = multierr.Append(err, errors.Wrapf(
err2, "can not cancel %s order. orderID: %d clientOrderID: %s order: %#v",
o.Symbol,
o.OrderID,
o.ClientOrderID,
o))
err = multierr.Append(err, types.NewOrderError(err2, o))
}
}
}

23
pkg/types/error.go Normal file
View File

@ -0,0 +1,23 @@
package types
import "fmt"
type OrderError struct {
error error
order Order
}
func (e *OrderError) Error() string {
return fmt.Sprintf("%s exchange: %s orderID:%d", e.error.Error(), e.order.Exchange, e.order.OrderID)
}
func (e *OrderError) Order() Order {
return e.order
}
func NewOrderError(e error, o Order) error {
return &OrderError{
error: e,
order: o,
}
}