REFACTOR: move retry functions

pkg/bbgo/order_executor_general.go

@@ -3,18 +3,17 @@ package bbgo
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"go.uber.org/multierr"
 
+	"github.com/c9s/bbgo/pkg/exchange/retry"
 	"github.com/c9s/bbgo/pkg/fixedpoint"
 	"github.com/c9s/bbgo/pkg/types"
 	"github.com/c9s/bbgo/pkg/util"
-	"github.com/c9s/bbgo/pkg/util/backoff"
 )
 
 var ErrExceededSubmitOrderRetryLimit = errors.New("exceeded submit order retry limit")
@@ -503,22 +502,10 @@ func (e *GeneralOrderExecutor) ClosePosition(ctx context.Context, percentage fix
 	if queryOrderService, ok := e.session.Exchange.(types.ExchangeOrderQueryService); ok && !IsBackTesting {
 		switch submitOrder.Type {
 		case types.OrderTypeMarket:
-			_ = backoff.RetryGeneral(ctx, func() error {
-				order, err2 := queryOrderService.QueryOrder(ctx, types.OrderQuery{
-					Symbol:  e.symbol,
-					OrderID: strconv.FormatUint(createdOrders[0].OrderID, 10),
-				})
-
-				if err2 != nil {
-					return err2
-				}
-
-				if order.Status != types.OrderStatusFilled {
-					return errors.New("order is not filled yet")
-				}
-
-				return nil
-			})
+			_, err2 := retry.QueryOrderUntilSuccessful(ctx, queryOrderService, createdOrders[0].Symbol, createdOrders[0].OrderID)
+			if err2 != nil {
+				log.WithError(err2).Errorf("unable to query order")
+			}
 		}
 	}
 

pkg/exchange/retry/order.go

@@ -0,0 +1,76 @@
+package retry
+
+import (
+	"context"
+	"errors"
+	"strconv"
+
+	backoff2 "github.com/cenkalti/backoff/v4"
+
+	"github.com/c9s/bbgo/pkg/types"
+	"github.com/c9s/bbgo/pkg/util/backoff"
+)
+
+type advancedOrderCancelService interface {
+	CancelAllOrders(ctx context.Context) ([]types.Order, error)
+	CancelOrdersBySymbol(ctx context.Context, symbol string) ([]types.Order, error)
+	CancelOrdersByGroupID(ctx context.Context, groupID uint32) ([]types.Order, error)
+}
+
+func QueryOrderUntilSuccessful(ctx context.Context, queryOrderService types.ExchangeOrderQueryService, symbol string, orderId uint64) (o *types.Order, err error) {
+	err = backoff.RetryGeneral(ctx, func() (err2 error) {
+		o, err2 = queryOrderService.QueryOrder(ctx, types.OrderQuery{
+			Symbol:  symbol,
+			OrderID: strconv.FormatUint(orderId, 10),
+		})
+
+		if err2 != nil || o == nil {
+			return err2
+		}
+
+		if o.Status != types.OrderStatusFilled {
+			return errors.New("order is not filled yet")
+		}
+
+		return err2
+	})
+
+	return o, err
+}
+
+func GeneralBackoff(ctx context.Context, op backoff2.Operation) (err error) {
+	err = backoff2.Retry(op, backoff2.WithContext(
+		backoff2.WithMaxRetries(
+			backoff2.NewExponentialBackOff(),
+			101),
+		ctx))
+	return err
+}
+
+func QueryOpenOrdersUntilSuccessful(ctx context.Context, ex types.Exchange, symbol string) (openOrders []types.Order, err error) {
+	var op = func() (err2 error) {
+		openOrders, err2 = ex.QueryOpenOrders(ctx, symbol)
+		return err2
+	}
+
+	err = GeneralBackoff(ctx, op)
+	return openOrders, err
+}
+
+func CancelAllOrdersUntilSuccessful(ctx context.Context, service advancedOrderCancelService) error {
+	var op = func() (err2 error) {
+		_, err2 = service.CancelAllOrders(ctx)
+		return err2
+	}
+
+	return GeneralBackoff(ctx, op)
+}
+
+func CancelOrdersUntilSuccessful(ctx context.Context, ex types.Exchange, orders ...types.Order) error {
+	var op = func() (err2 error) {
+		err2 = ex.CancelOrders(ctx, orders...)
+		return err2
+	}
+
+	return GeneralBackoff(ctx, op)
+}

pkg/strategy/grid2/strategy.go

@@ -11,14 +11,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cenkalti/backoff/v4"
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 	"go.uber.org/multierr"
 
 	"github.com/c9s/bbgo/pkg/bbgo"
+	"github.com/c9s/bbgo/pkg/exchange/retry"
 	"github.com/c9s/bbgo/pkg/fixedpoint"
 	"github.com/c9s/bbgo/pkg/types"
 	"github.com/c9s/bbgo/pkg/util"
@@ -974,7 +974,7 @@ func (s *Strategy) cancelAll(ctx context.Context) error {
 		for {
 			s.logger.Infof("checking %s open orders...", s.Symbol)
 
-			openOrders, err := queryOpenOrdersUntilSuccessful(ctx, session.Exchange, s.Symbol)
+			openOrders, err := retry.QueryOpenOrdersUntilSuccessful(ctx, session.Exchange, s.Symbol)
 			if err != nil {
 				s.logger.WithError(err).Errorf("CancelOrdersByGroupID api call error")
 				werr = multierr.Append(werr, err)
@@ -987,7 +987,7 @@ func (s *Strategy) cancelAll(ctx context.Context) error {
 			s.logger.Infof("found %d open orders left, using cancel all orders api", len(openOrders))
 
 			s.logger.Infof("using cancal all orders api for canceling grid orders...")
-			if err := cancelAllOrdersUntilSuccessful(ctx, service); err != nil {
+			if err := retry.CancelAllOrdersUntilSuccessful(ctx, service); err != nil {
 				s.logger.WithError(err).Errorf("CancelAllOrders api call error")
 				werr = multierr.Append(werr, err)
 			}
@@ -1393,12 +1393,12 @@ func (s *Strategy) generateGridOrders(totalQuote, totalBase, lastPrice fixedpoin
 
 func (s *Strategy) clearOpenOrders(ctx context.Context, session *bbgo.ExchangeSession) error {
 	// clear open orders when start
-	openOrders, err := queryOpenOrdersUntilSuccessful(ctx, session.Exchange, s.Symbol)
+	openOrders, err := retry.QueryOpenOrdersUntilSuccessful(ctx, session.Exchange, s.Symbol)
 	if err != nil {
 		return err
 	}
 
-	return cancelOrdersUntilSuccessful(ctx, session.Exchange, openOrders...)
+	return retry.CancelOrdersUntilSuccessful(ctx, session.Exchange, openOrders...)
 }
 
 func (s *Strategy) getLastTradePrice(ctx context.Context, session *bbgo.ExchangeSession) (fixedpoint.Value, error) {
@@ -1996,7 +1996,7 @@ func (s *Strategy) recoverGrid(ctx context.Context, session *bbgo.ExchangeSessio
 }
 
 func (s *Strategy) recoverByScanningOrders(ctx context.Context, session *bbgo.ExchangeSession) error {
-	openOrders, err := queryOpenOrdersUntilSuccessful(ctx, session.Exchange, s.Symbol)
+	openOrders, err := retry.QueryOpenOrdersUntilSuccessful(ctx, session.Exchange, s.Symbol)
 	if err != nil {
 		return err
 	}
@@ -2047,7 +2047,7 @@ func (s *Strategy) openOrdersMismatches(ctx context.Context, session *bbgo.Excha
 }
 
 func (s *Strategy) cancelDuplicatedPriceOpenOrders(ctx context.Context, session *bbgo.ExchangeSession) error {
-	openOrders, err := queryOpenOrdersUntilSuccessful(ctx, session.Exchange, s.Symbol)
+	openOrders, err := retry.QueryOpenOrdersUntilSuccessful(ctx, session.Exchange, s.Symbol)
 	if err != nil {
 		return err
 	}
@@ -2105,40 +2105,3 @@ func (s *Strategy) newClientOrderID() string {
 	}
 	return ""
 }
-
-func generalBackoff(ctx context.Context, op backoff.Operation) (err error) {
-	err = backoff.Retry(op, backoff.WithContext(
-		backoff.WithMaxRetries(
-			backoff.NewExponentialBackOff(),
-			101),
-		ctx))
-	return err
-}
-
-func cancelAllOrdersUntilSuccessful(ctx context.Context, service advancedOrderCancelApi) error {
-	var op = func() (err2 error) {
-		_, err2 = service.CancelAllOrders(ctx)
-		return err2
-	}
-
-	return generalBackoff(ctx, op)
-}
-
-func cancelOrdersUntilSuccessful(ctx context.Context, ex types.Exchange, orders ...types.Order) error {
-	var op = func() (err2 error) {
-		err2 = ex.CancelOrders(ctx, orders...)
-		return err2
-	}
-
-	return generalBackoff(ctx, op)
-}
-
-func queryOpenOrdersUntilSuccessful(ctx context.Context, ex types.Exchange, symbol string) (openOrders []types.Order, err error) {
-	var op = func() (err2 error) {
-		openOrders, err2 = ex.QueryOpenOrders(ctx, symbol)
-		return err2
-	}
-
-	err = generalBackoff(ctx, op)
-	return openOrders, err
-}