aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGagziW <leon.stanko@rwth-aachen.de>2018-05-03 16:35:06 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-05-03 16:35:06 +0800
commit7c02933275d8f67fbdf78cdc05c0e09af4ebc657 (patch)
tree0f22379f2b9cb4d2c8731c570409c2b191a1603d
parentf2447bd4c35573d40e2ef678809657c5a1d4e999 (diff)
downloadgo-tangerine-7c02933275d8f67fbdf78cdc05c0e09af4ebc657.tar
go-tangerine-7c02933275d8f67fbdf78cdc05c0e09af4ebc657.tar.gz
go-tangerine-7c02933275d8f67fbdf78cdc05c0e09af4ebc657.tar.bz2
go-tangerine-7c02933275d8f67fbdf78cdc05c0e09af4ebc657.tar.lz
go-tangerine-7c02933275d8f67fbdf78cdc05c0e09af4ebc657.tar.xz
go-tangerine-7c02933275d8f67fbdf78cdc05c0e09af4ebc657.tar.zst
go-tangerine-7c02933275d8f67fbdf78cdc05c0e09af4ebc657.zip
les: changed if-else blocks to conform with golint (#16658)
-rw-r--r--les/distributor_test.go3
-rw-r--r--les/protocol.go3
-rw-r--r--les/randselect.go23
-rw-r--r--les/serverpool.go3
4 files changed, 13 insertions, 19 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
+ }
+ var subNode *wrsNode
+ if n.items[branch] == nil {
+ subNode = &wrsNode{maxItems: n.maxItems / wrsBranches, level: n.level - 1}
+ n.items[branch] = subNode
} 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
+ 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