Merge pull request #16 from synfinatic/timestamps

Determine timestamps better & fix cache

Author: synfinatic

Makefile

@@ -9,7 +9,7 @@ endif
 BUILDINFOSDET ?=
 PROGRAM_ARGS ?=
 
-PROJECT_VERSION           := 0.5.3
+PROJECT_VERSION           := 0.5.4
 DOCKER_REPO               := synfinatic
 PROJECT_NAME              := helium-analysis
 PROJECT_TAG               := $(shell git describe --tags 2>/dev/null $(git rev-list --tags --max-count=1))

cmd/challenges.go

@@ -362,7 +362,7 @@ func writeChallenges(challenges []Challenges, filename, address string, cnt int)
 }
 
 // read the cache file
-func readChallenges(filename, address string, expires int64, cnt int) ([]Challenges, error) {
+func loadChallenges(filename, address string, expires int64, cnt int) ([]Challenges, error) {
 	cache := ChallengeCache{}
 	bytes, err := ioutil.ReadFile(filename)
 	if err != nil {
@@ -373,12 +373,15 @@ func readChallenges(filename, address string, expires int64, cnt int) ([]Challen
 		return []Challenges{}, err
 	}
 	if cache.Time+expires < time.Now().Unix() {
-		return []Challenges{}, fmt.Errorf("Challenge cache is old. Auto-refreshing...")
+		return []Challenges{}, fmt.Errorf("Challenge cache is old.")
 	}
 	if cache.Count != cnt {
-		return []Challenges{}, fmt.Errorf("Challenge cache stored %d instead of %d records.  Auto-refreshing...",
+		return []Challenges{}, fmt.Errorf("Challenge cache stored %d instead of %d records.",
 			cache.Count, cnt)
 	}
+	if cache.Address != address {
+		return []Challenges{}, fmt.Errorf("Challenge cache is for different hotspot.")
+	}
 
 	return cache.Challenges, nil
 }
@@ -464,14 +467,13 @@ func getDistance(aHost, bHost Hotspot) (float64, float64, error) {
 func getTimeForHeight(height int64, challenges []Challenges) (int64, error) {
 	var t_height int64 = math.MaxInt64
 	var t int64 = 0
+	var err error
 	for _, c := range challenges {
 		if c.Height <= t_height && c.Height > height {
-			p := *c.Path
-			if p[0].Receipt == nil {
+			t, err = c.GetTimestamp()
+			if err != nil {
 				continue
 			}
-			r := *p[0].Receipt
-			t = r.Timestamp
 			t_height = c.Height
 		}
 	}
@@ -480,3 +482,25 @@ func getTimeForHeight(height int64, challenges []Challenges) (int64, error) {
 	}
 	return 0, fmt.Errorf("Unable to find time for height %d", height)
 }
+
+// Tries to figure out the Timestamp for the given challenge
+func (c *Challenges) GetTimestamp() (int64, error) {
+	if c.Path == nil {
+		return 0, fmt.Errorf("No paths: unable to determine timestamp for %s@%d",
+			c.Type, c.Time)
+	}
+	p := *c.Path
+
+	if p[0].Receipt != nil {
+		r := p[0].Receipt
+		return r.Timestamp, nil
+	}
+
+	if p[0].Witnesses != nil {
+		w := *p[0].Witnesses
+		return w[0].Timestamp, nil
+	}
+
+	return 0, fmt.Errorf("No data: unable to determine timestamp for %s@%d",
+		c.Type, c.Time)
+}

cmd/graph.go

@@ -293,13 +293,18 @@ func generatePeerGraphs(address string, challenges []Challenges, min int, zoom b
 	x_min := 0.0
 	x_max := 0.0
 	if !zoom {
-		c := *challenges[0].Path
-		p := *c[0].Witnesses
-		x_max = float64(p[0].Timestamp)
-		last := len(challenges) - 1
-		c = *challenges[last].Path
-		p = *c[0].Witnesses
-		x_min = float64(p[0].Timestamp)
+		for i := 0; x_max == 0; i++ {
+			max, err := challenges[i].GetTimestamp()
+			if err == nil {
+				x_max = float64(max)
+			}
+		}
+		for i := len(challenges) - 1; x_min == 0; i-- {
+			min, err := challenges[i].GetTimestamp()
+			if err == nil {
+				x_min = float64(min)
+			}
+		}
 	}
 
 	cnt := 0

cmd/main.go

@@ -116,7 +116,7 @@ func main() {
 			log.Fatalf("%s", err)
 		}
 	} else {
-		c, err = readChallenges(CHALLENGES_CACHE_FILE, address, challengesExpires*3600, challengesCnt)
+		c, err = loadChallenges(CHALLENGES_CACHE_FILE, address, challengesExpires*3600, challengesCnt)
 		if err != nil {
 			log.WithError(err).Warnf("Unable to load challenges file. Refreshing...")
 			c, err = fetchChallenges(address, challengesCnt)