lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-26 08:45:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feature: split strategy controller interface into several smaller ones

Browse Source
This commit is contained in:
Andy Cheng 2022-04-21 16:55:58 +08:00
parent 389752161d
commit ecc63f743f
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkg/bbgo/interact.go
View File

@ -56,15 +56,6 @@ func (it *CoreInteraction) FilterStrategyByInterface(checkInterface interface{})
return strategies, found return strategies, found
} }
func (it *CoreInteraction) GetStrategyController(strategy SingleExchangeStrategy) (controller StrategyControllerInterface, found bool) {
if strategyController := reflect.ValueOf(&strategy).Elem().FieldByName("strategyController"); strategyController.IsValid() {
controller = strategyController.Interface().(StrategyControllerInterface)
return controller, true
} else {
return nil, false
}
}
func GenerateStrategyButtonsForm(strategies []string) [][3]string { func GenerateStrategyButtonsForm(strategies []string) [][3]string {
var buttonsForm [][3]string var buttonsForm [][3]string
for _, strategy := range strategies { for _, strategy := range strategies {
@ -231,11 +222,11 @@ func (it *CoreInteraction) Commands(i *interact.Interact) {
i.PrivateCommand("/status", "Strategy Status", func(reply interact.Reply) error { i.PrivateCommand("/status", "Strategy Status", func(reply interact.Reply) error {
// it.trader.exchangeStrategies // it.trader.exchangeStrategies
// send symbol options // send symbol options
if strategies, found := it.FilterStrategyByInterface((*StrategyControllerInterface)(nil)); found { if strategies, found := it.FilterStrategyByInterface((*StrategyStatusReader)(nil)); found {
reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies))
reply.Message("Please choose a strategy") reply.Message("Please choose a strategy")
} else { } else {
reply.Message("No strategy supports StrategyController") reply.Message("No strategy supports StrategyStatusReader")
} }
return nil return nil
}).Next(func(signature string, reply interact.Reply) error { }).Next(func(signature string, reply interact.Reply) error {
@ -245,10 +236,10 @@ func (it *CoreInteraction) Commands(i *interact.Interact) {
return fmt.Errorf("strategy %s not found", signature) return fmt.Errorf("strategy %s not found", signature)
} }
controller, implemented := strategy.(StrategyControllerInterface) controller, implemented := strategy.(StrategyStatusReader)
if !implemented { if !implemented {
reply.Message(fmt.Sprintf("Strategy %s does not support StrategyController", signature)) reply.Message(fmt.Sprintf("Strategy %s does not support StrategyStatusReader", signature))
return fmt.Errorf("strategy %s does not implement StrategyController", signature) return fmt.Errorf("strategy %s does not implement StrategyStatusReader", signature)
} }
status := controller.GetStatus() status := controller.GetStatus()
@ -269,11 +260,11 @@ func (it *CoreInteraction) Commands(i *interact.Interact) {
i.PrivateCommand("/suspend", "Suspend Strategy", func(reply interact.Reply) error { i.PrivateCommand("/suspend", "Suspend Strategy", func(reply interact.Reply) error {
// it.trader.exchangeStrategies // it.trader.exchangeStrategies
// send symbol options // send symbol options
if strategies, found := it.FilterStrategyByInterface((*StrategyControllerInterface)(nil)); found { if strategies, found := it.FilterStrategyByInterface((*StrategyToggler)(nil)); found {
reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies))
reply.Message("Please choose one strategy") reply.Message("Please choose one strategy")
} else { } else {
reply.Message("No strategy supports StrategyController") reply.Message("No strategy supports StrategyToggler")
} }
return nil return nil
}).Next(func(signature string, reply interact.Reply) error { }).Next(func(signature string, reply interact.Reply) error {
@ -283,10 +274,10 @@ func (it *CoreInteraction) Commands(i *interact.Interact) {
return fmt.Errorf("strategy %s not found", signature) return fmt.Errorf("strategy %s not found", signature)
} }
controller, implemented := strategy.(StrategyControllerInterface) controller, implemented := strategy.(StrategyToggler)
if !implemented { if !implemented {
reply.Message(fmt.Sprintf("Strategy %s does not support StrategyController", signature)) reply.Message(fmt.Sprintf("Strategy %s does not support StrategyToggler", signature))
return fmt.Errorf("strategy %s does not implement StrategyController", signature) return fmt.Errorf("strategy %s does not implement StrategyToggler", signature)
} }
// Check strategy status before suspend // Check strategy status before suspend
@ -311,11 +302,11 @@ func (it *CoreInteraction) Commands(i *interact.Interact) {
i.PrivateCommand("/resume", "Resume Strategy", func(reply interact.Reply) error { i.PrivateCommand("/resume", "Resume Strategy", func(reply interact.Reply) error {
// it.trader.exchangeStrategies // it.trader.exchangeStrategies
// send symbol options // send symbol options
if strategies, found := it.FilterStrategyByInterface((*StrategyControllerInterface)(nil)); found { if strategies, found := it.FilterStrategyByInterface((*StrategyToggler)(nil)); found {
reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies))
reply.Message("Please choose one strategy") reply.Message("Please choose one strategy")
} else { } else {
reply.Message("No strategy supports StrategyController") reply.Message("No strategy supports StrategyToggler")
} }
return nil return nil
}).Next(func(signature string, reply interact.Reply) error { }).Next(func(signature string, reply interact.Reply) error {
@ -325,10 +316,10 @@ func (it *CoreInteraction) Commands(i *interact.Interact) {
return fmt.Errorf("strategy %s not found", signature) return fmt.Errorf("strategy %s not found", signature)
} }
controller, implemented := strategy.(StrategyControllerInterface) controller, implemented := strategy.(StrategyToggler)
if !implemented { if !implemented {
reply.Message(fmt.Sprintf("Strategy %s does not support StrategyController", signature)) reply.Message(fmt.Sprintf("Strategy %s does not support StrategyToggler", signature))
return fmt.Errorf("strategy %s does not implement StrategyController", signature) return fmt.Errorf("strategy %s does not implement StrategyToggler", signature)
} }
// Check strategy status before suspend // Check strategy status before suspend
@ -353,11 +344,11 @@ func (it *CoreInteraction) Commands(i *interact.Interact) {
i.PrivateCommand("/emergencystop", "Emergency Stop", func(reply interact.Reply) error { i.PrivateCommand("/emergencystop", "Emergency Stop", func(reply interact.Reply) error {
// it.trader.exchangeStrategies // it.trader.exchangeStrategies
// send symbol options // send symbol options
if strategies, found := it.FilterStrategyByInterface((*StrategyControllerInterface)(nil)); found { if strategies, found := it.FilterStrategyByInterface((*EmergencyStopper)(nil)); found {
reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies))
reply.Message("Please choose one strategy") reply.Message("Please choose one strategy")
} else { } else {
reply.Message("No strategy supports StrategyController") reply.Message("No strategy supports EmergencyStopper")
} }
return nil return nil
}).Next(func(signature string, reply interact.Reply) error { }).Next(func(signature string, reply interact.Reply) error {
@ -367,10 +358,10 @@ func (it *CoreInteraction) Commands(i *interact.Interact) {
return fmt.Errorf("strategy %s not found", signature) return fmt.Errorf("strategy %s not found", signature)
} }
controller, implemented := strategy.(StrategyControllerInterface) controller, implemented := strategy.(EmergencyStopper)
if !implemented { if !implemented {
reply.Message(fmt.Sprintf("Strategy %s does not support StrategyController", signature)) reply.Message(fmt.Sprintf("Strategy %s does not support EmergencyStopper", signature))
return fmt.Errorf("strategy %s does not implement StrategyController", signature) return fmt.Errorf("strategy %s does not implement EmergencyStopper", signature)
} }
if kc, ok := reply.(interact.KeyboardController); ok { if kc, ok := reply.(interact.KeyboardController); ok {

9
pkg/bbgo/strategy_controller.go
View File

@ -71,9 +71,16 @@ func (s *StrategyController) EmitEmergencyStop() error {
} }
} }
type StrategyControllerInterface interface { type StrategyStatusReader interface {
GetStatus() types.StrategyStatus GetStatus() types.StrategyStatus
}
type StrategyToggler interface {
StrategyStatusReader
Suspend() error Suspend() error
Resume() error Resume() error
}
type EmergencyStopper interface {
EmergencyStop() error EmergencyStop() error
} }