mm: Update run end time after each event (#3305)

Updates the run end time along with each event update in order to avoid
having a nil end time if the process is killed during a market making run.

Author: martonp

client/mm/event_log.go

@@ -9,6 +9,7 @@ import (
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
+	"time"
 
 	"decred.org/dcrdex/client/asset"
 	"decred.org/dcrdex/dex"
@@ -105,7 +106,7 @@ type eventLogDB interface {
 	// storeEvent stores/updates a market making event.
 	storeEvent(startTime int64, mkt *MarketWithHost, e *MarketMakingEvent, fs *BalanceState)
 	// endRun stores the time that a market making run was ended.
-	endRun(startTime int64, mkt *MarketWithHost, endTime int64) error
+	endRun(startTime int64, mkt *MarketWithHost) error
 	// runs returns a list of runs in the database. If n == 0, all of the runs
 	// will be returned. If refStartTime and refMkt are not nil, the runs
 	// including and before the run with the start time and market will be
@@ -321,6 +322,11 @@ func (db *boltEventLogDB) updateEvent(update *eventUpdate) {
 			}
 		}
 
+		err = storeEndTime(runBucket)
+		if err != nil {
+			return err
+		}
+
 		// Update the final state.
 		bsJSON, err := json.Marshal(bs)
 		if err != nil {
@@ -448,7 +454,15 @@ func (db *boltEventLogDB) storeNewRun(startTime int64, mkt *MarketWithHost, cfg
 			return err
 		}
 
-		runBucket.Put(startTimeKey, encode.Uint64Bytes(uint64(startTime)))
+		err = runBucket.Put(startTimeKey, encode.Uint64Bytes(uint64(startTime)))
+		if err != nil {
+			return err
+		}
+
+		err = storeEndTime(runBucket)
+		if err != nil {
+			return err
+		}
 
 		if err := db.storeCfgUpdate(runBucket, cfg, startTime); err != nil {
 			return err
@@ -616,8 +630,13 @@ func (db *boltEventLogDB) runOverview(startTime int64, mkt *MarketWithHost) (*Ma
 	})
 }
 
+// storeEndTime updates the end time of a run to the current time.
+func storeEndTime(runBucket *bbolt.Bucket) error {
+	return runBucket.Put(endTimeKey, encode.Uint64Bytes(uint64(time.Now().Unix())))
+}
+
 // endRun stores the time that a market making run was ended.
-func (db *boltEventLogDB) endRun(startTime int64, mkt *MarketWithHost, endTime int64) error {
+func (db *boltEventLogDB) endRun(startTime int64, mkt *MarketWithHost) error {
 	return db.Update(func(tx *bbolt.Tx) error {
 		botRuns := tx.Bucket(botRunsBucket)
 		key := runKey(startTime, mkt)
@@ -626,7 +645,7 @@ func (db *boltEventLogDB) endRun(startTime int64, mkt *MarketWithHost, endTime i
 			return fmt.Errorf("nil run bucket for key %x", key)
 		}
 
-		return runBucket.Put(endTimeKey, encode.Uint64Bytes(uint64(endTime)))
+		return storeEndTime(runBucket)
 	})
 }
 

client/mm/event_log_test.go

@@ -301,7 +301,7 @@ func TestEventLogDB(t *testing.T) {
 		t.Fatalf("expected event:\n%v\n\ngot:\n%v", event2, runEvents[0])
 	}
 
-	err = db.endRun(startTime, mkt, startTime+1000)
+	err = db.endRun(startTime, mkt)
 	if err != nil {
 		t.Fatalf("error ending run: %v", err)
 	}
@@ -310,8 +310,8 @@ func TestEventLogDB(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error getting run overview: %v", err)
 	}
-	if *overview.EndTime != startTime+1000 {
-		t.Fatalf("expected end time %d, got %d", startTime+1000, overview.EndTime)
+	if *overview.EndTime < startTime || *overview.EndTime > time.Now().Unix() {
+		t.Fatalf("expected end time %d, got %d", startTime, overview.EndTime)
 	}
 	bs := currBalanceState()
 	finalBals := map[uint32]uint64{

client/mm/exchange_adaptor.go

@@ -3409,7 +3409,7 @@ func (u *unifiedExchangeAdaptor) Connect(ctx context.Context) (*sync.WaitGroup,
 	go func() {
 		defer u.wg.Done()
 		<-ctx.Done()
-		u.eventLogDB.endRun(startTime, u.mwh, time.Now().Unix())
+		u.eventLogDB.endRun(startTime, u.mwh)
 	}()
 
 	u.wg.Add(1)

client/mm/exchange_adaptor_test.go

@@ -40,7 +40,7 @@ func newTEventLogDB() *tEventLogDB {
 func (db *tEventLogDB) storeNewRun(startTime int64, mkt *MarketWithHost, cfg *BotConfig, initialState *BalanceState) error {
 	return nil
 }
-func (db *tEventLogDB) endRun(startTime int64, mkt *MarketWithHost, endTime int64) error { return nil }
+func (db *tEventLogDB) endRun(startTime int64, mkt *MarketWithHost) error { return nil }
 func (db *tEventLogDB) storeEvent(startTime int64, mkt *MarketWithHost, e *MarketMakingEvent, fs *BalanceState) {
 	db.storedEventsMtx.Lock()
 	defer db.storedEventsMtx.Unlock()