From cbf6bf78bc215b49c532d05373664056cc4d6b1e Mon Sep 17 00:00:00 2001 From: Andy Cheng Date: Thu, 21 Apr 2022 17:03:01 +0800 Subject: [PATCH] feature: make FilterStrategyByInterface a simple function --- pkg/bbgo/interact.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/bbgo/interact.go b/pkg/bbgo/interact.go index a7fc8f3fc..639cad2de 100644 --- a/pkg/bbgo/interact.go +++ b/pkg/bbgo/interact.go @@ -43,10 +43,10 @@ func NewCoreInteraction(environment *Environment, trader *Trader) *CoreInteracti } } -func (it *CoreInteraction) FilterStrategyByInterface(checkInterface interface{}) (strategies []string, found bool) { +func FilterStrategyByInterface(checkInterface interface{}, exchangeStrategies map[string]SingleExchangeStrategy) (strategies []string, found bool) { found = false rt := reflect.TypeOf(checkInterface).Elem() - for signature, strategy := range it.exchangeStrategies { + for signature, strategy := range exchangeStrategies { if ok := reflect.TypeOf(strategy).Implements(rt); ok { strategies = append(strategies, signature) found = true @@ -112,7 +112,7 @@ func (it *CoreInteraction) Commands(i *interact.Interact) { i.PrivateCommand("/position", "Show Position", func(reply interact.Reply) error { // it.trader.exchangeStrategies // send symbol options - if strategies, found := it.FilterStrategyByInterface((*PositionReader)(nil)); found { + if strategies, found := FilterStrategyByInterface((*PositionReader)(nil), it.exchangeStrategies); found { reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.Message("Please choose one strategy") } else { @@ -153,7 +153,7 @@ func (it *CoreInteraction) Commands(i *interact.Interact) { i.PrivateCommand("/closeposition", "Close position", func(reply interact.Reply) error { // it.trader.exchangeStrategies // send symbol options - if strategies, found := it.FilterStrategyByInterface((*PositionCloser)(nil)); found { + if strategies, found := FilterStrategyByInterface((*PositionCloser)(nil), it.exchangeStrategies); found { reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.Message("Please choose one strategy") } else { @@ -222,7 +222,7 @@ func (it *CoreInteraction) Commands(i *interact.Interact) { i.PrivateCommand("/status", "Strategy Status", func(reply interact.Reply) error { // it.trader.exchangeStrategies // send symbol options - if strategies, found := it.FilterStrategyByInterface((*StrategyStatusReader)(nil)); found { + if strategies, found := FilterStrategyByInterface((*StrategyStatusReader)(nil), it.exchangeStrategies); found { reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.Message("Please choose a strategy") } else { @@ -260,7 +260,7 @@ func (it *CoreInteraction) Commands(i *interact.Interact) { i.PrivateCommand("/suspend", "Suspend Strategy", func(reply interact.Reply) error { // it.trader.exchangeStrategies // send symbol options - if strategies, found := it.FilterStrategyByInterface((*StrategyToggler)(nil)); found { + if strategies, found := FilterStrategyByInterface((*StrategyToggler)(nil), it.exchangeStrategies); found { reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.Message("Please choose one strategy") } else { @@ -302,7 +302,7 @@ func (it *CoreInteraction) Commands(i *interact.Interact) { i.PrivateCommand("/resume", "Resume Strategy", func(reply interact.Reply) error { // it.trader.exchangeStrategies // send symbol options - if strategies, found := it.FilterStrategyByInterface((*StrategyToggler)(nil)); found { + if strategies, found := FilterStrategyByInterface((*StrategyToggler)(nil), it.exchangeStrategies); found { reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.Message("Please choose one strategy") } else { @@ -344,7 +344,7 @@ func (it *CoreInteraction) Commands(i *interact.Interact) { i.PrivateCommand("/emergencystop", "Emergency Stop", func(reply interact.Reply) error { // it.trader.exchangeStrategies // send symbol options - if strategies, found := it.FilterStrategyByInterface((*EmergencyStopper)(nil)); found { + if strategies, found := FilterStrategyByInterface((*EmergencyStopper)(nil), it.exchangeStrategies); found { reply.AddMultipleButtons(GenerateStrategyButtonsForm(strategies)) reply.Message("Please choose one strategy") } else {