Fixed integration tests

Artemkaaas · Artemkaaas · commit 8f1f9f63f210 · 2024-11-20T15:38:17.000+03:00
diff --git a/x/pki/keeper/certificate_helpers.go b/x/pki/keeper/certificate_helpers.go
@@ -159,11 +159,12 @@ func (k msgServer) RemoveDaCertificateBySerialNumber(
 	certificates *types.ApprovedCertificates,
 	serialNumber string,
 	issuer string,
+	isRoot bool,
 ) {
 	RemoveCertFromList(issuer, serialNumber, &certificates.Certs)
 
 	if len(certificates.Certs) == 0 {
-		k.RemoveDaCertificate(ctx, subject, subjectKeyID, false)
+		k.RemoveDaCertificate(ctx, subject, subjectKeyID, isRoot)
 	} else {
 		k.RemoveAllCertificatesBySerialNumber(ctx, subject, subjectKeyID, serialNumber)
 		k.RemoveAllCertificatesBySubjectKeyIDBySerialNumber(ctx, subject, subjectKeyID, serialNumber)
diff --git a/x/pki/keeper/msg_server_approve_revoke_x_509_root_cert.go b/x/pki/keeper/msg_server_approve_revoke_x_509_root_cert.go
@@ -131,6 +131,7 @@ func (k msgServer) revokeRootCertificateBySerialNumber(
 		&certificates,
 		cert.SerialNumber,
 		cert.Issuer,
+		true,
 	)
 
 	return nil
diff --git a/x/pki/keeper/msg_server_remove_x_509_cert.go b/x/pki/keeper/msg_server_remove_x_509_cert.go
@@ -61,30 +61,23 @@ func (k msgServer) RemoveX509Cert(goCtx context.Context, msg *types.MsgRemoveX50
 				&aprCerts,
 				certBySerialNumber.SerialNumber,
 				certBySerialNumber.Issuer,
+				false,
 			)
 		}
 		if foundRevoked {
 			RemoveCertFromList(certBySerialNumber.Issuer, certBySerialNumber.SerialNumber, &revCerts.Certs)
 			k.removeOrUpdateRevokedX509Cert(ctx, msg.Subject, msg.SubjectKeyId, &revCerts)
 		}
 	} else {
-		k.revokeCertificate(ctx, aprCerts)
+		// remove from noc certificates map
+		k.RemoveDaCertificate(ctx, msg.Subject, msg.SubjectKeyId, false)
+		// remove from revoked list
+		k.RemoveRevokedCertificates(ctx, msg.Subject, msg.SubjectKeyId)
+		// remove from subject with serialNumber map
+		for _, cert := range certificates {
+			k.RemoveUniqueCertificate(ctx, cert.Issuer, cert.SerialNumber)
+		}
 	}
 
 	return &types.MsgRemoveX509CertResponse{}, nil
 }
-
-func (k msgServer) revokeCertificate(
-	ctx sdk.Context,
-	certificates types.ApprovedCertificates,
-) {
-	// remove from noc certificates map
-	k.RemoveDaCertificate(ctx, certificates.Subject, certificates.SubjectKeyId, false)
-	// remove from revoked list
-	k.RemoveRevokedCertificates(ctx, certificates.Subject, certificates.SubjectKeyId)
-
-	// remove from subject with serialNumber map
-	for _, cert := range certificates.Certs {
-		k.RemoveUniqueCertificate(ctx, cert.Issuer, cert.SerialNumber)
-	}
-}
diff --git a/x/pki/keeper/msg_server_revoke_x_509_cert.go b/x/pki/keeper/msg_server_revoke_x_509_cert.go
@@ -90,6 +90,7 @@ func (k msgServer) revokeDaCertificateBySerialNumber(
 		&certificates,
 		cert.SerialNumber,
 		cert.Issuer,
+		false,
 	)
 
 	if len(certificates.Certs) == 0 {
diff --git a/x/pki/tests/handler_add_noc_ica_cert_test.go b/x/pki/tests/handler_add_noc_ica_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_add_noc_root_cert_test.go b/x/pki/tests/handler_add_noc_root_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_add_paa_cert_test.go b/x/pki/tests/handler_add_paa_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"math"
diff --git a/x/pki/tests/handler_add_pai_cert_test.go b/x/pki/tests/handler_add_pai_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_add_revocation_test.go b/x/pki/tests/handler_add_revocation_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_assign_vid_test.go b/x/pki/tests/handler_assign_vid_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_delete_revocation_test.go b/x/pki/tests/handler_delete_revocation_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_remove_noc_ica_cert_test.go b/x/pki/tests/handler_remove_noc_ica_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_remove_noc_root_cert_test.go b/x/pki/tests/handler_remove_noc_root_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_remove_pai_cert_test.go b/x/pki/tests/handler_remove_pai_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_revoke_noc_ica_cert_test.go b/x/pki/tests/handler_revoke_noc_ica_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_revoke_noc_root_cert_test.go b/x/pki/tests/handler_revoke_noc_root_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_revoke_paa_cert_test.go b/x/pki/tests/handler_revoke_paa_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"math"
diff --git a/x/pki/tests/handler_revoke_pai_cert_test.go b/x/pki/tests/handler_revoke_pai_cert_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/handler_test.go b/x/pki/tests/handler_test.go
@@ -1,7 +1,8 @@
-package pki
+package tests
 
 import (
 	"context"
+	"github.com/zigbee-alliance/distributed-compliance-ledger/x/pki"
 	"testing"
 
 	"google.golang.org/grpc/codes"
@@ -119,7 +120,7 @@ func Setup(t *testing.T) *TestSetup {
 		Wctx:          sdk.WrapSDKContext(ctx),
 		Keeper:        keeper,
 		DclauthKeeper: dclauthKeeper,
-		Handler:       NewHandler(*keeper),
+		Handler:       pki.NewHandler(*keeper),
 		Trustee1:      GenerateAccAddress(),
 		Trustee2:      GenerateAccAddress(),
 		Trustee3:      GenerateAccAddress(),
diff --git a/x/pki/tests/handler_update_revocation_test.go b/x/pki/tests/handler_update_revocation_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"
diff --git a/x/pki/tests/revocation_message_utils_test.go b/x/pki/tests/revocation_message_utils_test.go
@@ -1,4 +1,4 @@
-package pki
+package tests
 
 import (
 	"testing"

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ func (k msgServer) revokeRootCertificateBySerialNumber(`
`131`	`131`	`&certificates,`
`132`	`132`	`cert.SerialNumber,`
`133`	`133`	`cert.Issuer,`
	`134`	`+ true,`
`134`	`135`	`)`
`135`	`136`
`136`	`137`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ func (k msgServer) revokeDaCertificateBySerialNumber(`
`90`	`90`	`&certificates,`
`91`	`91`	`cert.SerialNumber,`
`92`	`92`	`cert.Issuer,`
	`93`	`+ false,`
`93`	`94`	`)`
`94`	`95`
`95`	`96`	`if len(certificates.Certs) == 0 {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package pki`
	`1`	`+package tests`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"testing"`