Bugfix: Syncer & websocket circular dependency (thrasher-corp#743)

* Fixes cyclical dependency * why not lint * Addresses potential wait if websocket subsystem is disabled
agania · Aug 11, 2021 · 126187b · 126187b
1 parent c7c8cac
commit 126187b
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 150 deletions.
diff --git a/engine/engine.go b/engine/engine.go
@@ -513,8 +513,8 @@ func (bot *Engine) Start() error {
 		bot.currencyPairSyncer, err = setupSyncManager(
 			exchangeSyncCfg,
 			bot.ExchangeManager,
-			bot.websocketRoutineManager,
-			&bot.Config.RemoteControl)
+			&bot.Config.RemoteControl,
+			bot.Settings.EnableWebsocketRoutine)
 		if err != nil {
 			gctlog.Errorf(gctlog.Global, "Unable to initialise exchange currency pair syncer. Err: %s", err)
 		} else {

diff --git a/engine/helpers.go b/engine/helpers.go
@@ -177,10 +177,11 @@ func (bot *Engine) SetSubsystem(subSystemName string, enable bool) error {
 					SyncTimeoutREST:      bot.Settings.SyncTimeoutREST,
 					SyncTimeoutWebsocket: bot.Settings.SyncTimeoutWebsocket,
 				}
-				bot.currencyPairSyncer, err = setupSyncManager(exchangeSyncCfg,
+				bot.currencyPairSyncer, err = setupSyncManager(
+					exchangeSyncCfg,
 					bot.ExchangeManager,
-					bot.websocketRoutineManager,
-					&bot.Config.RemoteControl)
+					&bot.Config.RemoteControl,
+					bot.Settings.EnableWebsocketRoutine)
 				if err != nil {
 					return err
 				}