.

wcfs/δbtail_test.go

@@ -227,18 +227,18 @@ func XGetKV(db *zodb.DB, at zodb.Tid, kvOid map[Key]Value) map[Key]string {
 func xverifyΔBTail(t *testing.T, subj string, db *zodb.DB, treeRoot zodb.Oid, at1, at2 zodb.Tid, kv1, kv2 map[Key]string, δZ *zodb.EventCommit) {
 	d12 := kvdiff(kv1, kv2)
 
-	// verify transition at1->at2 for all initial states of tracked {keys} from kv1 + ∞
-	keyv1 := []Key{10000} // inf, simulating ZBigFile.Size() query
-	for k1 := range kv1 {
-		keyv1 = append(keyv1, k1)
-	}
-	sort.Slice(keyv1, func(i, j int) bool {
-		return keyv1[i] < keyv1[j]
+	// verify transition at1->at2 for all initial states of tracked {keys} from kv1 + kv2 + ∞
+	allKeys := SetKey{}; allKeys.Add(10000) // inf, simulating ZBigFile.Size() query
+	for k := range kv1 { allKeys.Add(k) }
+	for k := range kv2 { allKeys.Add(k) }
+	allKeyv := allKeys.Elements()
+	sort.Slice(allKeyv, func(i, j int) bool {
+		return allKeyv[i] < allKeyv[j]
 	})
-	for kidx := range IntSets(len(keyv1)) {
+	for kidx := range IntSets(len(allKeyv)) {
 		keys := SetKey{}
 		for _, idx := range kidx {
-			keys.Add(keyv1[idx])
+			keys.Add(allKeyv[idx])
 		}
 
 		xverifyΔBTail1(t, subj, db, treeRoot, at1,at2, kv1,kv2, d12, δZ, keys)