Makefile: Remove some new linters and fix complaints

Makefile

@@ -20,6 +20,9 @@ lint:
 		--disable=errcheck \
 		--disable=gochecknoglobals \
 		--disable=funlen \
+		--disable=gocognit \
+		--disable=godox \
+		--disable=wsl \
 		--skip-dirs=internal \
 		./...
 

renter/proto/renew.go

@@ -7,9 +7,10 @@ import (
 	"gitlab.com/NebulousLabs/Sia/crypto"
 	"gitlab.com/NebulousLabs/Sia/modules"
 	"gitlab.com/NebulousLabs/Sia/types"
+
+	"lukechampine.com/us/ed25519"
 	"lukechampine.com/us/hostdb"
 	"lukechampine.com/us/renterhost"
-	"lukechampine.com/us/ed25519"
 )
 
 // RenewContract negotiates a new file contract and initial revision for data

renter/renterutil/hostset.go

@@ -77,12 +77,11 @@ func (set *HostSet) AddHost(c renter.Contract) {
 			if _, err := lh.s.Settings(); err == nil {
 				// connection is still open; we're done
 				return nil
-			} else {
-				// connection timed out, or some other error occurred; close our
-				// end (just in case) and fallthrough to the reconnection logic
-				lh.s.Close()
-				lh.s = nil
 			}
+			// connection timed out, or some other error occurred; close our
+			// end (just in case) and fallthrough to the reconnection logic
+			lh.s.Close()
+			lh.s = nil
 		}
 		hostIP, err := set.hkr.ResolveHostKey(c.HostKey)
 		if err != nil {