Merge branch 'master' into #524-Enable-removing-NOC-root-certs

Author: Abdulbois

x/pki/keeper/keeper.go

@@ -116,3 +116,14 @@ func filterCertificates(certificates *[]*types.Certificate, predicate Certificat
 
 	return result
 }
+
+func (k msgServer) removeApprovedX509Cert(ctx sdk.Context, certID types.CertificateIdentifier, certificates *types.ApprovedCertificates, serialNumber string) {
+	if len(certificates.Certs) == 0 {
+		k.RemoveApprovedCertificates(ctx, certID.Subject, certID.SubjectKeyId)
+		k.RemoveApprovedCertificateBySubject(ctx, certID.Subject, certID.SubjectKeyId)
+		k.RemoveApprovedCertificatesBySubjectKeyID(ctx, certID.Subject, certID.SubjectKeyId)
+	} else {
+		k.SetApprovedCertificates(ctx, *certificates)
+		k.RemoveApprovedCertificatesBySubjectKeyIDAndSerialNumber(ctx, certID.Subject, certID.SubjectKeyId, serialNumber)
+	}
+}

x/pki/keeper/msg_server_remove_noc_x_509_ica_cert.go

@@ -61,15 +61,14 @@ func (k msgServer) RemoveNocX509IcaCert(goCtx context.Context, msg *types.MsgRem
 			// Remove from Approved lists
 			aprCerts, _ := k.GetApprovedCertificates(ctx, msg.Subject, msg.SubjectKeyId)
 			removeCertFromList(certBySerialNumber.Issuer, certBySerialNumber.SerialNumber, &aprCerts.Certs)
-			k._removeApprovedX509Cert(ctx, certID, &aprCerts, msg.SerialNumber)
+			k.removeApprovedX509Cert(ctx, certID, &aprCerts, msg.SerialNumber)
 
 			// Remove from ICA lists
-			removeCertFromList(certBySerialNumber.Issuer, certBySerialNumber.SerialNumber, &icaCerts.Certs)
-			k._removeNocX509IcaCert(ctx, certID, &icaCerts, msg.SerialNumber)
+			k.RemoveNocIcaCertificateBySerialNumber(ctx, icaCerts.Vid, certID.Subject, certID.SubjectKeyId, msg.SerialNumber)
 		}
 		if foundRevoked {
 			removeCertFromList(certBySerialNumber.Issuer, certBySerialNumber.SerialNumber, &revCerts.Certs)
-			k._removeRevokedX509Cert(ctx, certID, &revCerts)
+			k.removeOrUpdateRevokedX509Cert(ctx, certID, &revCerts)
 		}
 	} else {
 		k.RemoveNocIcaCertificate(ctx, certID.Subject, certID.SubjectKeyId, icaCerts.Vid)
@@ -89,11 +88,3 @@ func (k msgServer) RemoveNocX509IcaCert(goCtx context.Context, msg *types.MsgRem
 
 	return &types.MsgRemoveNocX509IcaCertResponse{}, nil
 }
-
-func (k msgServer) _removeNocX509IcaCert(ctx sdk.Context, certID types.CertificateIdentifier, certificates *types.NocIcaCertificates, serialNumber string) {
-	if len(certificates.Certs) == 0 {
-		k.RemoveNocIcaCertificate(ctx, certID.Subject, certID.SubjectKeyId, certificates.Vid)
-	} else {
-		k.RemoveNocIcaCertificateBySerialNumber(ctx, certificates.Vid, certID.Subject, certID.SubjectKeyId, serialNumber)
-	}
-}

x/pki/keeper/msg_server_remove_x_509_cert.go

@@ -60,11 +60,11 @@ func (k msgServer) RemoveX509Cert(goCtx context.Context, msg *types.MsgRemoveX50
 
 		if foundApproved {
 			removeCertFromList(certBySerialNumber.Issuer, certBySerialNumber.SerialNumber, &aprCerts.Certs)
-			k._removeApprovedX509Cert(ctx, certID, &aprCerts, msg.SerialNumber)
+			k.removeApprovedX509Cert(ctx, certID, &aprCerts, msg.SerialNumber)
 		}
 		if foundRevoked {
 			removeCertFromList(certBySerialNumber.Issuer, certBySerialNumber.SerialNumber, &revCerts.Certs)
-			k._removeRevokedX509Cert(ctx, certID, &revCerts)
+			k.removeOrUpdateRevokedX509Cert(ctx, certID, &revCerts)
 		}
 	} else {
 		k.RemoveApprovedCertificates(ctx, certID.Subject, certID.SubjectKeyId)
@@ -82,25 +82,3 @@ func (k msgServer) RemoveX509Cert(goCtx context.Context, msg *types.MsgRemoveX50
 
 	return &types.MsgRemoveX509CertResponse{}, nil
 }
-
-func (k msgServer) _removeApprovedX509Cert(ctx sdk.Context, certID types.CertificateIdentifier, certificates *types.ApprovedCertificates, serialNumber string) {
-	if len(certificates.Certs) == 0 {
-		k.RemoveApprovedCertificates(ctx, certID.Subject, certID.SubjectKeyId)
-		k.RemoveApprovedCertificateBySubject(ctx, certID.Subject, certID.SubjectKeyId)
-		k.RemoveApprovedCertificatesBySubjectKeyID(ctx, certID.Subject, certID.SubjectKeyId)
-	} else {
-		k.SetApprovedCertificates(ctx, *certificates)
-		k.RemoveApprovedCertificatesBySubjectKeyIDAndSerialNumber(ctx, certID.Subject, certID.SubjectKeyId, serialNumber)
-	}
-}
-
-func (k msgServer) _removeRevokedX509Cert(ctx sdk.Context, certID types.CertificateIdentifier, certificates *types.RevokedCertificates) {
-	if len(certificates.Certs) == 0 {
-		k.RemoveRevokedCertificates(ctx, certID.Subject, certID.SubjectKeyId)
-	} else {
-		k.SetRevokedCertificates(
-			ctx,
-			*certificates,
-		)
-	}
-}

x/pki/keeper/revoked_certificates.go

@@ -96,3 +96,14 @@ func (k Keeper) AddRevokedCertificates(ctx sdk.Context, approvedCertificates typ
 		revokedCertificates.SubjectKeyId,
 	), b)
 }
+
+func (k msgServer) removeOrUpdateRevokedX509Cert(ctx sdk.Context, certID types.CertificateIdentifier, certificates *types.RevokedCertificates) {
+	if len(certificates.Certs) == 0 {
+		k.RemoveRevokedCertificates(ctx, certID.Subject, certID.SubjectKeyId)
+	} else {
+		k.SetRevokedCertificates(
+			ctx,
+			*certificates,
+		)
+	}
+}