Skip to content

Commit

Permalink
various: remove redundant parentheses (ethereum#15793)
Browse files Browse the repository at this point in the history
  • Loading branch information
kamaci authored and karalabe committed Jan 3, 2018
1 parent 9d48dbf commit b8caba9
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion accounts/abi/argument.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func (arguments Arguments) Pack(args ...interface{}) ([]byte, error) {
inputOffset := 0
for _, abiArg := range abiArgs {
if abiArg.Type.T == ArrayTy {
inputOffset += (32 * abiArg.Type.Size)
inputOffset += 32 * abiArg.Type.Size
} else {
inputOffset += 32
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/swarm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ func checkDeprecated(ctx *cli.Context) {
func printConfig(config *bzzapi.Config) string {
out, err := tomlSettings.Marshal(&config)
if err != nil {
return (fmt.Sprintf("Something is not right with the configuration: %v", err))
return fmt.Sprintf("Something is not right with the configuration: %v", err)
}
return string(out)
}
8 changes: 4 additions & 4 deletions common/bitutil/bitutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func fastXORBytes(dst, a, b []byte) int {
dw[i] = aw[i] ^ bw[i]
}
}
for i := (n - n%wordSize); i < n; i++ {
for i := n - n%wordSize; i < n; i++ {
dst[i] = a[i] ^ b[i]
}
return n
Expand Down Expand Up @@ -84,7 +84,7 @@ func fastANDBytes(dst, a, b []byte) int {
dw[i] = aw[i] & bw[i]
}
}
for i := (n - n%wordSize); i < n; i++ {
for i := n - n%wordSize; i < n; i++ {
dst[i] = a[i] & b[i]
}
return n
Expand Down Expand Up @@ -128,7 +128,7 @@ func fastORBytes(dst, a, b []byte) int {
dw[i] = aw[i] | bw[i]
}
}
for i := (n - n%wordSize); i < n; i++ {
for i := n - n%wordSize; i < n; i++ {
dst[i] = a[i] | b[i]
}
return n
Expand Down Expand Up @@ -168,7 +168,7 @@ func fastTestBytes(p []byte) bool {
}
}
}
for i := (n - n%wordSize); i < n; i++ {
for i := n - n%wordSize; i < n; i++ {
if p[i] != 0 {
return true
}
Expand Down
2 changes: 1 addition & 1 deletion crypto/ecies/ecies.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ func (prv *PrivateKey) Decrypt(rand io.Reader, c, s1, s2 []byte) (m []byte, err

switch c[0] {
case 2, 3, 4:
rLen = ((prv.PublicKey.Curve.Params().BitSize + 7) / 4)
rLen = (prv.PublicKey.Curve.Params().BitSize + 7) / 4
if len(c) < (rLen + hLen + 1) {
err = ErrInvalidMessage
return
Expand Down
4 changes: 2 additions & 2 deletions eth/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,14 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
case query.Reverse:
// Number based traversal towards the genesis block
if query.Origin.Number >= query.Skip+1 {
query.Origin.Number -= (query.Skip + 1)
query.Origin.Number -= query.Skip + 1
} else {
unknown = true
}

case !query.Reverse:
// Number based traversal towards the leaf block
query.Origin.Number += (query.Skip + 1)
query.Origin.Number += query.Skip + 1
}
}
return p.SendBlockHeaders(headers)
Expand Down
4 changes: 2 additions & 2 deletions les/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -454,14 +454,14 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
case query.Reverse:
// Number based traversal towards the genesis block
if query.Origin.Number >= query.Skip+1 {
query.Origin.Number -= (query.Skip + 1)
query.Origin.Number -= query.Skip + 1
} else {
unknown = true
}

case !query.Reverse:
// Number based traversal towards the leaf block
query.Origin.Number += (query.Skip + 1)
query.Origin.Number += query.Skip + 1
}
}

Expand Down
2 changes: 1 addition & 1 deletion les/serverpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ func (e *knownEntry) Weight() int64 {
if e.state != psNotConnected || !e.known || e.delayedRetry {
return 0
}
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))
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))
}

