#524 Enable removing NOC root certificates

Refactor impl Signed-off-by: Abdulbois <[email protected]> Signed-off-by: Abdulbois <[email protected]>
zigbee-alliance · May 7, 2024 · c9cb99b · c9cb99b
1 parent 9d29610
commit c9cb99b
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/x/pki/keeper/msg_server_remove_noc_x_509_root_cert.go b/x/pki/keeper/msg_server_remove_noc_x_509_root_cert.go
@@ -55,8 +55,8 @@ func (k msgServer) RemoveNocX509RootCert(goCtx context.Context, msg *types.MsgRe
 			k.removeApprovedX509Cert(ctx, certID, &aprCerts, msg.SerialNumber)
 
 			// Remove from NOC lists
-			removeCertFromList(certBySerialNumber.Issuer, certBySerialNumber.SerialNumber, &nocCerts.Certs)
-			k._removeNocX509RootCert(ctx, certID, &nocCerts, msg.SerialNumber)
+			k.RemoveNocRootCertificateBySerialNumber(ctx, nocCerts.Vid, certID.Subject, certID.SubjectKeyId, msg.SerialNumber)
+			k.RemoveNocRootCertificateByVidSubjectSkidAndSerialNumber(ctx, nocCerts.Vid, certID.Subject, certID.SubjectKeyId, msg.SerialNumber)
 		}
 
 		if foundRevoked {
@@ -86,16 +86,6 @@ func (k msgServer) RemoveNocX509RootCert(goCtx context.Context, msg *types.MsgRe
 	return &types.MsgRemoveNocX509RootCertResponse{}, nil
 }
 
-func (k msgServer) _removeNocX509RootCert(ctx sdk.Context, certID types.CertificateIdentifier, certificates *types.NocRootCertificatesByVidAndSkid, serialNumber string) {
-	if len(certificates.Certs) == 0 {
-		k.RemoveNocRootCertificate(ctx, certificates.Vid, certID.Subject, certID.SubjectKeyId)
-		k.RemoveNocRootCertificatesByVidAndSkid(ctx, certificates.Vid, certID.SubjectKeyId)
-	} else {
-		k.RemoveNocRootCertificateBySerialNumber(ctx, certificates.Vid, certID.Subject, certID.SubjectKeyId, serialNumber)
-		k.RemoveNocRootCertificateByVidSubjectSkidAndSerialNumber(ctx, certificates.Vid, certID.Subject, certID.SubjectKeyId, serialNumber)
-	}
-}
-
 func (k msgServer) _removeRevokedNocX509RootCert(ctx sdk.Context, certID types.CertificateIdentifier, certificates *types.RevokedNocRootCertificates) {
 	if len(certificates.Certs) == 0 {
 		k.RemoveRevokedNocRootCertificates(ctx, certID.Subject, certID.SubjectKeyId)