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

strategy: return the createdOrders objects instead in submitOrders()

Browse Source
This commit is contained in:
Andy Cheng 2022-01-24 12:11:26 +08:00
parent f673fc30ad
commit 1bd787f44c
No known key found for this signature in database
GPG Key ID: 936427CF651A9D28
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/strategy/support/strategy.go
View File

@ -248,7 +248,7 @@ func (s *Strategy) LoadState() error {
return nil
}
func (s *Strategy) submitOrders(ctx context.Context, orderExecutor bbgo.OrderExecutor, orderForms ...types.SubmitOrder) ([]uint64, error) {
func (s *Strategy) submitOrders(ctx context.Context, orderExecutor bbgo.OrderExecutor, orderForms ...types.SubmitOrder) (types.OrderSlice, error) {
for _, o := range orderForms {
s.Notifiability.Notify(o)
}
@ -260,7 +260,7 @@ func (s *Strategy) submitOrders(ctx context.Context, orderExecutor bbgo.OrderExe
s.orderStore.Add(createdOrders...)
s.tradeCollector.Emit()
return createdOrders.IDs(), nil
return createdOrders, nil
}
// Cancel order
@ -411,11 +411,11 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
// Place new order if the target price is higher than the minimum target price
if s.trailingStopControl.IsHigherThanMin(minTargetPrice) {
orderForm := s.trailingStopControl.GenerateStopOrder(position.Base.Float64())
ids, err := s.submitOrders(ctx, orderExecutor, orderForm)
orders, err := s.submitOrders(ctx, orderExecutor, orderForm)
if err != nil {
log.WithError(err).Error("submit profit trailing stop order error")
} else {
s.trailingStopControl.OrderID = ids[0]
s.trailingStopControl.OrderID = orders.IDs()[0]
}
}
}
@ -464,11 +464,11 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
// Place new order if the target price is higher than the minimum target price
if s.trailingStopControl.IsHigherThanMin(minTargetPrice) {
orderForm := s.trailingStopControl.GenerateStopOrder(s.state.Position.Base.Float64())
ids, err := s.submitOrders(ctx, orderExecutor, orderForm)
orders, err := s.submitOrders(ctx, orderExecutor, orderForm)
if err != nil {
log.WithError(err).Error("submit profit trailing stop order error")
} else {
s.trailingStopControl.OrderID = ids[0]
s.trailingStopControl.OrderID = orders.IDs()[0]
}
}
}