upgrade grpc & etcd dependencies (#771)

zrpc/internal/balancer/p2c/p2c_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/tal-tech/go-zero/core/logx"
 	"github.com/tal-tech/go-zero/core/mathx"
 	"google.golang.org/grpc/balancer"
+	"google.golang.org/grpc/balancer/base"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/resolver"
 	"google.golang.org/grpc/status"
@@ -23,8 +24,8 @@ func init() {
 
 func TestP2cPicker_PickNil(t *testing.T) {
 	builder := new(p2cPickerBuilder)
-	picker := builder.Build(nil)
-	_, _, err := picker.Pick(context.Background(), balancer.PickInfo{
+	picker := builder.Build(base.PickerBuildInfo{})
+	_, err := picker.Pick(balancer.PickInfo{
 		FullMethodName: "/",
 		Ctx:            context.Background(),
 	})
@@ -61,18 +62,22 @@ func TestP2cPicker_Pick(t *testing.T) {
 
 			const total = 10000
 			builder := new(p2cPickerBuilder)
-			ready := make(map[resolver.Address]balancer.SubConn)
+			ready := make(map[balancer.SubConn]base.SubConnInfo)
 			for i := 0; i < test.candidates; i++ {
-				ready[resolver.Address{
-					Addr: strconv.Itoa(i),
-				}] = new(mockClientConn)
+				ready[new(mockClientConn)] = base.SubConnInfo{
+					Address: resolver.Address{
+						Addr: strconv.Itoa(i),
+					},
+				}
 			}
 
-			picker := builder.Build(ready)
+			picker := builder.Build(base.PickerBuildInfo{
+				ReadySCs: ready,
+			})
 			var wg sync.WaitGroup
 			wg.Add(total)
 			for i := 0; i < total; i++ {
-				_, done, err := picker.Pick(context.Background(), balancer.PickInfo{
+				result, err := picker.Pick(balancer.PickInfo{
 					FullMethodName: "/",
 					Ctx:            context.Background(),
 				})
@@ -82,7 +87,7 @@ func TestP2cPicker_Pick(t *testing.T) {
 				}
 				go func() {
 					runtime.Gosched()
-					done(balancer.DoneInfo{
+					result.Done(balancer.DoneInfo{
 						Err: err,
 					})
 					wg.Done()