More linter fixes

caddyserver · Jun 27, 2023 · b6d4eb8 · b6d4eb8
1 parent 3a10a41
commit b6d4eb8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/.github/workflows/staticcheck.yml b/.github/workflows/staticcheck.yml
@@ -30,4 +30,4 @@ jobs:
       - name: Install staticcheck
         run: go install honnef.co/go/tools/cmd/staticcheck@latest
       - name: Run staticcheck
-        run: staticcheck ./...
+        run: staticcheck -tests=False ./...
diff --git a/forwardproxy.go b/forwardproxy.go
@@ -624,7 +624,7 @@ func dualStream(target net.Conn, clientReader io.ReadCloser, clientWriter io.Wri
 		}
 		return _err
 	}
-	go stream(target, clientReader)
+	go stream(target, clientReader) //nolint: errcheck
 	return stream(clientWriter, target)
 }
 

diff --git a/probe_resist_test.go b/probe_resist_test.go
@@ -342,14 +342,6 @@ func responsesAreEqual(res1, res2 *http.Response) error {
 		if !ok {
 			return fmt.Errorf("header \"%s: %s\" is absent in res2", k1, v1)
 		}
-		// if k1Lower == "location" {
-		// 	for i, h := range v2 {
-		// 		v2[i] = removeAddressesStr(h)
-		// 	}
-		// 	for i, h := range v1 {
-		// 		v1[i] = removeAddressesStr(h)
-		// 	}
-		// }
 		if errStr = stringSlicesAreEqual(v1, v2); errStr != "" {
 			return fmt.Errorf("header \"%s\" is different: %s", k1, errStr)
 		}
@@ -389,10 +381,6 @@ func removeAddressesByte(b []byte) []byte {
 	return b
 }
 
-func removeAddressesStr(s string) string {
-	return string(removeAddressesByte([]byte(s)))
-}
-
 func changePort(inputAddr, toPort string) string {
 	host, _, err := net.SplitHostPort(inputAddr)
 	if err != nil {