Merge branch 'master' into raul/mel-replay-receipt-walking

Author: eljobe

util/redisutil/redis_coordinator.go

@@ -138,9 +138,11 @@ func (rc *RedisCoordinator) GetPriorities(ctx context.Context) ([]string, error)
 // GetLiveliness returns a list of sequencers that have their liveliness set to OK
 func (rc *RedisCoordinator) GetLiveliness(ctx context.Context) ([]string, error) {
 	var livelinessList []string
-	cursor := uint64(0)
+	var cursor uint64
 	for {
-		keySlice, cursor, err := rc.Client.Scan(ctx, cursor, WANTS_LOCKOUT_KEY_PREFIX+"*", 0).Result()
+		var keySlice []string
+		var err error
+		keySlice, cursor, err = rc.Client.Scan(ctx, cursor, WANTS_LOCKOUT_KEY_PREFIX+"*", 0).Result()
 		if err != nil {
 			return []string{}, err
 		}

util/redisutil/redis_coordinator_test.go

@@ -0,0 +1,41 @@
+// Copyright 2021-2022, Offchain Labs, Inc.
+// For license information, see https://github.com/OffchainLabs/nitro/blob/master/LICENSE.md
+
+package redisutil
+
+import (
+	"context"
+	"sort"
+	"testing"
+	"time"
+)
+
+func TestRedisCoordinatorGetLiveliness(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	redisUrl := CreateTestRedis(ctx, t)
+	redisCoordinator, err := NewRedisCoordinator(redisUrl, 0)
+	if err != nil {
+		t.Fatalf("error creating redis coordinator: %s", err.Error())
+	}
+	wantLivelinessList := []string{"a", "b", "c", "d", "e", "f"}
+	for _, url := range wantLivelinessList {
+		if _, err = redisCoordinator.Client.Set(ctx, WantsLockoutKeyFor(url), WANTS_LOCKOUT_VAL, time.Minute).Result(); err != nil {
+			t.Fatalf("error setting liveliness key for: %s err: %s", url, err.Error())
+		}
+	}
+	haveLivelinessList, err := redisCoordinator.GetLiveliness(ctx)
+	if err != nil {
+		t.Fatalf("error getting liveliness list: %s", err.Error())
+	}
+	sort.Strings(haveLivelinessList)
+	if len(wantLivelinessList) != len(haveLivelinessList) {
+		t.Fatalf("liveliness list length mismatch")
+	}
+	for i, want := range wantLivelinessList {
+		if haveLivelinessList[i] != want {
+			t.Fatalf("liveliness list url mismatch. want: %s have: %s", want, haveLivelinessList[i])
+		}
+	}
+}