Merge pull request #574 from zigbee-alliance/fix/bug-fixes

Fix error message texts

Author: akarabashov

types/pki/errors.go

@@ -93,6 +93,13 @@ func NewErrCertificateDoesNotExist(subject string, subjectKeyID string) error {
 		subject, subjectKeyID)
 }
 
+func NewErrNocRootCertificateDoesNotExist(subject string, subjectKeyID string) error {
+	return errors.Wrapf(ErrCertificateDoesNotExist,
+		"No X509 NOC root certificate associated with the "+
+			"combination of subject=%v and subjectKeyID=%v on the ledger",
+		subject, subjectKeyID)
+}
+
 func NewErrCertificateBySerialNumberDoesNotExist(subject string, subjectKeyID string, serialNumber string) error {
 	return errors.Wrapf(ErrCertificateDoesNotExist,
 		"No X509 certificate associated with the "+

x/pki/keeper/msg_server_remove_noc_x_509_root_cert.go

@@ -31,7 +31,7 @@ func (k msgServer) RemoveNocX509RootCert(goCtx context.Context, msg *types.MsgRe
 	certificates := nocCerts.Certs
 	certificates = append(certificates, revCerts.Certs...)
 	if len(certificates) == 0 {
-		return nil, pkitypes.NewErrCertificateDoesNotExist(msg.Subject, msg.SubjectKeyId)
+		return nil, pkitypes.NewErrNocRootCertificateDoesNotExist(msg.Subject, msg.SubjectKeyId)
 	}
 
 	cert := certificates[0]

x/pki/keeper/msg_server_revoke_noc_x_509_root_cert.go

@@ -25,7 +25,7 @@ func (k msgServer) RevokeNocX509RootCert(goCtx context.Context, msg *types.MsgRe
 
 	certificates, _ := k.GetApprovedCertificates(ctx, msg.Subject, msg.SubjectKeyId)
 	if len(certificates.Certs) == 0 {
-		return nil, pkitypes.NewErrCertificateDoesNotExist(msg.Subject, msg.SubjectKeyId)
+		return nil, pkitypes.NewErrNocRootCertificateDoesNotExist(msg.Subject, msg.SubjectKeyId)
 	}
 
 	cert := certificates.Certs[0]