Change ZWithKey

commands.go

@@ -1554,9 +1554,8 @@ type Z struct {
 
 // ZWithKey represents sorted set member including the name of the key where it was popped.
 type ZWithKey struct {
-	Score  float64
+	Z
-	Member interface{}
+	Key string
-	Key    string
 }
 
 // ZStore is used as an arg to ZInterStore and ZUnionStore.

commands_test.go

@@ -2138,9 +2138,11 @@ var _ = Describe("Commands", func() {
 			member, err := client.BZPopMax(0, "zset1", "zset2").Result()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(member).To(Equal(redis.ZWithKey{
-				Score:  3,
+				Z: redis.Z{
-				Member: "three",
+					Score:  3,
-				Key:    "zset1",
+					Member: "three",
+				},
+				Key: "zset1",
 			}))
 		})
 
@@ -2154,9 +2156,11 @@ var _ = Describe("Commands", func() {
 				bZPopMax := client.BZPopMax(0, "zset")
 				Expect(bZPopMax.Err()).NotTo(HaveOccurred())
 				Expect(bZPopMax.Val()).To(Equal(redis.ZWithKey{
-					Member: "a",
+					Z: redis.Z{
-					Score:  1,
+						Member: "a",
-					Key:    "zset",
+						Score:  1,
+					},
+					Key: "zset",
 				}))
 				done <- true
 			}()
@@ -2216,9 +2220,11 @@ var _ = Describe("Commands", func() {
 			member, err := client.BZPopMin(0, "zset1", "zset2").Result()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(member).To(Equal(redis.ZWithKey{
-				Score:  1,
+				Z: redis.Z{
-				Member: "one",
+					Score:  1,
-				Key:    "zset1",
+					Member: "one",
+				},
+				Key: "zset1",
 			}))
 		})
 
@@ -2232,9 +2238,11 @@ var _ = Describe("Commands", func() {
 				bZPopMin := client.BZPopMin(0, "zset")
 				Expect(bZPopMin.Err()).NotTo(HaveOccurred())
 				Expect(bZPopMin.Val()).To(Equal(redis.ZWithKey{
-					Member: "a",
+					Z: redis.Z{
-					Score:  1,
+						Member: "a",
-					Key:    "zset",
+						Score:  1,
+					},
+					Key: "zset",
 				}))
 				done <- true
 			}()