Start expanding test coverage for exchange.go and fix minor issues

thrasher-corp · Sep 30, 2019 · 6951b4c · 6951b4c
1 parent e2d5754
commit 6951b4c
Show file tree

Hide file tree

Showing 4 changed files with 291 additions and 41 deletions.
diff --git a/engine/syncer.go b/engine/syncer.go
@@ -228,9 +228,9 @@ func (e *ExchangeCurrencyPairSyncer) update(exchangeName string, p currency.Pair
 				e.CurrencyPairs[x].Ticker.HaveData = true
 				e.CurrencyPairs[x].Ticker.IsProcessing = false
 				if atomic.LoadInt32(&e.initSyncCompleted) != 1 && !origHadData {
+					removedCounter++
 					log.Debugf(log.SyncMgr, "%s ticker sync complete %v [%d/%d].\n",
 						exchangeName, FormatCurrency(p).String(), removedCounter, createdCounter)
-					removedCounter++
 					e.initSyncWG.Done()
 				}
 
@@ -243,9 +243,9 @@ func (e *ExchangeCurrencyPairSyncer) update(exchangeName string, p currency.Pair
 				e.CurrencyPairs[x].Orderbook.HaveData = true
 				e.CurrencyPairs[x].Orderbook.IsProcessing = false
 				if atomic.LoadInt32(&e.initSyncCompleted) != 1 && !origHadData {
+					removedCounter++
 					log.Debugf(log.SyncMgr, "%s orderbook sync complete %v [%d/%d].\n",
 						exchangeName, FormatCurrency(p).String(), removedCounter, createdCounter)
-					removedCounter++
 					e.initSyncWG.Done()
 				}
 
@@ -258,9 +258,9 @@ func (e *ExchangeCurrencyPairSyncer) update(exchangeName string, p currency.Pair
 				e.CurrencyPairs[x].Trade.HaveData = true
 				e.CurrencyPairs[x].Trade.IsProcessing = false
 				if atomic.LoadInt32(&e.initSyncCompleted) != 1 && !origHadData {
+					removedCounter++
 					log.Debugf(log.SyncMgr, "%s trade sync complete %v [%d/%d].\n",
 						exchangeName, FormatCurrency(p).String(), removedCounter, createdCounter)
-					removedCounter++
 					e.initSyncWG.Done()
 				}
 			}

diff --git a/engine/timekeeper.go b/engine/timekeeper.go
@@ -42,6 +42,11 @@ func (n *ntpManager) Start() (err error) {
 		}
 	}()
 
+	if Bot.Config.NTPClient.Level == -1 {
+		err = errors.New("NTP client disabled")
+		return
+	}
+
 	log.Debugln(log.TimeMgr, "NTP manager starting...")
 	if Bot.Config.NTPClient.Level == 0 && *Bot.Config.Logging.Enabled {
 		// Initial NTP check (prompts user on how we should proceed)
@@ -101,9 +106,6 @@ func (n *ntpManager) run() {
 			return
 		case <-t.C:
 			n.processTime()
-			if Bot.Config.NTPClient.Level == 0 {
-				close(n.shutdown)
-			}
 		}
 	}
 }