Merge pull request #742 from c9s/improve/notify-api

refactor: clean up bbgo.Notifiability

pkg/bbgo/order_executor_general.go

@@ -68,18 +68,18 @@ func (e *GeneralOrderExecutor) BindProfitStats(profitStats *types.ProfitStats) {
 	})
 }
 
-func (e *GeneralOrderExecutor) Bind(notify NotifyFunc) {
+func (e *GeneralOrderExecutor) Bind() {
 	e.activeMakerOrders.BindStream(e.session.UserDataStream)
 	e.orderStore.BindStream(e.session.UserDataStream)
 
 	// trade notify
 	e.tradeCollector.OnTrade(func(trade types.Trade, profit, netProfit fixedpoint.Value) {
-		notify(trade)
+		Notify(trade)
 	})
 
 	e.tradeCollector.OnPositionUpdate(func(position *types.Position) {
 		log.Infof("position changed: %s", position)
-		notify(position)
+		Notify(position)
 	})
 
 	e.tradeCollector.BindStream(e.session.UserDataStream)

pkg/strategy/autoborrow/strategy.go

@@ -50,8 +50,6 @@ type MarginAsset struct {
 }
 
 type Strategy struct {
-	*bbgo.Notifiability
-
 	Interval             types.Interval   `json:"interval"`
 	MinMarginLevel       fixedpoint.Value `json:"minMarginLevel"`
 	MaxMarginLevel       fixedpoint.Value `json:"maxMarginLevel"`

pkg/strategy/bollgrid/strategy.go

@@ -25,10 +25,6 @@ func init() {
 }
 
 type Strategy struct {
-	// The notification system will be injected into the strategy automatically.
-	// This field will be injected automatically since it's a single exchange strategy.
-	*bbgo.Notifiability
-
 	// OrderExecutor is an interface for submitting order.
 	// This field will be injected automatically since it's a single exchange strategy.
 	bbgo.OrderExecutor

pkg/strategy/bollmaker/strategy.go

@@ -51,7 +51,6 @@ type BollingerSetting struct {
 
 type Strategy struct {
 	*bbgo.Graceful
-	*bbgo.Notifiability
 	*bbgo.Persistence
 
 	Environment          *bbgo.Environment

pkg/strategy/dca/strategy.go

@@ -48,7 +48,6 @@ func (b BudgetPeriod) Duration() time.Duration {
 // Strategy is the Dollar-Cost-Average strategy
 type Strategy struct {
 	*bbgo.Graceful
-	*bbgo.Notifiability
 	*bbgo.Persistence
 
 	Environment *bbgo.Environment

pkg/strategy/emastop/strategy.go

@@ -27,10 +27,6 @@ func init() {
 type Strategy struct {
 	*bbgo.Graceful
 
-	// The notification system will be injected into the strategy automatically.
-	// This field will be injected automatically since it's a single exchange strategy.
-	*bbgo.Notifiability
-
 	SourceExchangeName string `json:"sourceExchange"`
 
 	TargetExchangeName string `json:"targetExchange"`

pkg/strategy/etf/strategy.go

@@ -22,8 +22,6 @@ func init() {
 type Strategy struct {
 	Market types.Market
 
-	Notifiability *bbgo.Notifiability
-
 	TotalAmount fixedpoint.Value `json:"totalAmount,omitempty"`
 
 	// Interval is the period that you want to submit order

pkg/strategy/fmaker/strategy.go

@@ -32,7 +32,6 @@ type IntervalWindowSetting struct {
 
 type Strategy struct {
 	*bbgo.Graceful
-	*bbgo.Notifiability
 	*bbgo.Persistence
 
 	Environment *bbgo.Environment

pkg/strategy/funding/strategy.go

@@ -27,7 +27,6 @@ func init() {
 }
 
 type Strategy struct {
-	*bbgo.Notifiability
 	// These fields will be filled from the config file (it translates YAML to JSON)
 	Symbol              string           `json:"symbol"`
 	Market              types.Market     `json:"-"`

pkg/strategy/grid/strategy.go

@@ -45,10 +45,6 @@ type State struct {
 }
 
 type Strategy struct {
-	// The notification system will be injected into the strategy automatically.
-	// This field will be injected automatically since it's a single exchange strategy.
-	*bbgo.Notifiability `json:"-" yaml:"-"`
-
 	*bbgo.Graceful `json:"-" yaml:"-"`
 
 	*bbgo.Persistence

pkg/strategy/pivotshort/strategy.go

@@ -78,7 +78,6 @@ type Exit struct {
 
 type Strategy struct {
 	*bbgo.Graceful
-	*bbgo.Notifiability
 	*bbgo.Persistence
 
 	Environment *bbgo.Environment
@@ -204,7 +203,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
 	s.orderExecutor.BindEnvironment(s.Environment)
 	s.orderExecutor.BindProfitStats(s.ProfitStats)
 	s.orderExecutor.BindTradeStats(s.TradeStats)
-	s.orderExecutor.Bind(s.Notifiability.Notify)
+	s.orderExecutor.Bind()
 
 	store, _ := session.MarketDataStore(s.Symbol)
 

pkg/strategy/pricealert/strategy.go

@@ -15,9 +15,6 @@ func init() {
 }
 
 type Strategy struct {
-	// The notification system will be injected into the strategy automatically.
-	*bbgo.Notifiability
-
 	// These fields will be filled from the config file (it translates YAML to JSON)
 	Symbol    string           `json:"symbol"`
 	Interval  types.Interval   `json:"interval"`

pkg/strategy/rebalance/strategy.go

@@ -20,8 +20,6 @@ func init() {
 }
 
 type Strategy struct {
-	Notifiability *bbgo.Notifiability
-
 	Interval      types.Interval   `json:"interval"`
 	BaseCurrency  string           `json:"baseCurrency"`
 	TargetWeights types.ValueMap   `json:"targetWeights"`

pkg/strategy/schedule/strategy.go

@@ -19,8 +19,6 @@ func init() {
 type Strategy struct {
 	Market types.Market
 
-	Notifiability *bbgo.Notifiability
-
 	// StandardIndicatorSet contains the standard indicators of a market (symbol)
 	// This field will be injected automatically since we defined the Symbol field.
 	*bbgo.StandardIndicatorSet

pkg/strategy/supertrend/strategy.go

@@ -29,7 +29,6 @@ func init() {
 
 type Strategy struct {
 	*bbgo.Graceful
-	*bbgo.Notifiability
 	*bbgo.Persistence
 
 	Environment *bbgo.Environment

pkg/strategy/support/strategy.go

@@ -130,7 +130,6 @@ func (control *TrailingStopControl) GenerateStopOrder(quantity fixedpoint.Value)
 // }
 
 type Strategy struct {
-	*bbgo.Notifiability `json:"-"`
 	*bbgo.Persistence
 	*bbgo.Graceful `json:"-"`
 

pkg/strategy/swing/strategy.go

@@ -26,10 +26,6 @@ func init() {
 }
 
 type Strategy struct {
-	// The notification system will be injected into the strategy automatically.
-	// This field will be injected automatically since it's a single exchange strategy.
-	*bbgo.Notifiability
-
 	// OrderExecutor is an interface for submitting order.
 	// This field will be injected automatically since it's a single exchange strategy.
 	bbgo.OrderExecutor

pkg/strategy/techsignal/strategy.go

@@ -28,8 +28,6 @@ func init() {
 }
 
 type Strategy struct {
-	*bbgo.Notifiability
-
 	// These fields will be filled from the config file (it translates YAML to JSON)
 	Symbol string       `json:"symbol"`
 	Market types.Market `json:"-"`

pkg/strategy/wall/strategy.go

@@ -31,7 +31,6 @@ func init() {
 
 type Strategy struct {
 	*bbgo.Graceful
-	*bbgo.Notifiability
 	*bbgo.Persistence
 
 	Environment          *bbgo.Environment

pkg/strategy/xbalance/strategy.go

@@ -136,7 +136,6 @@ func (a *Address) UnmarshalJSON(body []byte) error {
 }
 
 type Strategy struct {
-	Notifiability *bbgo.Notifiability
 	*bbgo.Graceful
 	*bbgo.Persistence
 

pkg/strategy/xgap/strategy.go

@@ -58,7 +58,6 @@ func (s *State) Reset() {
 
 type Strategy struct {
 	*bbgo.Graceful
-	*bbgo.Notifiability
 	*bbgo.Persistence
 
 	Symbol          string           `json:"symbol"`

pkg/strategy/xmaker/strategy.go

@@ -34,7 +34,6 @@ func init() {
 
 type Strategy struct {
 	*bbgo.Graceful
-	*bbgo.Notifiability
 	*bbgo.Persistence
 	Environment *bbgo.Environment
 

pkg/strategy/xnav/strategy.go

@@ -58,7 +58,6 @@ func (s *State) Reset() {
 }
 
 type Strategy struct {
-	Notifiability *bbgo.Notifiability
 	*bbgo.Graceful
 	*bbgo.Persistence
 	*bbgo.Environment