Merge pull request #1459 from c9s/kbearXD/fix/move-common-strategy

FIX: move common.Strategy to Initialize
c9s · Dec 18, 2023 · 4bdaf11 · 4bdaf11
2 parents c71152d + eda0723
commit 4bdaf11
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 9 deletions.
diff --git a/pkg/strategy/atrpin/strategy.go b/pkg/strategy/atrpin/strategy.go
@@ -20,7 +20,7 @@ func init() {
 }
 
 type Strategy struct {
-	common.Strategy
+	*common.Strategy
 
 	Environment *bbgo.Environment
 	Market      types.Market
@@ -36,6 +36,11 @@ type Strategy struct {
 	// bbgo.OpenPositionOptions
 }
 
+func (s *Strategy) Initialize() error {
+	s.Strategy = &common.Strategy{}
+	return nil
+}
+
 func (s *Strategy) ID() string {
 	return ID
 }

diff --git a/pkg/strategy/dca2/strategy.go b/pkg/strategy/dca2/strategy.go
@@ -26,7 +26,7 @@ func init() {
 }
 
 type Strategy struct {
-	common.Strategy
+	*common.Strategy
 
 	Environment *bbgo.Environment
 	Market      types.Market
@@ -89,6 +89,7 @@ func (s *Strategy) Defaults() error {
 
 func (s *Strategy) Initialize() error {
 	s.logger = log.WithFields(s.LogFields)
+	s.Strategy = &common.Strategy{}
 	return nil
 }
 

diff --git a/pkg/strategy/fixedmaker/strategy.go b/pkg/strategy/fixedmaker/strategy.go
@@ -23,7 +23,7 @@ func init() {
 
 // Fixed spread market making strategy
 type Strategy struct {
-	common.Strategy
+	*common.Strategy
 
 	Environment *bbgo.Environment
 	Market      types.Market
@@ -45,7 +45,9 @@ func (s *Strategy) Defaults() error {
 	}
 	return nil
 }
+
 func (s *Strategy) Initialize() error {
+	s.Strategy = &common.Strategy{}
 	return nil
 }
 

diff --git a/pkg/strategy/liquiditymaker/strategy.go b/pkg/strategy/liquiditymaker/strategy.go
@@ -32,7 +32,7 @@ func init() {
 // - place enough total liquidity amount on the order book, for example, 20k USDT value liquidity on both sell and buy
 // - ensure the spread by placing the orders from the mid price (or the last trade price)
 type Strategy struct {
-	common.Strategy
+	*common.Strategy
 
 	Environment *bbgo.Environment
 	Market      types.Market
@@ -66,6 +66,11 @@ type Strategy struct {
 	orderGenerator *LiquidityOrderGenerator
 }
 
+func (s *Strategy) Initialize() error {
+	s.Strategy = &common.Strategy{}
+	return nil
+}
+
 func (s *Strategy) ID() string {
 	return ID
 }

diff --git a/pkg/strategy/random/strategy.go b/pkg/strategy/random/strategy.go
@@ -23,7 +23,7 @@ func init() {
 }
 
 type Strategy struct {
-	common.Strategy
+	*common.Strategy
 
 	Environment *bbgo.Environment
 	Market      types.Market
@@ -42,6 +42,7 @@ func (s *Strategy) Defaults() error {
 }
 
 func (s *Strategy) Initialize() error {
+	s.Strategy = &common.Strategy{}
 	return nil
 }
 

diff --git a/pkg/strategy/rsicross/strategy.go b/pkg/strategy/rsicross/strategy.go
@@ -21,7 +21,7 @@ func init() {
 }
 
 type Strategy struct {
-	common.Strategy
+	*common.Strategy
 
 	Environment *bbgo.Environment
 	Market      types.Market
@@ -36,6 +36,11 @@ type Strategy struct {
 	bbgo.OpenPositionOptions
 }
 
+func (s *Strategy) Initialize() error {
+	s.Strategy = &common.Strategy{}
+	return nil
+}
+
 func (s *Strategy) ID() string {
 	return ID
 }

diff --git a/pkg/strategy/scmaker/strategy.go b/pkg/strategy/scmaker/strategy.go
@@ -34,7 +34,7 @@ func init() {
 
 // Strategy scmaker is a stable coin market maker
 type Strategy struct {
-	common.Strategy
+	*common.Strategy
 
 	Environment *bbgo.Environment
 	Market      types.Market
@@ -69,6 +69,11 @@ type Strategy struct {
 	intensity *IntensityStream
 }
 
+func (s *Strategy) Initialize() error {
+	s.Strategy = &common.Strategy{}
+	return nil
+}
+
 func (s *Strategy) ID() string {
 	return ID
 }

diff --git a/pkg/strategy/wall/strategy.go b/pkg/strategy/wall/strategy.go
@@ -30,7 +30,7 @@ func init() {
 }
 
 type Strategy struct {
-	common.Strategy
+	*common.Strategy
 
 	Environment *bbgo.Environment
 	Market      types.Market
@@ -64,6 +64,11 @@ type Strategy struct {
 	activeWallOrders       *bbgo.ActiveOrderBook
 }
 
+func (s *Strategy) Initialize() error {
+	s.Strategy = &common.Strategy{}
+	return nil
+}
+
 func (s *Strategy) ID() string {
 	return ID
 }

diff --git a/pkg/strategy/xfixedmaker/strategy.go b/pkg/strategy/xfixedmaker/strategy.go
@@ -23,7 +23,7 @@ func init() {
 
 // Fixed spread market making strategy
 type Strategy struct {
-	common.Strategy
+	*common.Strategy
 
 	Environment *bbgo.Environment
 
@@ -51,7 +51,9 @@ func (s *Strategy) Defaults() error {
 	}
 	return nil
 }
+
 func (s *Strategy) Initialize() error {
+	s.Strategy = &common.Strategy{}
 	return nil
 }