Skip to content

Commit b8caba9

Browse files
kamacikaralabe
kamaci
authored and
karalabe
committed
various: remove redundant parentheses (#15793)
1 parent 9d48dbf commit b8caba9

File tree

12 files changed

+22
-22
lines changed

12 files changed

+22
-22
lines changed

‎accounts/abi/argument.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func (arguments Arguments) Pack(args ...interface{}) ([]byte, error) {
202202
inputOffset := 0
203203
for _, abiArg := range abiArgs {
204204
if abiArg.Type.T == ArrayTy {
205-
inputOffset += (32 * abiArg.Type.Size)
205+
inputOffset += 32 * abiArg.Type.Size
206206
} else {
207207
inputOffset += 32
208208
}

‎cmd/swarm/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ func checkDeprecated(ctx *cli.Context) {
315315
func printConfig(config *bzzapi.Config) string {
316316
out, err := tomlSettings.Marshal(&config)
317317
if err != nil {
318-
return (fmt.Sprintf("Something is not right with the configuration: %v", err))
318+
return fmt.Sprintf("Something is not right with the configuration: %v", err)
319319
}
320320
return string(out)
321321
}

‎common/bitutil/bitutil.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func fastXORBytes(dst, a, b []byte) int {
4040
dw[i] = aw[i] ^ bw[i]
4141
}
4242
}
43-
for i := (n - n%wordSize); i < n; i++ {
43+
for i := n - n%wordSize; i < n; i++ {
4444
dst[i] = a[i] ^ b[i]
4545
}
4646
return n
@@ -84,7 +84,7 @@ func fastANDBytes(dst, a, b []byte) int {
8484
dw[i] = aw[i] & bw[i]
8585
}
8686
}
87-
for i := (n - n%wordSize); i < n; i++ {
87+
for i := n - n%wordSize; i < n; i++ {
8888
dst[i] = a[i] & b[i]
8989
}
9090
return n
@@ -128,7 +128,7 @@ func fastORBytes(dst, a, b []byte) int {
128128
dw[i] = aw[i] | bw[i]
129129
}
130130
}
131-
for i := (n - n%wordSize); i < n; i++ {
131+
for i := n - n%wordSize; i < n; i++ {
132132
dst[i] = a[i] | b[i]
133133
}
134134
return n
@@ -168,7 +168,7 @@ func fastTestBytes(p []byte) bool {
168168
}
169169
}
170170
}
171-
for i := (n - n%wordSize); i < n; i++ {
171+
for i := n - n%wordSize; i < n; i++ {
172172
if p[i] != 0 {
173173
return true
174174
}

‎crypto/ecies/ecies.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ func (prv *PrivateKey) Decrypt(rand io.Reader, c, s1, s2 []byte) (m []byte, err
314314

315315
switch c[0] {
316316
case 2, 3, 4:
317-
rLen = ((prv.PublicKey.Curve.Params().BitSize + 7) / 4)
317+
rLen = (prv.PublicKey.Curve.Params().BitSize + 7) / 4
318318
if len(c) < (rLen + hLen + 1) {
319319
err = ErrInvalidMessage
320320
return

‎eth/handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,14 +394,14 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
394394
case query.Reverse:
395395
// Number based traversal towards the genesis block
396396
if query.Origin.Number >= query.Skip+1 {
397-
query.Origin.Number -= (query.Skip + 1)
397+
query.Origin.Number -= query.Skip + 1
398398
} else {
399399
unknown = true
400400
}
401401

402402
case !query.Reverse:
403403
// Number based traversal towards the leaf block
404-
query.Origin.Number += (query.Skip + 1)
404+
query.Origin.Number += query.Skip + 1
405405
}
406406
}
407407
return p.SendBlockHeaders(headers)

‎les/handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,14 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
454454
case query.Reverse:
455455
// Number based traversal towards the genesis block
456456
if query.Origin.Number >= query.Skip+1 {
457-
query.Origin.Number -= (query.Skip + 1)
457+
query.Origin.Number -= query.Skip + 1
458458
} else {
459459
unknown = true
460460
}
461461

462462
case !query.Reverse:
463463
// Number based traversal towards the leaf block
464-
query.Origin.Number += (query.Skip + 1)
464+
query.Origin.Number += query.Skip + 1
465465
}
466466
}
467467

‎les/serverpool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ func (e *knownEntry) Weight() int64 {
618618
if e.state != psNotConnected || !e.known || e.delayedRetry {
619619
return 0
620620
}
621-
return int64(1000000000 * e.connectStats.recentAvg() * math.Exp(-float64(e.lastConnected.fails)*failDropLn-e.responseStats.recentAvg()/float64(responseScoreTC)-e.delayStats.recentAvg()/float64(delayScoreTC)) * math.Pow((1-e.timeoutStats.recentAvg()), timeoutPow))
621+
return int64(1000000000 * e.connectStats.recentAvg() * math.Exp(-float64(e.lastConnected.fails)*failDropLn-e.responseStats.recentAvg()/float64(responseScoreTC)-e.delayStats.recentAvg()/float64(delayScoreTC)) * math.Pow(1-e.timeoutStats.recentAvg(), timeoutPow))
622622
}
623623

624624
// poolEntryAddress is a separate object because currently it is necessary to remember

‎swarm/storage/chunker_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (self *chunkerTester) Split(chunker Splitter, data io.Reader, size int64, c
6060
for {
6161
select {
6262
case <-timeout:
63-
return errors.New(("Split timeout error"))
63+
return errors.New("Split timeout error")
6464
case <-quitC:
6565
return nil
6666
case chunk := <-chunkC:
@@ -97,7 +97,7 @@ func (self *chunkerTester) Append(chunker Splitter, rootKey Key, data io.Reader,
9797
for {
9898
select {
9999
case <-timeout:
100-
return errors.New(("Append timeout error"))
100+
return errors.New("Append timeout error")
101101
case <-quitC:
102102
return nil
103103
case chunk := <-chunkC:
@@ -146,7 +146,7 @@ func (self *chunkerTester) Join(chunker Chunker, key Key, c int, chunkC chan *Ch
146146
for {
147147
select {
148148
case <-timeout:
149-
return errors.New(("Join timeout error"))
149+
return errors.New("Join timeout error")
150150
case chunk, ok := <-chunkC:
151151
if !ok {
152152
close(quitC)
@@ -155,7 +155,7 @@ func (self *chunkerTester) Join(chunker Chunker, key Key, c int, chunkC chan *Ch
155155
// this just mocks the behaviour of a chunk store retrieval
156156
stored, success := self.chunks[chunk.Key.String()]
157157
if !success {
158-
return errors.New(("Not found"))
158+
return errors.New("Not found")
159159
}
160160
chunk.SData = stored.SData
161161
chunk.Size = int64(binary.LittleEndian.Uint64(chunk.SData[0:8]))

‎swarm/storage/pyramid.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ func (self *PyramidChunker) loadTree(chunkLevel [][]*TreeEntry, key Key, chunkC
338338
chunkLevel[depth-1] = append(chunkLevel[depth-1], newEntry)
339339

340340
// Add the rest of the tree
341-
for lvl := (depth - 1); lvl >= 1; lvl-- {
341+
for lvl := depth - 1; lvl >= 1; lvl-- {
342342

343343
//TODO(jmozah): instead of loading finished branches and then trim in the end,
344344
//avoid loading them in the first place

‎trie/trie.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ func (t *Trie) Commit() (root common.Hash, err error) {
489489
func (t *Trie) CommitTo(db DatabaseWriter) (root common.Hash, err error) {
490490
hash, cached, err := t.hashRoot(db)
491491
if err != nil {
492-
return (common.Hash{}), err
492+
return common.Hash{}, err
493493
}
494494
t.root = cached
495495
t.cachegen++

‎whisper/whisperv5/filter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func generateTestCases(t *testing.T, SizeTestFilters int) []FilterTestCase {
8888
for i := 0; i < SizeTestFilters; i++ {
8989
f, _ := generateFilter(t, true)
9090
cases[i].f = f
91-
cases[i].alive = (mrand.Int()&int(1) == 0)
91+
cases[i].alive = mrand.Int()&int(1) == 0
9292
}
9393
return cases
9494
}
@@ -122,7 +122,7 @@ func TestInstallFilters(t *testing.T) {
122122

123123
for i, testCase := range tst {
124124
fil := filters.Get(testCase.id)
125-
exist := (fil != nil)
125+
exist := fil != nil
126126
if exist != testCase.alive {
127127
t.Fatalf("seed %d: failed alive: %d, %v, %v", seed, i, exist, testCase.alive)
128128
}

‎whisper/whisperv6/filter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func generateTestCases(t *testing.T, SizeTestFilters int) []FilterTestCase {
8888
for i := 0; i < SizeTestFilters; i++ {
8989
f, _ := generateFilter(t, true)
9090
cases[i].f = f
91-
cases[i].alive = (mrand.Int()&int(1) == 0)
91+
cases[i].alive = mrand.Int()&int(1) == 0
9292
}
9393
return cases
9494
}
@@ -122,7 +122,7 @@ func TestInstallFilters(t *testing.T) {
122122

123123
for i, testCase := range tst {
124124
fil := filters.Get(testCase.id)
125-
exist := (fil != nil)
125+
exist := fil != nil
126126
if exist != testCase.alive {
127127
t.Fatalf("seed %d: failed alive: %d, %v, %v", seed, i, exist, testCase.alive)
128128
}

0 commit comments

Comments
 (0)