Skip to content

Commit 48140b3

Browse files
committed
Remove ComplianceTest Module
1 parent 2c4957f commit 48140b3

File tree

91 files changed

+84
-7633
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+84
-7633
lines changed

app/app.go

-22
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ import (
3636
compliancemodule "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance"
3737
compliancemodulekeeper "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance/keeper"
3838
compliancemoduletypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance/types"
39-
compliancetestmodule "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliancetest"
40-
compliancetestmodulekeeper "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliancetest/keeper"
41-
compliancetestmoduletypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliancetest/types"
4239
dclauthmodule "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth"
4340
"github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth/ante"
4441
dclauthmodulekeeper "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth/keeper"
@@ -117,7 +114,6 @@ var (
117114
pkimodule.AppModuleBasic{},
118115
vendorinfomodule.AppModuleBasic{},
119116
modelmodule.AppModuleBasic{},
120-
compliancetestmodule.AppModuleBasic{},
121117
compliancemodule.AppModuleBasic{},
122118
// this line is used by starport scaffolding # stargate/app/moduleBasic
123119
)
@@ -203,8 +199,6 @@ type App struct {
203199

204200
ModelKeeper modelmodulekeeper.Keeper
205201

206-
CompliancetestKeeper compliancetestmodulekeeper.Keeper
207-
208202
ComplianceKeeper compliancemodulekeeper.Keeper
209203
// this line is used by starport scaffolding # stargate/app/keeperDeclaration
210204

@@ -248,7 +242,6 @@ func New(
248242
pkimoduletypes.StoreKey,
249243
vendorinfomoduletypes.StoreKey,
250244
modelmoduletypes.StoreKey,
251-
compliancetestmoduletypes.StoreKey,
252245
compliancemoduletypes.StoreKey,
253246
// this line is used by starport scaffolding # stargate/app/storeKey
254247
)
@@ -399,24 +392,12 @@ func New(
399392
)
400393
modelModule := modelmodule.NewAppModule(appCodec, app.ModelKeeper)
401394

402-
app.CompliancetestKeeper = *compliancetestmodulekeeper.NewKeeper(
403-
appCodec,
404-
keys[compliancetestmoduletypes.StoreKey],
405-
keys[compliancetestmoduletypes.MemStoreKey],
406-
407-
app.DclauthKeeper,
408-
app.ModelKeeper,
409-
)
410-
compliancetestModule := compliancetestmodule.NewAppModule(appCodec, app.CompliancetestKeeper)
411-
412395
app.ComplianceKeeper = *compliancemodulekeeper.NewKeeper(
413396
appCodec,
414397
keys[compliancemoduletypes.StoreKey],
415398
keys[compliancemoduletypes.MemStoreKey],
416-
417399
app.DclauthKeeper,
418400
app.ModelKeeper,
419-
app.CompliancetestKeeper,
420401
)
421402
complianceModule := compliancemodule.NewAppModule(appCodec, app.ComplianceKeeper)
422403

@@ -471,7 +452,6 @@ func New(
471452
pkiModule,
472453
vendorinfoModule,
473454
modelModule,
474-
compliancetestModule,
475455
complianceModule,
476456
// this line is used by starport scaffolding # stargate/app/appModule
477457
)
@@ -523,7 +503,6 @@ func New(
523503
pkimoduletypes.ModuleName,
524504
vendorinfomoduletypes.ModuleName,
525505
modelmoduletypes.ModuleName,
526-
compliancetestmoduletypes.ModuleName,
527506
compliancemoduletypes.ModuleName,
528507
// this line is used by starport scaffolding # stargate/app/initGenesis
529508
)
@@ -724,7 +703,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
724703
paramsKeeper.Subspace(pkimoduletypes.ModuleName)
725704
paramsKeeper.Subspace(vendorinfomoduletypes.ModuleName)
726705
paramsKeeper.Subspace(modelmoduletypes.ModuleName)
727-
paramsKeeper.Subspace(compliancetestmoduletypes.ModuleName)
728706
paramsKeeper.Subspace(compliancemoduletypes.ModuleName)
729707
// this line is used by starport scaffolding # stargate/app/paramSubspace
730708

deployment/persistent_chains/testnet/genesis.json

-3
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@
9494
"compliance": {
9595
"compliance_model_records": []
9696
},
97-
"compliancetest": {
98-
"testing_result_records": []
99-
},
10097
"pki": {
10198
"proposed_certificates": [],
10299
"approved_certificates_records": [],

docs/how-to.md

+2-27
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ the following instructions can be used for every role (see [Use Case Diagrams](u
2828
- publish device model info
2929
- publish X509 certificates
3030
- revoke X509 certificates
31-
- [Test House](#test-house-instructions)
32-
- publish compliance test results
33-
- publish X509 certificates
34-
- revoke X509 certificates
3531
- [Certification Center](#certification-center-instructions)
3632
- certify or revoke certification of device models
3733
- publish X509 certificates
@@ -250,27 +246,6 @@ dcld tx model update-model --vid=<uint16> --pid=<uint16> ... --from=<account>
250246
```
251247
dcld tx model update-model-version --vid=<uint16> --pid=<uint16> --softwareVersion=<uint32> ... --from=<account>
252248
```
253-
254-
## Test House Instructions
255-
##### 1A. Publish an intermediate or leaf X509 certificate(s) to be used for signing the Certification blob
256-
This step is needed for off-ledger certification use case only, see [use_cases_device_off_ledger_certification](use_cases/use_cases_device_off_ledger_certification.png).
257-
258-
The certificate must be signed by a chain of certificates which must be already present on the ledger.
259-
260-
```
261-
dcld tx pki add-x509-cert --certificate=<string-or-path> --from=<account>
262-
```
263-
264-
##### 1B. Add a new testing result for the device model with the given VID/PID
265-
This step is needed for on-ledger certification use case only, see [use_cases_device_on_ledger_certification](use_cases/use_cases_device_on_ledger_certification.png).
266-
267-
The corresponding model must present on the ledger.
268-
269-
```
270-
dcld tx compliancetest add-test-result --vid=<uint16> --pid=<uint16> --softwareVersion=<uint32> --softwareVersionString=<string> --test-result=<string-or-path> --test-date=<rfc3339 encoded date> --from=<account>
271-
```
272-
273-
274249
## Certification Center Instructions
275250
##### 1A. Publish an intermediate or leaf X509 certificate(s) to be used for signing the Certification blob
276251
This step is needed for off-ledger certification use case only, see [use_cases_device_off_ledger_certification](use_cases/use_cases_device_off_ledger_certification.png).
@@ -284,7 +259,7 @@ dcld tx pki add-x509-cert --certificate=<string-or-path> --from=<account>
284259
##### 1B. Certify the device model with the given VID/PID
285260
This step is needed for on-ledger certification use case only, see [use_cases_device_on_ledger_certification](use_cases/use_cases_device_on_ledger_certification.png).
286261

287-
The corresponding model and the test results must be present on the ledger.
262+
The corresponding model and the version must be present on the ledger.
288263

289264
```
290265
dcld tx compliance certify-model --vid=<uint16> --pid=<uint16> --softwareVersion=<uint32> --softwareVersionString=<string> --certificationType=<matter|zigbee> --certificationDate=<rfc3339 encoded date> --reason=<string> --from=<account>
@@ -295,7 +270,7 @@ This step can be used in either on-ledger certification use case
295270
([use_cases_device_on_ledger_certification](use_cases/use_cases_device_on_ledger_certification.png))
296271
or off-ledger certification use case ([use_cases_device_off_ledger_certification](use_cases/use_cases_device_off_ledger_certification.png)).
297272

298-
The corresponding Model Info and test results are not required to be on the ledger.
273+
The corresponding Model Info is not required to be on the ledger.
299274

300275
```
301276
dcld tx compliance revoke-model --vid=<uint16> --pid=<uint16> --softwareVersion=<uint32> --certificationType=<matter|zigbee> --revocationDate=<rfc3339 encoded date> --reason=<string> --from=<account>

0 commit comments

Comments
 (0)