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

xalign: add more checks

Browse Source
This commit is contained in:
c9s 2023-06-13 12:22:43 +08:00
parent 5996b32ee1
commit 518c6938be
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/strategy/xalign/strategy.go
View File

@ -34,7 +34,7 @@ type Strategy struct {
UseTakerOrder bool `json:"useTakerOrder"` UseTakerOrder bool `json:"useTakerOrder"`
DryRun bool `json:"dryRun"` DryRun bool `json:"dryRun"`
orderBook map[string]*bbgo.ActiveOrderBook orderBooks map[string]*bbgo.ActiveOrderBook
} }
func (s *Strategy) ID() string { func (s *Strategy) ID() string {
@ -203,7 +203,7 @@ func (s *Strategy) CrossRun(ctx context.Context, _ bbgo.OrderExecutionRouter, se
instanceID := s.InstanceID() instanceID := s.InstanceID()
_ = instanceID _ = instanceID
s.orderBook = make(map[string]*bbgo.ActiveOrderBook) s.orderBooks = make(map[string]*bbgo.ActiveOrderBook)
for _, sessionName := range s.PreferredSessions { for _, sessionName := range s.PreferredSessions {
session, ok := sessions[sessionName] session, ok := sessions[sessionName]
@ -213,7 +213,7 @@ func (s *Strategy) CrossRun(ctx context.Context, _ bbgo.OrderExecutionRouter, se
orderBook := bbgo.NewActiveOrderBook("") orderBook := bbgo.NewActiveOrderBook("")
orderBook.BindStream(session.UserDataStream) orderBook.BindStream(session.UserDataStream)
s.orderBook[sessionName] = orderBook s.orderBooks[sessionName] = orderBook
} }
go func() { go func() {
@ -242,8 +242,15 @@ func (s *Strategy) align(ctx context.Context, sessions map[string]*bbgo.Exchange
_ = sessionBalances _ = sessionBalances
for sessionName, session := range sessions { for sessionName, session := range sessions {
if err := s.orderBook[sessionName].GracefulCancel(ctx, session.Exchange); err != nil { ob, ok := s.orderBooks[sessionName]
log.WithError(err).Errorf("can not cancel order") if !ok {
log.Errorf("orderbook on session %s not found", sessionName)
return
}
if ok {
if err := ob.GracefulCancel(ctx, session.Exchange); err != nil {
log.WithError(err).Errorf("can not cancel order")
}
} }
} }
@ -265,7 +272,7 @@ func (s *Strategy) align(ctx context.Context, sessions map[string]*bbgo.Exchange
} }
if createdOrder != nil { if createdOrder != nil {
s.orderBook[selectedSession.Name].Add(*createdOrder) s.orderBooks[selectedSession.Name].Add(*createdOrder)
} }
} }
} }