From 3489fa82fbfb8b755082681dada29bdc120c3f80 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Thu, 1 Sep 2016 15:21:52 -0700 Subject: [PATCH] integration: don't nest proxies in cluster_proxy mode --- integration/cluster_proxy.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/integration/cluster_proxy.go b/integration/cluster_proxy.go index 526e5c48d..c5c76774f 100644 --- a/integration/cluster_proxy.go +++ b/integration/cluster_proxy.go @@ -52,9 +52,8 @@ func newClientV3(cfg clientv3.Config) (*clientv3.Client, error) { if err != nil { return nil, err } - - toGRPC(c) - c.KV = clientv3.NewKVFromKVClient(grpcproxy.KvServerToKvClient(grpcproxy.NewKvProxy(c))) - c.Watcher = clientv3.NewWatchFromWatchClient(grpcproxy.WatchServerToWatchClient(grpcproxy.NewWatchProxy(c))) + rpc := toGRPC(c) + c.KV = clientv3.NewKVFromKVClient(rpc.KV) + c.Watcher = clientv3.NewWatchFromWatchClient(rpc.Watch) return c, nil }