Merge #151: Cirrus: Fix varnamelen linter warnings

f6d956b5ec Cirrus: Mark varnamelen as non-mandatory. (Jeremy Rand)
f4fcb01220 Fix varnamelen warning in SplitDomainByFloatingAnchor (Jeremy Rand)
0eb6f7c761 Fix comment typo (Jeremy Rand)
524d5ba93b Cirrus: Whitelist type assertions in varnamelen linter (Jeremy Rand)

Pull request description:

  Also disable `varnamelen` linter pending an upstream fix so that the Cirrus build stops failing.

Top commit has no ACKs.

Tree-SHA512: f01135d543d3af4616e0a4adda88ed7bf94853a7314960fdc53f03810880fecda1a96ff6372854053ce2915ef07c98d11db8541262544969d38d97046ff6eadb

.cirrus.yml

@@ -59,7 +59,8 @@ task:
         GOLANGCI_ARGS: "--new-from-rev=HEAD~"
     - name: "Go Lint $GOOS Mandatory$MODULES_NAME"
       env:
-        GOLANGCI_ARGS: "--disable=cyclop,deadcode,errcheck,errorlint,exhaustivestruct,forbidigo,forcetypeassert,funlen,gci,gocognit,gocritic,godot,godox,goerr113,gofumpt,goimports,golint,gosec,gosimple,govet,ineffassign,lll,maligned,nakedret,nestif,nilerr,nlreturn,paralleltest,revive,scopelint,staticcheck,stylecheck,thelper,unconvert,unparam,unused,wastedassign,whitespace,wrapcheck,wsl"
+        # TODO: Re-enable varnamelen after golangci-lint v1.44 is released.
+        GOLANGCI_ARGS: "--disable=cyclop,deadcode,errcheck,errorlint,exhaustivestruct,forbidigo,forcetypeassert,funlen,gci,gocognit,gocritic,godot,godox,goerr113,gofumpt,goimports,golint,gosec,gosimple,govet,ineffassign,lll,maligned,nakedret,nestif,nilerr,nlreturn,paralleltest,revive,scopelint,staticcheck,stylecheck,thelper,unconvert,unparam,unused,varnamelen,wastedassign,whitespace,wrapcheck,wsl"
     - name: "Go Lint $GOOS$MODULES_NAME"
       env:
         GOLANGCI_ARGS: ""

.golangci.yml

@@ -6,3 +6,5 @@ linters-settings:
     replace-allow-list:
       - "github.com/namecoin/x509-compressed"
       - "github.com/coreos/go-systemd"
+  varnamelen:
+    ignore-type-assert-ok: true

util/util.go

@@ -68,20 +68,20 @@ func SplitDomainByFloatingAnchor(qname, anchor string) (subname, basename, rootn
 		return
 	}
 
-	for i := len(parts) - 1; i >= 0; i-- {
-		v := parts[i]
+	for partIndex := len(parts) - 1; partIndex >= 0; partIndex-- {
+		v := parts[partIndex]
 
 		// scanning for rootname
 		if v == anchor {
-			if i == 0 {
-				// i is alreay zero, so we have something like bit.x.y.z.
+			if partIndex == 0 {
+				// partIndex is already zero, so we have something like bit.x.y.z.
 				rootname = qname
 				return
 			}
 
-			rootname = strings.Join(parts[i:], ".")
-			basename = parts[i-1]
-			subname = strings.Join(parts[0:i-1], ".")
+			rootname = strings.Join(parts[partIndex:], ".")
+			basename = parts[partIndex-1]
+			subname = strings.Join(parts[0:partIndex-1], ".")
 			return
 		}
 	}