From 7c02933275d8f67fbdf78cdc05c0e09af4ebc657 Mon Sep 17 00:00:00 2001
From: GagziW <leon.stanko@rwth-aachen.de>
Date: Thu, 3 May 2018 01:35:06 -0700
Subject: [PATCH] les: changed if-else blocks to conform with golint (#16658)

---
 les/distributor_test.go |  3 +--
 les/protocol.go         |  3 +--
 les/randselect.go       | 25 +++++++++++--------------
 les/serverpool.go       |  3 +--
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/les/distributor_test.go b/les/distributor_test.go
index 55defb69b..2891bcab4 100644
--- a/les/distributor_test.go
+++ b/les/distributor_test.go
@@ -97,9 +97,8 @@ func (p *testDistPeer) waitBefore(cost uint64) (time.Duration, float64) {
 	p.lock.RUnlock()
 	if sumCost < testDistBufLimit {
 		return 0, float64(testDistBufLimit-sumCost) / float64(testDistBufLimit)
-	} else {
-		return time.Duration(sumCost - testDistBufLimit), 0
 	}
+	return time.Duration(sumCost - testDistBufLimit), 0
 }
 
 func (p *testDistPeer) canQueue() bool {
diff --git a/les/protocol.go b/les/protocol.go
index e1c4625bc..46bff2635 100644
--- a/les/protocol.go
+++ b/les/protocol.go
@@ -160,9 +160,8 @@ func (a *announceData) checkSignature(pubKey *ecdsa.PublicKey) error {
 	pbytes := elliptic.Marshal(pubKey.Curve, pubKey.X, pubKey.Y)
 	if bytes.Equal(pbytes, recPubkey) {
 		return nil
-	} else {
-		return errors.New("Wrong signature")
 	}
+	return errors.New("Wrong signature")
 }
 
 type blockInfo struct {
diff --git a/les/randselect.go b/les/randselect.go
index 1a9d0695b..1cc1d3d3e 100644
--- a/les/randselect.go
+++ b/les/randselect.go
@@ -118,17 +118,16 @@ func (n *wrsNode) insert(item wrsItem, weight int64) int {
 	if n.level == 0 {
 		n.items[branch] = item
 		return branch
-	} else {
-		var subNode *wrsNode
-		if n.items[branch] == nil {
-			subNode = &wrsNode{maxItems: n.maxItems / wrsBranches, level: n.level - 1}
-			n.items[branch] = subNode
-		} else {
-			subNode = n.items[branch].(*wrsNode)
-		}
-		subIdx := subNode.insert(item, weight)
-		return subNode.maxItems*branch + subIdx
 	}
+	var subNode *wrsNode
+	if n.items[branch] == nil {
+		subNode = &wrsNode{maxItems: n.maxItems / wrsBranches, level: n.level - 1}
+		n.items[branch] = subNode
+	} else {
+		subNode = n.items[branch].(*wrsNode)
+	}
+	subIdx := subNode.insert(item, weight)
+	return subNode.maxItems*branch + subIdx
 }
 
 // setWeight updates the weight of a certain item (which should exist) and returns
@@ -162,12 +161,10 @@ func (n *wrsNode) choose(val int64) (wrsItem, int64) {
 		if val < w {
 			if n.level == 0 {
 				return n.items[i].(wrsItem), n.weights[i]
-			} else {
-				return n.items[i].(*wrsNode).choose(val)
 			}
-		} else {
-			val -= w
+			return n.items[i].(*wrsNode).choose(val)
 		}
+		val -= w
 	}
 	panic(nil)
 }
diff --git a/les/serverpool.go b/les/serverpool.go
index da73b4b3c..a39f88355 100644
--- a/les/serverpool.go
+++ b/les/serverpool.go
@@ -601,9 +601,8 @@ func (e *discoveredEntry) Weight() int64 {
 	t := time.Duration(mclock.Now() - e.lastDiscovered)
 	if t <= discoverExpireStart {
 		return 1000000000
-	} else {
-		return int64(1000000000 * math.Exp(-float64(t-discoverExpireStart)/float64(discoverExpireConst)))
 	}
+	return int64(1000000000 * math.Exp(-float64(t-discoverExpireStart)/float64(discoverExpireConst)))
 }
 
 // knownEntry implements wrsItem