aboutsummaryrefslogtreecommitdiffstats
path: root/p2p
diff options
context:
space:
mode:
authorZach <zach.ramsay@gmail.com>2017-12-13 02:05:47 +0800
committerFelix Lange <fjl@users.noreply.github.com>2017-12-13 02:05:47 +0800
commit3da1bf8ca18f54d9bd2c8c110854dc071ee3898b (patch)
tree8346c96f35f065f098944e425baca74880965232 /p2p
parentbbea4b2b53be53fc07b620c426bda80732a8814b (diff)
downloaddexon-3da1bf8ca18f54d9bd2c8c110854dc071ee3898b.tar.gz
dexon-3da1bf8ca18f54d9bd2c8c110854dc071ee3898b.tar.zst
dexon-3da1bf8ca18f54d9bd2c8c110854dc071ee3898b.zip
all: use gometalinter.v2, fix new gosimple issues (#15650)
Diffstat (limited to 'p2p')
-rw-r--r--p2p/discv5/net.go2
-rw-r--r--p2p/discv5/ntp.go8
-rw-r--r--p2p/discv5/ticket.go12
-rw-r--r--p2p/simulations/network.go7
4 files changed, 14 insertions, 15 deletions
diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go
index a39cfcc64..2fbb60824 100644
--- a/p2p/discv5/net.go
+++ b/p2p/discv5/net.go
@@ -684,7 +684,7 @@ func (net *Network) refresh(done chan<- struct{}) {
seeds = net.nursery
}
if len(seeds) == 0 {
- log.Trace(fmt.Sprint("no seed nodes found"))
+ log.Trace("no seed nodes found")
close(done)
return
}
diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go
index f78d5dc43..4fb5f657a 100644
--- a/p2p/discv5/ntp.go
+++ b/p2p/discv5/ntp.go
@@ -54,10 +54,10 @@ func checkClockDrift() {
howtofix := fmt.Sprintf("Please enable network time synchronisation in system settings")
separator := strings.Repeat("-", len(warning))
- log.Warn(fmt.Sprint(separator))
- log.Warn(fmt.Sprint(warning))
- log.Warn(fmt.Sprint(howtofix))
- log.Warn(fmt.Sprint(separator))
+ log.Warn(separator)
+ log.Warn(warning)
+ log.Warn(howtofix)
+ log.Warn(separator)
} else {
log.Debug(fmt.Sprintf("Sanity NTP check reported %v drift, all ok", drift))
}
diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go
index 48dd114f0..193cef4be 100644
--- a/p2p/discv5/ticket.go
+++ b/p2p/discv5/ticket.go
@@ -398,12 +398,12 @@ func (s *ticketStore) nextRegisterableTicket() (t *ticketRef, wait time.Duration
//s.removeExcessTickets(topic)
if len(tickets.buckets) != 0 {
empty = false
- if list := tickets.buckets[bucket]; list != nil {
- for _, ref := range list {
- //debugLog(fmt.Sprintf(" nrt bucket = %d node = %x sn = %v wait = %v", bucket, ref.t.node.ID[:8], ref.t.serial, time.Duration(ref.topicRegTime()-now)))
- if nextTicket.t == nil || ref.topicRegTime() < nextTicket.topicRegTime() {
- nextTicket = ref
- }
+
+ list := tickets.buckets[bucket]
+ for _, ref := range list {
+ //debugLog(fmt.Sprintf(" nrt bucket = %d node = %x sn = %v wait = %v", bucket, ref.t.node.ID[:8], ref.t.serial, time.Duration(ref.topicRegTime()-now)))
+ if nextTicket.t == nil || ref.topicRegTime() < nextTicket.topicRegTime() {
+ nextTicket = ref
}
}
}
diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go
index fd8777673..f3dda2e44 100644
--- a/p2p/simulations/network.go
+++ b/p2p/simulations/network.go
@@ -403,9 +403,8 @@ func (self *Network) getNodeByName(name string) *Node {
func (self *Network) GetNodes() (nodes []*Node) {
self.lock.Lock()
defer self.lock.Unlock()
- for _, node := range self.Nodes {
- nodes = append(nodes, node)
- }
+
+ nodes = append(nodes, self.Nodes...)
return nodes
}
@@ -477,7 +476,7 @@ func (self *Network) InitConn(oneID, otherID discover.NodeID) (*Conn, error) {
if err != nil {
return nil, err
}
- if time.Now().Sub(conn.initiated) < dialBanTimeout {
+ if time.Since(conn.initiated) < dialBanTimeout {
return nil, fmt.Errorf("connection between %v and %v recently attempted", oneID, otherID)
}
if conn.Up {