clientv3: remove ineffective nil check
@@ -23,7 +23,7 @@ import (
v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
- mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
+ "go.etcd.io/etcd/mvcc/mvccpb"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
@@ -402,10 +402,7 @@ func (w *watcher) RequestProgress(ctx context.Context) (err error) {
case reqc <- pr:
return nil
case <-ctx.Done():
- if err == nil {
return ctx.Err()
- }
- return err
case <-donec:
if wgs.closeErr != nil {
return wgs.closeErr
