From 5c3b08c369303fc923dd79a387c20708059607fe Mon Sep 17 00:00:00 2001 From: klesomik Date: Sun, 5 Apr 2020 15:07:09 +0300 Subject: [PATCH] Fixed some linter issues --- cmd/genkeys/main.go | 22 ++++++++++------------ cmd/yggdrasil/main.go | 6 +++--- cmd/yggdrasilctl/main.go | 4 ++-- src/admin/admin.go | 39 ++++++++++++++++++--------------------- src/util/util.go | 3 +-- 5 files changed, 34 insertions(+), 40 deletions(-) diff --git a/cmd/genkeys/main.go b/cmd/genkeys/main.go index 7b48cdc7..03401423 100644 --- a/cmd/genkeys/main.go +++ b/cmd/genkeys/main.go @@ -51,7 +51,7 @@ func main() { for { newKey := <-newKeys - if isBetter(currentBest[:], newKey.id[:]) || len(currentBest) == 0 { + if isBetter(currentBest, newKey.id[:]) || len(currentBest) == 0 { currentBest = newKey.id for _, channel := range threadChannels { select { @@ -61,13 +61,13 @@ func main() { fmt.Println("--------------------------------------------------------------------------------") switch { case *doSig: - fmt.Println("sigPriv:", hex.EncodeToString(newKey.priv[:])) - fmt.Println("sigPub:", hex.EncodeToString(newKey.pub[:])) - fmt.Println("TreeID:", hex.EncodeToString(newKey.id[:])) + fmt.Println("sigPriv:", hex.EncodeToString(newKey.priv)) + fmt.Println("sigPub:", hex.EncodeToString(newKey.pub)) + fmt.Println("TreeID:", hex.EncodeToString(newKey.id)) default: - fmt.Println("boxPriv:", hex.EncodeToString(newKey.priv[:])) - fmt.Println("boxPub:", hex.EncodeToString(newKey.pub[:])) - fmt.Println("NodeID:", hex.EncodeToString(newKey.id[:])) + fmt.Println("boxPriv:", hex.EncodeToString(newKey.priv)) + fmt.Println("boxPub:", hex.EncodeToString(newKey.pub)) + fmt.Println("NodeID:", hex.EncodeToString(newKey.id)) fmt.Println("IP:", newKey.ip) } } @@ -76,12 +76,10 @@ func main() { func isBetter(oldID, newID []byte) bool { for idx := range oldID { - if newID[idx] > oldID[idx] { - return true - } - if newID[idx] < oldID[idx] { - return false + if newID[idx] == oldID[idx] { + continue } + return newID[idx] > oldID[idx] } return false } diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index 813e950b..b067ffbc 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go @@ -60,8 +60,8 @@ func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *config // throwing everywhere when it's converting things into UTF-16 for the hell // of it - remove it and decode back down into UTF-8. This is necessary // because hjson doesn't know what to do with UTF-16 and will panic - if bytes.Compare(conf[0:2], []byte{0xFF, 0xFE}) == 0 || - bytes.Compare(conf[0:2], []byte{0xFE, 0xFF}) == 0 { + if bytes.Equal(conf[0:2], []byte{0xFF, 0xFE}) || + bytes.Equal(conf[0:2], []byte{0xFE, 0xFF}) { utf := unicode.UTF16(unicode.BigEndian, unicode.UseBOM) decoder := utf.NewDecoder() conf, err = decoder.Bytes(conf) @@ -222,7 +222,7 @@ func main() { getNodeID := func() *crypto.NodeID { if pubkey, err := hex.DecodeString(cfg.EncryptionPublicKey); err == nil { var box crypto.BoxPubKey - copy(box[:], pubkey[:]) + copy(box[:], pubkey) return crypto.GetNodeID(&box) } return nil diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index 697a3faa..38d935a6 100644 --- a/cmd/yggdrasilctl/main.go +++ b/cmd/yggdrasilctl/main.go @@ -78,8 +78,8 @@ func run() int { if *server == endpoint { if config, err := ioutil.ReadFile(defaults.GetDefaults().DefaultConfigFile); err == nil { - if bytes.Compare(config[0:2], []byte{0xFF, 0xFE}) == 0 || - bytes.Compare(config[0:2], []byte{0xFE, 0xFF}) == 0 { + if bytes.Equal(config[0:2], []byte{0xFF, 0xFE}) || + bytes.Equal(config[0:2], []byte{0xFE, 0xFF}) { utf := unicode.UTF16(unicode.BigEndian, unicode.UseBOM) decoder := utf.NewDecoder() config, err = decoder.Bytes(config) diff --git a/src/admin/admin.go b/src/admin/admin.go index 8028bcc6..fc7a3b6f 100644 --- a/src/admin/admin.go +++ b/src/admin/admin.go @@ -181,13 +181,12 @@ func (a *AdminSocket) SetupAdminHandlers(na *AdminSocket) { in["uri"].(string), }, }, nil - } else { - return Info{ - "not_added": []string{ - in["uri"].(string), - }, - }, errors.New("Failed to add peer") } + return Info{ + "not_added": []string{ + in["uri"].(string), + }, + }, errors.New("Failed to add peer") }) a.AddHandler("removePeer", []string{"port"}, func(in Info) (Info, error) { port, err := strconv.ParseInt(fmt.Sprint(in["port"]), 10, 64) @@ -200,13 +199,12 @@ func (a *AdminSocket) SetupAdminHandlers(na *AdminSocket) { fmt.Sprint(port), }, }, nil - } else { - return Info{ - "not_removed": []string{ - fmt.Sprint(port), - }, - }, errors.New("Failed to remove peer") } + return Info{ + "not_removed": []string{ + fmt.Sprint(port), + }, + }, errors.New("Failed to remove peer") }) a.AddHandler("getAllowedEncryptionPublicKeys", []string{}, func(in Info) (Info, error) { return Info{"allowed_box_pubs": a.core.GetAllowedEncryptionPublicKeys()}, nil @@ -218,13 +216,12 @@ func (a *AdminSocket) SetupAdminHandlers(na *AdminSocket) { in["box_pub_key"].(string), }, }, nil - } else { - return Info{ - "not_added": []string{ - in["box_pub_key"].(string), - }, - }, errors.New("Failed to add allowed key") } + return Info{ + "not_added": []string{ + in["box_pub_key"].(string), + }, + }, errors.New("Failed to add allowed key") }) a.AddHandler("removeAllowedEncryptionPublicKey", []string{"box_pub_key"}, func(in Info) (Info, error) { if a.core.RemoveAllowedEncryptionPublicKey(in["box_pub_key"].(string)) == nil { @@ -250,10 +247,10 @@ func (a *AdminSocket) SetupAdminHandlers(na *AdminSocket) { coords := util.DecodeCoordString(in["coords"].(string)) var boxPubKey crypto.BoxPubKey if b, err := hex.DecodeString(in["box_pub_key"].(string)); err == nil { - copy(boxPubKey[:], b[:]) + copy(boxPubKey[:], b) if n, err := hex.DecodeString(in["target"].(string)); err == nil { var targetNodeID crypto.NodeID - copy(targetNodeID[:], n[:]) + copy(targetNodeID[:], n) result, reserr = a.core.DHTPing(boxPubKey, coords, &targetNodeID) } else { result, reserr = a.core.DHTPing(boxPubKey, coords, nil) @@ -294,7 +291,7 @@ func (a *AdminSocket) SetupAdminHandlers(na *AdminSocket) { return Info{}, errors.New("Expecting both box_pub_key and coords") } else { if b, err := hex.DecodeString(in["box_pub_key"].(string)); err == nil { - copy(boxPubKey[:], b[:]) + copy(boxPubKey[:], b) } else { return Info{}, err } diff --git a/src/util/util.go b/src/util/util.go index c20421d5..d7a7443d 100644 --- a/src/util/util.go +++ b/src/util/util.go @@ -30,9 +30,8 @@ func UnlockThread() { func ResizeBytes(bs []byte, length int) []byte { if cap(bs) >= length { return bs[:length] - } else { - return make([]byte, length) } + return make([]byte, length) } // TimerStop stops a timer and makes sure the channel is drained, returns true if the timer was stopped before firing.