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

Merge pull request #957 from c9s/fix/submit-order-notify

Browse Source 
bbgo: remove submitOrder notification
This commit is contained in:
Yo-An Lin 2022-09-19 14:23:38 +08:00 committed by GitHub
commit cddc70fb0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/bbgo/order_execution.go
View File

@ -109,18 +109,6 @@ type ExchangeOrderExecutor struct {
orderUpdateCallbacks []func(order types.Order) orderUpdateCallbacks []func(order types.Order)
} }
func (e *ExchangeOrderExecutor) notifySubmitOrders(orders ...types.SubmitOrder) {
for _, order := range orders {
// pass submit order as an interface object.
channel, ok := e.RouteObject(&order)
if ok {
NotifyTo(channel, ":memo: Submitting %s %s %s order with quantity: %f @ %f, order: %v", order.Symbol, order.Type, order.Side, order.Quantity.Float64(), order.Price.Float64(), &order)
} else {
Notify(":memo: Submitting %s %s %s order with quantity: %f @ %f, order: %v", order.Symbol, order.Type, order.Side, order.Quantity.Float64(), order.Price.Float64(), &order)
}
}
}
func (e *ExchangeOrderExecutor) SubmitOrders(ctx context.Context, orders ...types.SubmitOrder) (types.OrderSlice, error) { func (e *ExchangeOrderExecutor) SubmitOrders(ctx context.Context, orders ...types.SubmitOrder) (types.OrderSlice, error) {
formattedOrders, err := e.Session.FormatOrders(orders) formattedOrders, err := e.Session.FormatOrders(orders)
if err != nil { if err != nil {
@ -128,19 +116,9 @@ func (e *ExchangeOrderExecutor) SubmitOrders(ctx context.Context, orders ...type
} }
for _, order := range formattedOrders { for _, order := range formattedOrders {
// pass submit order as an interface object.
channel, ok := e.RouteObject(&order)
if ok {
NotifyTo(channel, ":memo: Submitting %s %s %s order with quantity: %f, order: %v", order.Symbol, order.Type, order.Side, order.Quantity.Float64(), &order)
} else {
Notify(":memo: Submitting %s %s %s order with quantity: %f: %v", order.Symbol, order.Type, order.Side, order.Quantity.Float64(), &order)
}
log.Infof("submitting order: %s", order.String()) log.Infof("submitting order: %s", order.String())
} }
e.notifySubmitOrders(formattedOrders...)
createdOrders, _, err := BatchPlaceOrder(ctx, e.Session.Exchange, formattedOrders...) createdOrders, _, err := BatchPlaceOrder(ctx, e.Session.Exchange, formattedOrders...)
return createdOrders, err return createdOrders, err
} }

9
pkg/types/asset.go
View File

@ -61,7 +61,7 @@ func (m AssetMap) PlainText() (o string) {
if !a.InUSD.IsZero() { if !a.InUSD.IsZero() {
o += fmt.Sprintf(" %s: %s (≈ %s) (≈ %s)", o += fmt.Sprintf(" %s: %s (≈ %s) (≈ %s)",
a.Currency, a.Currency,
a.Total.String(), a.NetAsset.String(),
USD.FormatMoney(usd), USD.FormatMoney(usd),
BTC.FormatMoney(btc), BTC.FormatMoney(btc),
) + "\n" ) + "\n"
@ -70,14 +70,15 @@ func (m AssetMap) PlainText() (o string) {
} else { } else {
o += fmt.Sprintf(" %s: %s", o += fmt.Sprintf(" %s: %s",
a.Currency, a.Currency,
a.Total.String(), a.NetAsset.String(),
) + "\n" ) + "\n"
} }
} }
o += fmt.Sprintf(" Summary: (≈ %s) (≈ %s)",
o += fmt.Sprintf("Net Asset Value: (≈ %s) (≈ %s)",
USD.FormatMoney(sumUsd), USD.FormatMoney(sumUsd),
BTC.FormatMoney(sumBTC), BTC.FormatMoney(sumBTC),
) + "\n" )
return o return o
} }