Fix lint issues and GET_NOC_ROOT_BY_VID_AND_SKID REST query

docs/static/openapi.yml

@@ -9877,7 +9877,7 @@ paths:
           format: int32
       tags:
         - Query
-  /dcl/pki/noc_root_certificates/{vid}/{subjectKeyId}:
+  /dcl/pki/noc-root-certificates/{vid}/{subjectKeyId}:
     get:
       summary: Queries a NocRootCertificatesByVidAndSkid by index.
       operationId: NocRootCertificatesByVidAndSkid

proto/pki/query.proto

@@ -120,7 +120,7 @@ service Query {
 
 	// Queries a NocRootCertificatesByVidAndSkid by index.
 	rpc NocRootCertificatesByVidAndSkid(QueryGetNocRootCertificatesByVidAndSkidRequest) returns (QueryGetNocRootCertificatesByVidAndSkidResponse) {
-		option (google.api.http).get = "/dcl/pki/noc_root_certificates/{vid}/{subjectKeyId}";
+		option (google.api.http).get = "/dcl/pki/noc-root-certificates/{vid}/{subjectKeyId}";
 	}
 
 	// Queries a list of NocRootCertificates items.

vue/src/store/generated/zigbee-alliance/distributed-compliance-ledger/zigbeealliance.distributedcomplianceledger.pki/module/rest.ts

@@ -845,11 +845,11 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
    * @tags Query
    * @name QueryNocRootCertificatesByVidAndSkid
    * @summary Queries a NocRootCertificatesByVidAndSkid by index.
-   * @request GET:/dcl/pki/noc_root_certificates/{vid}/{subjectKeyId}
+   * @request GET:/dcl/pki/noc-root-certificates/{vid}/{subjectKeyId}
    */
   queryNocRootCertificatesByVidAndSkid = (vid: number, subjectKeyId: string, params: RequestParams = {}) =>
     this.request<PkiQueryGetNocRootCertificatesByVidAndSkidResponse, RpcStatus>({
-      path: `/dcl/pki/noc_root_certificates/${vid}/${subjectKeyId}`,
+      path: `/dcl/pki/noc-root-certificates/${vid}/${subjectKeyId}`,
       method: "GET",
       format: "json",
       ...params,

x/pki/handler_revoke_noc_root_cert_test.go

@@ -457,7 +457,7 @@ func TestHandler_RevokeNocX509RootCert_RevokeWithSerialNumber(t *testing.T) {
 	require.Equal(t, 1, len(revNocRoot.Certs))
 	require.Equal(t, testconstants.NocRootCert1CopySerialNumber, revNocRoot.Certs[0].SerialNumber)
 
-	// query noc root certificate by VID and SKID should return only one root cert
+	// query noc root certificate by VID and SKID
 	nocRootCertificatesByVidAndSkid, err := queryNocRootCertificatesByVidAndSkid(setup, testconstants.Vid, testconstants.NocRootCert1SubjectKeyID)
 	require.NoError(t, err)
 	require.Equal(t, testconstants.NocRootCert1SubjectKeyID, nocRootCertificatesByVidAndSkid.SubjectKeyId)

x/pki/keeper/grpc_query_noc_root_certificates_by_vid_and_skid_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/pki/types"
 )
 
-// Prevent strconv unused error
+// Prevent strconv unused error.
 var _ = strconv.IntSize
 
 func TestNocRootCertificatesByVidAndSkidQuerySingle(t *testing.T) {

x/pki/keeper/keeper.go

@@ -106,10 +106,12 @@ func findCertificate(serialNumber string, certificates *[]*types.Certificate) (*
 
 func filterCertificates(certificates *[]*types.Certificate, predicate CertificatePredicate) []*types.Certificate {
 	var result []*types.Certificate
+
 	for _, s := range *certificates {
 		if predicate(s) {
 			result = append(result, s)
 		}
 	}
+
 	return result
 }

x/pki/keeper/noc_root_certificates_by_vid_and_skid.go

@@ -8,7 +8,7 @@ import (
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/pki/types"
 )
 
-// SetNocRootCertificatesByVidAndSkid set a specific nocRootCertificatesByVidAndSkid in the store from its index
+// SetNocRootCertificatesByVidAndSkid set a specific nocRootCertificatesByVidAndSkid in the store from its index.
 func (k Keeper) SetNocRootCertificatesByVidAndSkid(ctx sdk.Context, nocRootCertificatesByVidAndSkid types.NocRootCertificatesByVidAndSkid) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), pkitypes.KeyPrefix(types.NocRootCertificatesByVidAndSkidKeyPrefix))
 	b := k.cdc.MustMarshal(&nocRootCertificatesByVidAndSkid)
@@ -18,7 +18,7 @@ func (k Keeper) SetNocRootCertificatesByVidAndSkid(ctx sdk.Context, nocRootCerti
 	), b)
 }
 
-// GetNocRootCertificatesByVidAndSkid returns a nocRootCertificatesByVidAndSkid from its index
+// GetNocRootCertificatesByVidAndSkid returns a nocRootCertificatesByVidAndSkid from its index.
 func (k Keeper) GetNocRootCertificatesByVidAndSkid(
 	ctx sdk.Context,
 	vid int32,
@@ -36,6 +36,7 @@ func (k Keeper) GetNocRootCertificatesByVidAndSkid(
 	}
 
 	k.cdc.MustUnmarshal(b, &val)
+
 	return val, true
 }
 
@@ -63,7 +64,7 @@ func (k Keeper) AddNocRootCertificatesByVidAndSkid(ctx sdk.Context, nocCertifica
 	store.Set(types.NocRootCertificatesByVidAndSkidKey(nocCertificate.Vid, nocCertificate.SubjectKeyId), b)
 }
 
-// RemoveNocRootCertificatesByVidAndSkid removes a nocRootCertificatesByVidAndSkid from the store
+// RemoveNocRootCertificatesByVidAndSkid removes a nocRootCertificatesByVidAndSkid from the store.
 func (k Keeper) RemoveNocRootCertificatesByVidAndSkid(
 	ctx sdk.Context,
 	vid int32,
@@ -129,7 +130,7 @@ func (k Keeper) _filterAndSetNocRootCertificateByVidAndSkid(
 	}
 }
 
-// GetAllNocRootCertificatesByVidAndSkid returns all nocRootCertificatesByVidAndSkid
+// GetAllNocRootCertificatesByVidAndSkid returns all nocRootCertificatesByVidAndSkid.
 func (k Keeper) GetAllNocRootCertificatesByVidAndSkid(ctx sdk.Context) (list []types.NocRootCertificatesByVidAndSkid) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), pkitypes.KeyPrefix(types.NocRootCertificatesByVidAndSkidKeyPrefix))
 	iterator := sdk.KVStorePrefixIterator(store, []byte{})

