From dd465d0e40a78377394af5d90495e0e70603416d Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Wed, 22 Mar 2017 00:59:05 -0700 Subject: [PATCH] clientv3: remove redundant error handling code --- clientv3/cluster.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/clientv3/cluster.go b/clientv3/cluster.go index b9bff626b..ab2825b10 100644 --- a/clientv3/cluster.go +++ b/clientv3/cluster.go @@ -53,25 +53,19 @@ func NewCluster(c *Client) Cluster { func (c *cluster) MemberAdd(ctx context.Context, peerAddrs []string) (*MemberAddResponse, error) { r := &pb.MemberAddRequest{PeerURLs: peerAddrs} resp, err := c.remote.MemberAdd(ctx, r) - if err == nil { - return (*MemberAddResponse)(resp), nil - } - if isHaltErr(ctx, err) { + if err != nil { return nil, toErr(ctx, err) } - return nil, toErr(ctx, err) + return (*MemberAddResponse)(resp), nil } func (c *cluster) MemberRemove(ctx context.Context, id uint64) (*MemberRemoveResponse, error) { r := &pb.MemberRemoveRequest{ID: id} resp, err := c.remote.MemberRemove(ctx, r) - if err == nil { - return (*MemberRemoveResponse)(resp), nil - } - if isHaltErr(ctx, err) { + if err != nil { return nil, toErr(ctx, err) } - return nil, toErr(ctx, err) + return (*MemberRemoveResponse)(resp), nil } func (c *cluster) MemberUpdate(ctx context.Context, id uint64, peerAddrs []string) (*MemberUpdateResponse, error) {