// poolEntryAddress is a separate object because currently it is necessary to remember
Expand Down
8 changes: 4 additions & 4 deletions swarm/storage/chunker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (self *chunkerTester) Split(chunker Splitter, data io.Reader, size int64, c
for {
select {
case <-timeout:
return errors.New(("Split timeout error"))
return errors.New("Split timeout error")
case <-quitC:
return nil
case chunk := <-chunkC:
Expand Down Expand Up @@ -97,7 +97,7 @@ func (self *chunkerTester) Append(chunker Splitter, rootKey Key, data io.Reader,
for {
select {
case <-timeout:
return errors.New(("Append timeout error"))
return errors.New("Append timeout error")
case <-quitC:
return nil
case chunk := <-chunkC:
Expand Down Expand Up @@ -146,7 +146,7 @@ func (self *chunkerTester) Join(chunker Chunker, key Key, c int, chunkC chan *Ch
for {
select {
case <-timeout:
return errors.New(("Join timeout error"))
return errors.New("Join timeout error")
case chunk, ok := <-chunkC:
if !ok {
close(quitC)
Expand All @@ -155,7 +155,7 @@ func (self *chunkerTester) Join(chunker Chunker, key Key, c int, chunkC chan *Ch
// this just mocks the behaviour of a chunk store retrieval
stored, success := self.chunks[chunk.Key.String()]
if !success {
return errors.New(("Not found"))
return errors.New("Not found")
}
chunk.SData = stored.SData
chunk.Size = int64(binary.LittleEndian.Uint64(chunk.SData[0:8]))
Expand Down
2 changes: 1 addition & 1 deletion swarm/storage/pyramid.go
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ func (self *PyramidChunker) loadTree(chunkLevel [][]*TreeEntry, key Key, chunkC
chunkLevel[depth-1] = append(chunkLevel[depth-1], newEntry)

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

//TODO(jmozah): instead of loading finished branches and then trim in the end,
//avoid loading them in the first place
Expand Down
2 changes: 1 addition & 1 deletion trie/trie.go
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ func (t *Trie) Commit() (root common.Hash, err error) {
func (t *Trie) CommitTo(db DatabaseWriter) (root common.Hash, err error) {
hash, cached, err := t.hashRoot(db)
if err != nil {
return (common.Hash{}), err
return common.Hash{}, err
}
t.root = cached
t.cachegen++
Expand Down
4 changes: 2 additions & 2 deletions whisper/whisperv5/filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func generateTestCases(t *testing.T, SizeTestFilters int) []FilterTestCase {
for i := 0; i < SizeTestFilters; i++ {
f, _ := generateFilter(t, true)
cases[i].f = f
cases[i].alive = (mrand.Int()&int(1) == 0)
cases[i].alive = mrand.Int()&int(1) == 0
}
return cases
}
Expand Down Expand Up @@ -122,7 +122,7 @@ func TestInstallFilters(t *testing.T) {

for i, testCase := range tst {
fil := filters.Get(testCase.id)
exist := (fil != nil)
exist := fil != nil
if exist != testCase.alive {
t.Fatalf("seed %d: failed alive: %d, %v, %v", seed, i, exist, testCase.alive)
}
Expand Down
4 changes: 2 additions & 2 deletions whisper/whisperv6/filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func generateTestCases(t *testing.T, SizeTestFilters int) []FilterTestCase {
for i := 0; i < SizeTestFilters; i++ {
f, _ := generateFilter(t, true)
cases[i].f = f
cases[i].alive = (mrand.Int()&int(1) == 0)
cases[i].alive = mrand.Int()&int(1) == 0
}
return cases
}
Expand Down Expand Up @@ -122,7 +122,7 @@ func TestInstallFilters(t *testing.T) {

for i, testCase := range tst {
fil := filters.Get(testCase.id)
exist := (fil != nil)
exist := fil != nil
if exist != testCase.alive {
t.Fatalf("seed %d: failed alive: %d, %v, %v", seed, i, exist, testCase.alive)
}
Expand Down

0 comments on commit b8caba9

Please sign in to comment.