x/pki/keeper/noc_root_certificates_by_vid_and_skid_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/pki/types"
 )
 
-// Prevent strconv unused error
+// Prevent strconv unused error.
 var _ = strconv.IntSize
 
 func createNNocRootCertificatesByVidAndSkid(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.NocRootCertificatesByVidAndSkid {
@@ -23,6 +23,7 @@ func createNNocRootCertificatesByVidAndSkid(keeper *keeper.Keeper, ctx sdk.Conte
 
 		keeper.SetNocRootCertificatesByVidAndSkid(ctx, items[i])
 	}
+
 	return items
 }
 

x/pki/types/genesis.go

@@ -33,7 +33,7 @@ func DefaultGenesis() *GenesisState {
 
 // Validate performs basic genesis state validation returning an error upon any
 // failure.
-func (gs GenesisState) Validate() error {
+func (gs GenesisState) Validate() error { //nolint:gocyclo,vet
 	// Check for duplicated index in approvedCertificates
 	approvedCertificatesIndexMap := make(map[string]struct{})
 

x/pki/types/key_noc_root_certificates_by_vid_and_skid.go

@@ -5,11 +5,11 @@ import "encoding/binary"
 var _ binary.ByteOrder
 
 const (
-	// NocRootCertificatesByVidAndSkidKeyPrefix is the prefix to retrieve all NocRootCertificatesByVidAndSkid
+	// NocRootCertificatesByVidAndSkidKeyPrefix is the prefix to retrieve all NocRootCertificatesByVidAndSkid.
 	NocRootCertificatesByVidAndSkidKeyPrefix = "NocRootCertificatesByVidAndSkid/value/"
 )
 
-// NocRootCertificatesByVidAndSkidKey returns the store key to retrieve a NocRootCertificatesByVidAndSkid from the index fields
+// NocRootCertificatesByVidAndSkidKey returns the store key to retrieve a NocRootCertificatesByVidAndSkid from the index fields.
 func NocRootCertificatesByVidAndSkidKey(
 	vid int32,
 	subjectKeyID string,
@@ -21,8 +21,8 @@ func NocRootCertificatesByVidAndSkidKey(
 	key = append(key, vidBytes...)
 	key = append(key, []byte("/")...)
 
-	subjectKeyIdBytes := []byte(subjectKeyID)
-	key = append(key, subjectKeyIdBytes...)
+	subjectKeyIDBytes := []byte(subjectKeyID)
+	key = append(key, subjectKeyIDBytes...)
 	key = append(key, []byte("/")...)
 
 	return key