diff options
| author | ferhat elmas <elmas.ferhat@gmail.com> | 2017-11-11 01:06:45 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2017-11-11 01:06:45 +0800 |
| commit | 86f6568f6618945b19057553ec32690d723da982 (patch) | |
| tree | ea7d9f92f3bcf5af22be1edfdbb302b5a5161f14 /swarm/network/kademlia | |
| parent | 3ee86a57f328530707974288e9db87b7c05283f9 (diff) | |
| download | go-tangerine-86f6568f6618945b19057553ec32690d723da982.tar go-tangerine-86f6568f6618945b19057553ec32690d723da982.tar.gz go-tangerine-86f6568f6618945b19057553ec32690d723da982.tar.bz2 go-tangerine-86f6568f6618945b19057553ec32690d723da982.tar.lz go-tangerine-86f6568f6618945b19057553ec32690d723da982.tar.xz go-tangerine-86f6568f6618945b19057553ec32690d723da982.tar.zst go-tangerine-86f6568f6618945b19057553ec32690d723da982.zip | |
build: enable unconvert linter (#15456)
* build: enable unconvert linter
- fixes #15453
- update code base for failing cases
* cmd/puppeth: replace syscall.Stdin with os.Stdin.Fd() for unconvert linter
Diffstat (limited to 'swarm/network/kademlia')
| -rw-r--r-- | swarm/network/kademlia/address.go | 2 | ||||
| -rw-r--r-- | swarm/network/kademlia/kaddb.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/swarm/network/kademlia/address.go b/swarm/network/kademlia/address.go index 16c5ce532..4c38a846f 100644 --- a/swarm/network/kademlia/address.go +++ b/swarm/network/kademlia/address.go @@ -67,7 +67,7 @@ func proximity(one, other Address) (ret int) { for i := 0; i < len(one); i++ { oxo := one[i] ^ other[i] for j := 0; j < 8; j++ { - if (uint8(oxo)>>uint8(7-j))&0x01 != 0 { + if (oxo>>uint8(7-j))&0x01 != 0 { return i*8 + j } } diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go index 3e4b261fd..cb0869467 100644 --- a/swarm/network/kademlia/kaddb.go +++ b/swarm/network/kademlia/kaddb.go @@ -211,12 +211,12 @@ func (self *KadDb) findBest(maxBinSize int, binSize func(int) int) (node *NodeRe } // if node is scheduled to connect - if time.Time(node.After).After(time.Now()) { + if node.After.After(time.Now()) { log.Debug(fmt.Sprintf("kaddb record %v (PO%03d:%d) skipped. seen at %v (%v ago), scheduled at %v", node.Addr, po, cursor, node.Seen, delta, node.After)) continue ROW } - delta = time.Since(time.Time(node.Seen)) + delta = time.Since(node.Seen) if delta < self.initialRetryInterval { delta = self.initialRetryInterval } @@ -230,7 +230,7 @@ func (self *KadDb) findBest(maxBinSize int, binSize func(int) int) (node *NodeRe log.Debug(fmt.Sprintf("kaddb record %v (PO%03d:%d) ready to be tried. seen at %v (%v ago), scheduled at %v", node.Addr, po, cursor, node.Seen, delta, node.After)) // scheduling next check - interval = time.Duration(delta * time.Duration(self.connRetryExp)) + interval = delta * time.Duration(self.connRetryExp) after = time.Now().Add(interval) log.Debug(fmt.Sprintf("kaddb record %v (PO%03d:%d) selected as candidate connection %v. seen at %v (%v ago), selectable since %v, retry after %v (in %v)", node.Addr, po, cursor, rounds, node.Seen, delta, node.After, after, interval)) |