review: use errors.As for struct error types in wsconn.go

decred · Feb 16, 2023 · 32e8a40 · 32e8a40
1 parent a88f34b
commit 32e8a40
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/client/comms/wsconn.go b/client/comms/wsconn.go
@@ -75,8 +75,8 @@ var invalidCertRegexp = regexp.MustCompile(".*(unknown authority|not standards c
 func IsErrorInvalidCert(err error) bool {
 	var invalidCert x509.CertificateInvalidError
 	var unknownCertAuth x509.UnknownAuthorityError
-	return errors.Is(err, ErrInvalidCert) || errors.Is(err, invalidCert) ||
-		errors.Is(err, unknownCertAuth) || invalidCertRegexp.MatchString(err.Error())
+	return errors.Is(err, ErrInvalidCert) || errors.As(err, &invalidCert) ||
+		errors.As(err, &unknownCertAuth) || invalidCertRegexp.MatchString(err.Error())
 }
 
 // ErrInvalidCert is the error returned when attempting to use an invalid cert
@@ -228,7 +228,7 @@ func (conn *wsConn) connect(ctx context.Context) error {
 	ws, _, err := dialer.DialContext(ctx, conn.cfg.URL, nil)
 	if err != nil {
 		var e x509.HostnameError // No need to retry...
-		if IsErrorInvalidCert(err) || errors.Is(err, e) {
+		if IsErrorInvalidCert(err) || errors.As(err, &e) {
 			conn.setConnectionStatus(InvalidCert)
 			if conn.tlsCfg == nil {
 				return ErrCertRequired