Fixed linter errors

go.mod

@@ -27,6 +27,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.14.0
 	github.com/stretchr/testify v1.8.4
+	golang.org/x/tools v0.6.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917
 	google.golang.org/grpc v1.60.1
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
@@ -206,7 +207,6 @@ require (
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/term v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.6.0 // indirect
 	google.golang.org/api v0.149.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect

proto/zigbeealliance/distributedcomplianceledger/pki/genesis.proto

@@ -47,7 +47,7 @@ message GenesisState {
   repeated NocIcaCertificates nocIcaCertificatesList = 15 [(gogoproto.nullable) = false];
   repeated RevokedNocRootCertificates revokedNocRootCertificatesList = 16 [(gogoproto.nullable) = false];
   repeated NocCertificatesByVidAndSkid nocCertificatesByVidAndSkidList = 17 [(gogoproto.nullable) = false];
-  repeated NocCertificatesBySubjectKeyId nocCertificatesBySubjectKeyIdList = 18 [(gogoproto.nullable) = false];
+  repeated NocCertificatesBySubjectKeyID NocCertificatesBySubjectKeyIDList = 18 [(gogoproto.nullable) = false];
   repeated NocCertificates          nocCertificatesList          = 19 [(gogoproto.nullable) = false];
   repeated NocCertificatesBySubject nocCertificatesBySubjectList = 20 [(gogoproto.nullable) = false];
   repeated AllCertificates certificatesList = 21 [(gogoproto.nullable) = false];

proto/zigbeealliance/distributedcomplianceledger/pki/noc_certificates_by_subject_key_id.proto

@@ -5,7 +5,7 @@ option go_package = "github.com/zigbee-alliance/distributed-compliance-ledger/x/
 
 import "zigbeealliance/distributedcomplianceledger/pki/certificate.proto";
 
-message NocCertificatesBySubjectKeyId {
+message NocCertificatesBySubjectKeyID {
   string subjectKeyId = 1;
   repeated Certificate certs = 2;
   float tq = 3;

tools/tools.go

@@ -10,6 +10,7 @@ import (
 	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway"
 	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger"
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2"
+	_ "golang.org/x/tools/cmd/goimports"
 	_ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
 	_ "google.golang.org/protobuf/cmd/protoc-gen-go"
 )

x/pki/client/cli/query_approved_certificates_test.go

@@ -30,7 +30,7 @@ func networkWithApprovedCertificatesObjects(t *testing.T, n int) (*network.Netwo
 	for i := 0; i < n; i++ {
 		approvedCertificates := types.ApprovedCertificates{
 			Subject:      strconv.Itoa(i),
-			SubjectKeyId: strconv.Itoa(i),
+			SubjectKeyID: strconv.Itoa(i),
 		}
 		nullify.Fill(&approvedCertificates)
 		state.ApprovedCertificatesList = append(state.ApprovedCertificatesList, approvedCertificates)
@@ -60,7 +60,7 @@ func TestShowApprovedCertificates(t *testing.T) {
 		{
 			desc:           "found",
 			idSubject:      objs[0].Subject,
-			idSubjectKeyId: objs[0].SubjectKeyId,
+			idSubjectKeyId: objs[0].SubjectKeyID,
 
 			args: common,
 			obj:  objs[0],

x/pki/client/cli/query_noc_certificates.go

@@ -78,13 +78,13 @@ func CmdShowNocCertificates() *cobra.Command {
 					&res,
 				)
 			}
-			var res types.NocCertificatesBySubjectKeyId
+			var res types.NocCertificatesBySubjectKeyID
 
 			return cli.QueryWithProof(
 				clientCtx,
 				pkitypes.StoreKey,
-				types.NocCertificatesBySubjectKeyIdKeyPrefix,
-				types.NocCertificatesBySubjectKeyIdKey(subjectKeyID),
+				types.NocCertificatesBySubjectKeyIDKeyPrefix,
+				types.NocCertificatesBySubjectKeyIDKey(subjectKeyID),
 				&res,
 			)
 		},

x/pki/client/cli/query_proposed_certificate_revocation_test.go

@@ -30,7 +30,7 @@ func networkWithProposedCertificateRevocationObjects(t *testing.T, n int) (*netw
 	for i := 0; i < n; i++ {
 		proposedCertificateRevocation := types.ProposedCertificateRevocation{
 			Subject:      strconv.Itoa(i),
-			SubjectKeyId: strconv.Itoa(i),
+			SubjectKeyID: strconv.Itoa(i),
 		}
 		nullify.Fill(&proposedCertificateRevocation)
 		state.ProposedCertificateRevocationList = append(state.ProposedCertificateRevocationList, proposedCertificateRevocation)
@@ -60,7 +60,7 @@ func TestShowProposedCertificateRevocation(t *testing.T) {
 		{
 			desc:           "found",
 			idSubject:      objs[0].Subject,
-			idSubjectKeyId: objs[0].SubjectKeyId,
+			idSubjectKeyId: objs[0].SubjectKeyID,
 
 			args: common,
 			obj:  objs[0],

x/pki/client/cli/query_proposed_certificate_test.go

@@ -30,7 +30,7 @@ func networkWithProposedCertificateObjects(t *testing.T, n int) (*network.Networ
 	for i := 0; i < n; i++ {
 		proposedCertificate := types.ProposedCertificate{
 			Subject:      strconv.Itoa(i),
-			SubjectKeyId: strconv.Itoa(i),
+			SubjectKeyID: strconv.Itoa(i),
 		}
 		nullify.Fill(&proposedCertificate)
 		state.ProposedCertificateList = append(state.ProposedCertificateList, proposedCertificate)
@@ -60,7 +60,7 @@ func TestShowProposedCertificate(t *testing.T) {
 		{
 			desc:           "found",
 			idSubject:      objs[0].Subject,
-			idSubjectKeyId: objs[0].SubjectKeyId,
+			idSubjectKeyId: objs[0].SubjectKeyID,
 
 			args: common,
 			obj:  objs[0],

x/pki/client/cli/query_rejected_certificate_test.go

@@ -31,7 +31,7 @@ func networkWithRejectedCertificateObjects(t *testing.T, n int) (*network.Networ
 	for i := 0; i < n; i++ {
 		rejectedCertificate := types.RejectedCertificate{
 			Subject:      strconv.Itoa(i),
-			SubjectKeyId: strconv.Itoa(i),
+			SubjectKeyID: strconv.Itoa(i),
 		}
 		nullify.Fill(&rejectedCertificate)
 		state.RejectedCertificateList = append(state.RejectedCertificateList, rejectedCertificate)
@@ -62,7 +62,7 @@ func TestShowRejectedCertificate(t *testing.T) {
 		{
 			desc:           "found",
 			idSubject:      objs[0].Subject,
-			idSubjectKeyID: objs[0].SubjectKeyId,
+			idSubjectKeyID: objs[0].SubjectKeyID,
 
 			args: common,
 			obj:  objs[0],