fix from #456, use last cursor logic (fetch or override) when SYNCHRONIZE_STATE_LOAD_ENABLE=true and fill tracking thread disabled

Author: nikhilsaraf

cmd/trade.go

@@ -732,14 +732,24 @@ func makeFillTracker(
 	}
 
 	// start initializing the fill tracker
-	var lastTradeCursorOverride interface{}
+	var lastCursor interface{}
 	if botConfig.FillTrackerLastTradeCursorOverride == "" {
-		lastTradeCursorOverride = nil
+		// loads cursor by fetching from exchange
+		lastCursor, e = exchangeShim.GetLatestTradeCursor()
+		if e != nil {
+			l.Info("")
+			l.Error(fmt.Sprintf("could not get last trade cursor from exchangeShim: %s", e))
+			// we want to delete all the offers and exit here because we don't want the bot to run if fill tracking isn't working correctly
+			deleteAllOffersAndExit(l, botConfig, client, sdex, exchangeShim, threadTracker)
+		}
+		log.Printf("set latest trade cursor from where to start tracking fills (no override specified): %v\n", lastCursor)
 	} else {
-		lastTradeCursorOverride = botConfig.FillTrackerLastTradeCursorOverride
+		// loads cursor from config file
+		lastCursor = botConfig.FillTrackerLastTradeCursorOverride
+		log.Printf("set latest trade cursor from where to start tracking fills (used override value): %v\n", lastCursor)
 	}
 
-	fillTracker := plugins.MakeFillTracker(tradingPair, threadTracker, exchangeShim, botConfig.FillTrackerSleepMillis, botConfig.FillTrackerDeleteCyclesThreshold, lastTradeCursorOverride)
+	fillTracker := plugins.MakeFillTracker(tradingPair, threadTracker, exchangeShim, botConfig.FillTrackerSleepMillis, botConfig.FillTrackerDeleteCyclesThreshold, lastCursor)
 	fillLogger := plugins.MakeFillLogger()
 	fillTracker.RegisterHandler(fillLogger)
 	if db != nil {

plugins/fillTracker.go

@@ -20,16 +20,15 @@ type FillTracker struct {
 	fillTrackable                    api.FillTrackable
 	fillTrackerSleepMillis           uint32
 	fillTrackerDeleteCyclesThreshold int64
-	lastTradeCursorOverride          interface{}
+	lastCursor                       interface{}
 
 	// initialized runtime vars
 	fillTrackerDeleteCycles int64
 	lockFill                *sync.Mutex
 	isRunningInBackground   bool
 
 	// uninitialized
-	lastCursor interface{}
-	handlers   []api.FillHandler
+	handlers []api.FillHandler
 }
 
 // enforce FillTracker implementing api.FillTracker
@@ -42,15 +41,15 @@ func MakeFillTracker(
 	fillTrackable api.FillTrackable,
 	fillTrackerSleepMillis uint32,
 	fillTrackerDeleteCyclesThreshold int64,
-	lastTradeCursorOverride interface{},
+	lastCursor interface{},
 ) api.FillTracker {
 	return &FillTracker{
 		pair:                             pair,
 		threadTracker:                    threadTracker,
 		fillTrackable:                    fillTrackable,
 		fillTrackerSleepMillis:           fillTrackerSleepMillis,
 		fillTrackerDeleteCyclesThreshold: fillTrackerDeleteCyclesThreshold,
-		lastTradeCursorOverride:          lastTradeCursorOverride,
+		lastCursor:                       lastCursor,
 		// initialized runtime vars
 		fillTrackerDeleteCycles: 0,
 		lockFill:                &sync.Mutex{},
@@ -92,19 +91,8 @@ func (f *FillTracker) TrackFills() error {
 		f.isRunningInBackground = false
 	}()
 
-	f.lastCursor = f.lastTradeCursorOverride
-	var e error
-	if f.lastCursor == nil {
-		// get the last cursor so we only start querying from the current position
-		f.lastCursor, e = f.fillTrackable.GetLatestTradeCursor()
-		if e != nil {
-			return fmt.Errorf("error while getting last trade: %s", e)
-		}
-	}
-	log.Printf("got latest trade cursor from where to start tracking fills: %v\n", f.lastCursor)
-
 	for {
-		_, e = f.FillTrackSingleIteration()
+		_, e := f.FillTrackSingleIteration()
 		if e != nil {
 			eMsg := fmt.Sprintf("error when running an iteration of fill tracker: %s", e)
 			if f.countError() {