diff options
| author | Felix Lange <fjl@twurst.com> | 2017-01-06 23:44:20 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-01-07 01:18:07 +0800 |
| commit | f2da6581ba827a2aab091f764ace8017b26450d8 (patch) | |
| tree | 3bf7ed2ec48812064c5eb6191c9848ad7985561b /p2p/discover | |
| parent | 35a7dcb162546f7f31cb6492f716cb93159218d7 (diff) | |
| download | dexon-f2da6581ba827a2aab091f764ace8017b26450d8.tar dexon-f2da6581ba827a2aab091f764ace8017b26450d8.tar.gz dexon-f2da6581ba827a2aab091f764ace8017b26450d8.tar.bz2 dexon-f2da6581ba827a2aab091f764ace8017b26450d8.tar.lz dexon-f2da6581ba827a2aab091f764ace8017b26450d8.tar.xz dexon-f2da6581ba827a2aab091f764ace8017b26450d8.tar.zst dexon-f2da6581ba827a2aab091f764ace8017b26450d8.zip | |
all: fix issues reported by honnef.co/go/simple/cmd/gosimple
Diffstat (limited to 'p2p/discover')
| -rw-r--r-- | p2p/discover/database.go | 2 | ||||
| -rw-r--r-- | p2p/discover/node.go | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/p2p/discover/database.go b/p2p/discover/database.go index d6ea507bb..8d20d1ec7 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -258,7 +258,7 @@ func (db *nodeDB) expireNodes() error { continue } // Skip the node if not expired yet (and not self) - if bytes.Compare(id[:], db.self[:]) != 0 { + if !bytes.Equal(id[:], db.self[:]) { if seen := db.lastPong(id); seen.After(threshold) { continue } diff --git a/p2p/discover/node.go b/p2p/discover/node.go index eec0bae0c..8b1062d87 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -224,11 +224,8 @@ func (n NodeID) GoString() string { // HexID converts a hex string to a NodeID. // The string may be prefixed with 0x. func HexID(in string) (NodeID, error) { - if strings.HasPrefix(in, "0x") { - in = in[2:] - } var id NodeID - b, err := hex.DecodeString(in) + b, err := hex.DecodeString(strings.TrimPrefix(in, "0x")) if err != nil { return id, err } else if len(b) != len(id) { |