use existing TradeCollector's EmitPositionUpdate

Author: kbearXD

pkg/strategy/dca2/state.go

@@ -216,7 +216,7 @@ func (s *Strategy) runTakeProfitReady(ctx context.Context, next State) {
 	s.Position.Reset()
 
 	// emit position
-	s.EmitPosition(s.Position)
+	s.OrderExecutor.TradeCollector().EmitPositionUpdate(s.Position)
 
 	// store into redis
 	bbgo.Sync(ctx, s)

pkg/strategy/dca2/strategy.go

@@ -101,8 +101,7 @@ type Strategy struct {
 
 	// callbacks
 	common.StatusCallbacks
-	positionCallbacks []func(*types.Position)
-	profitCallbacks   []func(*ProfitStats)
+	profitCallbacks []func(*ProfitStats)
 }
 
 func (s *Strategy) ID() string {
@@ -237,9 +236,6 @@ func (s *Strategy) Run(ctx context.Context, _ bbgo.OrderExecutor, session *bbgo.
 
 		// update take profit price here
 		s.updateTakeProfitPrice()
-
-		// emit position update
-		s.EmitPosition(position)
 	})
 
 	s.OrderExecutor.ActiveMakerOrders().OnFilled(func(o types.Order) {
@@ -283,6 +279,11 @@ func (s *Strategy) Run(ctx context.Context, _ bbgo.OrderExecutor, session *bbgo.
 			return
 		}
 
+		if s.takeProfitPrice.IsZero() {
+			s.logger.Warn("take profit price should not be 0 when there is at least one open-position order filled, please check it")
+			return
+		}
+
 		compRes := kline.Close.Compare(s.takeProfitPrice)
 		// price doesn't hit the take profit price
 		if compRes < 0 {
@@ -430,14 +431,6 @@ func (s *Strategy) ContinueNextRound() {
 	s.nextRoundPaused = false
 }
 
-func (s *Strategy) GetTakeProfitPrice() fixedpoint.Value {
-	if s.Position.Base == 0 {
-		return fixedpoint.Zero
-	}
-
-	return s.takeProfitPrice
-}
-
 func (s *Strategy) UpdateProfitStatsUntilSuccessful(ctx context.Context) error {
 	var op = func() error {
 		if updated, err := s.UpdateProfitStats(ctx); err != nil {