Skip to content

Commit

Permalink
Merge branch 'master' into #303-Upgrade-Cosmos-SDK
Browse files Browse the repository at this point in the history 
Signed-off-by: Abdulbois <abdulbois123@gmail.com>

# Conflicts:
#	integration_tests/cli/compliance-demo.sh
#	integration_tests/cli/compliance-provisioning.sh
#	integration_tests/cli/compliance-revocation.sh
#	integration_tests/cli/model-demo.sh
#	integration_tests/cli/modelversion-demo.sh
#	integration_tests/cli/pki-demo.sh
#	integration_tests/cli/pki-revocation-points.sh
#	integration_tests/cli/vendorinfo-demo.sh
#	integration_tests/light_client_proxy/pki.sh
#	proto/zigbeealliance/distributedcomplianceledger/pki/approved_certificates.proto
#	proto/zigbeealliance/distributedcomplianceledger/pki/genesis.proto
#	proto/zigbeealliance/distributedcomplianceledger/pki/noc_certificates.proto
#	proto/zigbeealliance/distributedcomplianceledger/pki/noc_root_certificates.proto
#	proto/zigbeealliance/distributedcomplianceledger/pki/query.proto
#	proto/zigbeealliance/distributedcomplianceledger/pki/revoked_noc_root_certificates.proto
#	types/pki/errors.go
#	x/compliance/types/compliance_info.pb.go
#	x/compliance/types/device_software_compliance.pb.go
#	x/compliance/types/genesis.pb.go
#	x/compliance/types/tx.pb.go
#	x/model/types/model.pb.go
#	x/model/types/model_version.pb.go
#	x/model/types/tx.pb.go
#	x/pki/keeper/msg_server_add_x_509_cert.go
#	x/pki/keeper/msg_server_propose_add_x_509_root_cert.go
#	x/pki/keeper/msg_server_revoke_x_509_cert.go
#	x/pki/types/approved_certificates.pb.go
#	x/pki/types/certificate.pb.go
#	x/pki/types/genesis.pb.go
#	x/pki/types/pki_revocation_distribution_point.pb.go
#	x/pki/types/proposed_certificate.pb.go
#	x/pki/types/proposed_certificate_revocation.pb.go
#	x/pki/types/query.pb.go
#	x/pki/types/rejected_certificate.pb.go
#	x/pki/types/revoked_certificates.pb.go
#	x/pki/types/tx.pb.go
#	x/vendorinfo/types/tx.pb.go
#	x/vendorinfo/types/vendor_info.pb.go
  • Loading branch information
@Abdulbois
Abdulbois committed Apr 15, 2024
2 parents 034ef55 + 9ad0b95 commit 75c2f3d
Show file tree
Hide file tree
Showing 81 changed files with 3,244 additions and 2,240 deletions.
42 changes: 29 additions & 13 deletions docs/static/openapi.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9297,17 +9297,17 @@ paths:
type: string
tags:
- Query
/dcl/pki/noc-certificates:
/dcl/pki/noc-ica-certificates:
get:
summary: Queries a list of NocCertificates items.
operationId: NocCertificatesAll
summary: Queries a list of NocIcaCertificates items.
operationId: NocIcaCertificatesAll
responses:
'200':
description: A successful response.
schema:
type: object
properties:
nocCertificates:
nocIcaCertificates:
type: array
items:
type: object
Expand Down Expand Up @@ -9482,17 +9482,17 @@ paths:
type: boolean
tags:
- Query
/dcl/pki/noc-certificates/{vid}:
/dcl/pki/noc-ica-certificates/{vid}:
get:
summary: Queries a NocCertificates by index.
operationId: NocCertificates
summary: Queries a NocIcaCertificates by index.
operationId: NocIcaCertificates
responses:
'200':
description: A successful response.
schema:
type: object
properties:
nocCertificates:
nocIcaCertificates:
type: object
properties:
vid:
Expand Down Expand Up @@ -10705,6 +10705,8 @@ paths:
schemaVersion:
type: integer
format: int64
crlSignerDelegator:
type: string
pagination:
type: object
properties:
Expand Down Expand Up @@ -10863,6 +10865,8 @@ paths:
schemaVersion:
type: integer
format: int64
crlSignerDelegator:
type: string
default:
description: An unexpected error response.
schema:
Expand Down Expand Up @@ -10935,6 +10939,8 @@ paths:
schemaVersion:
type: integer
format: int64
crlSignerDelegator:
type: string
default:
description: An unexpected error response.
schema:
Expand Down Expand Up @@ -21678,7 +21684,7 @@ definitions:
format: int64
info:
type: string
zigbeealliance.distributedcomplianceledger.pki.NocCertificates:
zigbeealliance.distributedcomplianceledger.pki.NocIcaCertificates:
type: object
properties:
vid:
Expand Down Expand Up @@ -21841,6 +21847,8 @@ definitions:
schemaVersion:
type: integer
format: int64
crlSignerDelegator:
type: string
zigbeealliance.distributedcomplianceledger.pki.PkiRevocationDistributionPointsByIssuerSubjectKeyID:
type: object
properties:
Expand Down Expand Up @@ -21881,6 +21889,8 @@ definitions:
schemaVersion:
type: integer
format: int64
crlSignerDelegator:
type: string
zigbeealliance.distributedcomplianceledger.pki.ProposedCertificate:
type: object
properties:
Expand Down Expand Up @@ -22056,10 +22066,10 @@ definitions:
repeated Bar results = 1;
PageResponse page = 2;
}
zigbeealliance.distributedcomplianceledger.pki.QueryAllNocCertificatesResponse:
zigbeealliance.distributedcomplianceledger.pki.QueryAllNocIcaCertificatesResponse:
type: object
properties:
nocCertificates:
nocIcaCertificates:
type: array
items:
type: object
Expand Down Expand Up @@ -22284,6 +22294,8 @@ definitions:
schemaVersion:
type: integer
format: int64
crlSignerDelegator:
type: string
pagination:
type: object
properties:
Expand Down Expand Up @@ -22857,10 +22869,10 @@ definitions:
type: string
subjectKeyId:
type: string
zigbeealliance.distributedcomplianceledger.pki.QueryGetNocCertificatesResponse:
zigbeealliance.distributedcomplianceledger.pki.QueryGetNocIcaCertificatesResponse:
type: object
properties:
nocCertificates:
nocIcaCertificates:
type: object
properties:
vid:
Expand Down Expand Up @@ -23029,6 +23041,8 @@ definitions:
schemaVersion:
type: integer
format: int64
crlSignerDelegator:
type: string
zigbeealliance.distributedcomplianceledger.pki.QueryGetPkiRevocationDistributionPointsByIssuerSubjectKeyIDResponse:
type: object
properties:
Expand Down Expand Up @@ -23072,6 +23086,8 @@ definitions:
schemaVersion:
type: integer
format: int64
crlSignerDelegator:
type: string
zigbeealliance.distributedcomplianceledger.pki.QueryGetProposedCertificateResponse:
type: object
properties:
Expand Down
Loading

0 comments on commit 75c2f3d

Please sign in to comment.