test

storage/redis.go

@@ -316,27 +316,37 @@ func convertPoolChartsResults(raw *redis.ZSliceCmd) []*PoolCharts {
 }
 
 func (r *RedisClient) GetNetCharts(netHashLen int64) (stats []*NetCharts, err error) {
-
     tx := r.client.Multi()
     defer tx.Close()
 
     now := util.MakeTimestamp() / 1000
 
     cmds, err := tx.Exec(func() error {
-		tx.ZRemRangeByScore(r.formatKey("charts", "difficulty"), "-inf", fmt.Sprint("(", now-172800))
-		tx.ZRevRangeWithScores(r.formatKey("charts", "difficulty"), 0, netHashLen)
+        if err := tx.ZRemRangeByScore(r.formatKey("charts", "difficulty"), "-inf", fmt.Sprint("(", now-172800)).Err(); err != nil {
+            return err
+        }
+        zRangeCmd := tx.ZRevRangeWithScores(r.formatKey("charts", "difficulty"), 0, netHashLen)
+        if zRangeCmd.Err() != nil {
+            return zRangeCmd.Err()
+        }
         return nil
     })
-
     if err != nil {
         return nil, err
     }
 
-	stats = convertNetChartsResults(cmds[1].(*redis.ZSliceCmd))
+    zSliceCmd, ok := cmds[1].(*redis.ZSliceCmd)
+    if !ok {
+        return nil, fmt.Errorf("invalid command result type: %T", cmds[1])
+    }
+    stats, err = convertNetChartsResults(zSliceCmd)
+    if err != nil {
+        return nil, err
+    }
     return stats, nil
 }
 
-func convertNetChartsResults(raw *redis.ZSliceCmd) []*NetCharts {
+func convertNetChartsResults(raw *redis.ZSliceCmd) ([]*NetCharts, error) {
     var result []*NetCharts
     for _, v := range raw.Val() {
         // "Timestamp:TimeFormat:Hash"
@@ -352,7 +362,7 @@ func convertNetChartsResults(raw *redis.ZSliceCmd) []*NetCharts {
     for i := len(result) - 1; i >= 0; i-- {
         reverse = append(reverse, result[i])
     }
-	return reverse
+    return reverse, nil
 }
 
 func convertMinerChartsResults(raw *redis.ZSliceCmd) []*MinerCharts {