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

Merge pull request #1049 from c9s/feature/grid2-metrics

Browse Source 
feature: grid2: make OpenGrid, CloseGrid api public
This commit is contained in:
Yo-An Lin 2023-01-12 14:47:10 +08:00 committed by GitHub
commit 915f1b7b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/strategy/grid2/strategy.go
View File

@ -236,7 +236,7 @@ func (s *Strategy) handleOrderCanceled(o types.Order) {
ctx := context.Background()
if s.CloseWhenCancelOrder {
s.logger.Infof("one of the grid orders is canceled, now closing grid...")
if err := s.closeGrid(ctx); err != nil {
if err := s.CloseGrid(ctx); err != nil {
s.logger.WithError(err).Errorf("graceful order cancel error")
}
}
@ -687,7 +687,7 @@ func (s *Strategy) newStopLossPriceHandler(ctx context.Context, session *bbgo.Ex
s.logger.Infof("last low price %f hits stopLossPrice %f, closing grid", k.Low.Float64(), s.StopLossPrice.Float64())
if err := s.closeGrid(ctx); err != nil {
if err := s.CloseGrid(ctx); err != nil {
s.logger.WithError(err).Errorf("can not close grid")
return
}
@ -713,7 +713,7 @@ func (s *Strategy) newTakeProfitHandler(ctx context.Context, session *bbgo.Excha
s.logger.Infof("last high price %f hits takeProfitPrice %f, closing grid", k.High.Float64(), s.TakeProfitPrice.Float64())
if err := s.closeGrid(ctx); err != nil {
if err := s.CloseGrid(ctx); err != nil {
s.logger.WithError(err).Errorf("can not close grid")
return
}
@ -731,8 +731,12 @@ func (s *Strategy) newTakeProfitHandler(ctx context.Context, session *bbgo.Excha
})
}
// closeGrid closes the grid orders
func (s *Strategy) closeGrid(ctx context.Context) error {
func (s *Strategy) OpenGrid(ctx context.Context) error {
return s.openGrid(ctx, s.session)
}
// CloseGrid closes the grid orders
func (s *Strategy) CloseGrid(ctx context.Context) error {
bbgo.Sync(ctx, s)
// now we can cancel the open orders
@ -1417,7 +1421,7 @@ func (s *Strategy) Run(ctx context.Context, _ bbgo.OrderExecutor, session *bbgo.
return
}
if err := s.closeGrid(ctx); err != nil {
if err := s.CloseGrid(ctx); err != nil {
s.logger.WithError(err).Errorf("grid graceful order cancel error")
}
})