Change ZWithKey

commands.go

@@ -1554,8 +1554,7 @@ 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
 }
 

commands_test.go

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