From 953a08d84170945d78f2e12080a8907d499e0d25 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Fri, 8 Apr 2016 11:36:41 -0700
Subject: [PATCH] *: clean up from gosimple

---
 clientv3/lease.go                                   |  6 +-----
 etcdserver/api/v3rpc/key.go                         |  6 +-----
 etcdserver/auth/auth.go                             | 11 ++---------
 etcdserver/storage.go                               |  6 +-----
 storage/backend/backend.go                          |  6 +-----
 tools/functional-tester/etcd-agent/client/client.go |  5 +----
 tools/functional-tester/etcd-tester/failure.go      |  5 +----
 7 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/clientv3/lease.go b/clientv3/lease.go
index e719de6c7..2b749feff 100644
--- a/clientv3/lease.go
+++ b/clientv3/lease.go
@@ -381,11 +381,7 @@ func (l *lessor) switchRemoteAndStream(prevErr error) error {
 	l.remote = pb.NewLeaseClient(l.conn)
 	l.mu.Unlock()
 
-	serr := l.newStream()
-	if serr != nil {
-		return serr
-	}
-	return nil
+	return l.newStream()
 }
 
 func (l *lessor) newStream() error {
diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go
index c7f2f9d56..72d0e6261 100644
--- a/etcdserver/api/v3rpc/key.go
+++ b/etcdserver/api/v3rpc/key.go
@@ -169,11 +169,7 @@ func checkTxnRequest(r *pb.TxnRequest) error {
 			return err
 		}
 	}
-	if err := checkRequestDupKeys(r.Failure); err != nil {
-		return err
-	}
-
-	return nil
+	return checkRequestDupKeys(r.Failure)
 }
 
 // checkRequestDupKeys gives rpctypes.ErrDuplicateKey if the same key is modified twice
diff --git a/etcdserver/auth/auth.go b/etcdserver/auth/auth.go
index 94922b767..e59edcbc0 100644
--- a/etcdserver/auth/auth.go
+++ b/etcdserver/auth/auth.go
@@ -335,11 +335,7 @@ func (s *store) GetRole(name string) (Role, error) {
 	}
 	var r Role
 	err = json.Unmarshal([]byte(*resp.Event.Node.Value), &r)
-	if err != nil {
-		return r, err
-	}
-
-	return r, nil
+	return r, err
 }
 
 func (s *store) CreateRole(role Role) error {
@@ -497,10 +493,7 @@ func (r Role) merge(n Role) (Role, error) {
 		return out, err
 	}
 	out.Permissions, err = out.Permissions.Revoke(n.Revoke)
-	if err != nil {
-		return out, err
-	}
-	return out, nil
+	return out, err
 }
 
 func (r Role) HasKeyAccess(key string, write bool) bool {
diff --git a/etcdserver/storage.go b/etcdserver/storage.go
index 26aa69d89..8a0199e57 100644
--- a/etcdserver/storage.go
+++ b/etcdserver/storage.go
@@ -66,11 +66,7 @@ func (st *storage) SaveSnap(snap raftpb.Snapshot) error {
 	if err != nil {
 		return err
 	}
-	err = st.WAL.ReleaseLockTo(snap.Metadata.Index)
-	if err != nil {
-		return err
-	}
-	return nil
+	return st.WAL.ReleaseLockTo(snap.Metadata.Index)
 }
 
 func readWAL(waldir string, snap walpb.Snapshot) (w *wal.WAL, id, cid types.ID, st raftpb.HardState, ents []raftpb.Entry) {
diff --git a/storage/backend/backend.go b/storage/backend/backend.go
index 05c22162b..05cb350a3 100644
--- a/storage/backend/backend.go
+++ b/storage/backend/backend.go
@@ -297,11 +297,7 @@ func defragdb(odb, tmpdb *bolt.DB, limit int) error {
 				tmpb = tmptx.Bucket(next)
 				count = 0
 			}
-			err = tmpb.Put(k, v)
-			if err != nil {
-				return err
-			}
-			return nil
+			return tmpb.Put(k, v)
 		})
 	}
 
diff --git a/tools/functional-tester/etcd-agent/client/client.go b/tools/functional-tester/etcd-agent/client/client.go
index 5e9fe7ad4..535cb1e9b 100644
--- a/tools/functional-tester/etcd-agent/client/client.go
+++ b/tools/functional-tester/etcd-agent/client/client.go
@@ -96,10 +96,7 @@ func (a *agent) RecoverPort(port int) error {
 func (a *agent) Status() (Status, error) {
 	var s Status
 	err := a.rpcClient.Call("Agent.RPCStatus", struct{}{}, &s)
-	if err != nil {
-		return s, err
-	}
-	return s, nil
+	return s, err
 }
 
 func (a *agent) ID() uint64 {
diff --git a/tools/functional-tester/etcd-tester/failure.go b/tools/functional-tester/etcd-tester/failure.go
index b9775cb4c..6b4b15f7c 100644
--- a/tools/functional-tester/etcd-tester/failure.go
+++ b/tools/functional-tester/etcd-tester/failure.go
@@ -257,10 +257,7 @@ func newFailureIsolate() *failureIsolate {
 
 func (f *failureIsolate) Inject(c *cluster, round int) error {
 	i := round % c.Size
-	if err := c.Agents[i].DropPort(peerURLPort); err != nil {
-		return err
-	}
-	return nil
+	return c.Agents[i].DropPort(peerURLPort)
 }
 
 func (f *failureIsolate) Recover(c *cluster, round int) error {