Merge pull request #91 from ankur325/SchemaChanges_0.7

Schema Changes to match 0.7 Chip Spec

Author: ashcherbakov

.dockerignore

@@ -1,3 +1,4 @@
 .idea
+.vscode
 build
 localnet

.github/workflows/go.yml

@@ -91,4 +91,4 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Check license
-        run: make license-check
+        run: make license-check

.golangci.yml

@@ -5,4 +5,5 @@ linters:
     - unparam
     - gochecknoinits
     - gochecknoglobals
-    - gomnd
+    - gomnd
+    - nolintlint

app.go

@@ -34,9 +34,10 @@ import (
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance"
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/compliancetest"
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/genutil"
-	"github.com/zigbee-alliance/distributed-compliance-ledger/x/modelinfo"
+	"github.com/zigbee-alliance/distributed-compliance-ledger/x/model"
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/pki"
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/validator"
+	"github.com/zigbee-alliance/distributed-compliance-ledger/x/vendorinfo"
 )
 
 const appName = "dc-ledger"
@@ -54,10 +55,11 @@ var ModuleBasics = module.NewBasicManager(
 	auth.AppModuleBasic{},
 	validator.AppModuleBasic{},
 	genutil.AppModuleBasic{},
-	modelinfo.AppModuleBasic{},
+	model.AppModuleBasic{},
 	compliance.AppModuleBasic{},
 	compliancetest.AppModuleBasic{},
 	pki.AppModuleBasic{},
+	vendorinfo.AppModuleBasic{},
 )
 
 // MakeCodec generates the necessary codecs for Amino.
@@ -82,10 +84,11 @@ type dcLedgerApp struct {
 	// Keepers
 	authKeeper           auth.Keeper
 	validatorKeeper      validator.Keeper
-	modelinfoKeeper      modelinfo.Keeper
+	modelKeeper          model.Keeper
 	pkiKeeper            pki.Keeper
 	complianceKeeper     compliance.Keeper
 	compliancetestKeeper compliancetest.Keeper
+	vendorinfoKeeper     vendorinfo.Keeper
 
 	// Module Manager
 	mm *module.Manager
@@ -102,7 +105,7 @@ func NewDcLedgerApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
 	bApp.SetAppVersion(version.Version)
 
 	keys := sdk.NewKVStoreKeys(bam.MainStoreKey, auth.StoreKey, validator.StoreKey,
-		modelinfo.StoreKey, compliance.StoreKey, compliancetest.StoreKey, pki.StoreKey)
+		model.StoreKey, compliance.StoreKey, compliancetest.StoreKey, pki.StoreKey, vendorinfo.StoreKey)
 
 	tkeys := sdk.NewTransientStoreKeys(params.TStoreKey)
 
@@ -148,10 +151,11 @@ func InitModuleManager(app *dcLedgerApp) {
 		genutil.NewAppModule(app.authKeeper, app.validatorKeeper, app.BaseApp.DeliverTx),
 		auth.NewAppModule(app.authKeeper),
 		validator.NewAppModule(app.validatorKeeper, app.authKeeper),
-		modelinfo.NewAppModule(app.modelinfoKeeper, app.authKeeper),
-		compliance.NewAppModule(app.complianceKeeper, app.modelinfoKeeper, app.compliancetestKeeper, app.authKeeper),
-		compliancetest.NewAppModule(app.compliancetestKeeper, app.authKeeper, app.modelinfoKeeper),
+		model.NewAppModule(app.modelKeeper, app.authKeeper),
+		compliance.NewAppModule(app.complianceKeeper, app.modelKeeper, app.compliancetestKeeper, app.authKeeper),
+		compliancetest.NewAppModule(app.compliancetestKeeper, app.authKeeper, app.modelKeeper),
 		pki.NewAppModule(app.pkiKeeper, app.authKeeper),
+		vendorinfo.NewAppModule(app.vendorinfoKeeper, app.authKeeper),
 	)
 
 	app.mm.SetOrderBeginBlockers(validator.ModuleName)
@@ -160,10 +164,11 @@ func InitModuleManager(app *dcLedgerApp) {
 	app.mm.SetOrderInitGenesis(
 		auth.ModuleName,
 		validator.ModuleName,
-		modelinfo.ModuleName,
+		model.ModuleName,
 		compliance.ModuleName,
 		compliancetest.ModuleName,
 		pki.ModuleName,
+		vendorinfo.ModuleName,
 		genutil.ModuleName,
 	)
 
@@ -175,8 +180,8 @@ func InitKeepers(app *dcLedgerApp, keys map[string]*sdk.KVStoreKey) {
 	// The Validator keeper
 	app.validatorKeeper = MakeValidatorKeeper(keys, app)
 
-	// The ModelinfoKeeper keeper
-	app.modelinfoKeeper = MakeModelinfoKeeper(keys, app)
+	// The ModelKeeper keeper
+	app.modelKeeper = MakeModelKeeper(keys, app)
 
 	// The ComplianceKeeper keeper
 	app.complianceKeeper = MakeComplianceKeeper(keys, app)
@@ -189,6 +194,9 @@ func InitKeepers(app *dcLedgerApp, keys map[string]*sdk.KVStoreKey) {
 
 	// The AuthKeeper keeper
 	app.authKeeper = MakeAuthKeeper(keys, app)
+
+	// The Vendor keeper
+	app.vendorinfoKeeper = MakeVendorInfoKeeper(keys, app)
 }
 
 func MakeAuthKeeper(keys map[string]*sdk.KVStoreKey, app *dcLedgerApp) auth.Keeper {
@@ -198,9 +206,16 @@ func MakeAuthKeeper(keys map[string]*sdk.KVStoreKey, app *dcLedgerApp) auth.Keep
 	)
 }
 
-func MakeModelinfoKeeper(keys map[string]*sdk.KVStoreKey, app *dcLedgerApp) modelinfo.Keeper {
-	return modelinfo.NewKeeper(
-		keys[modelinfo.StoreKey],
+func MakeModelKeeper(keys map[string]*sdk.KVStoreKey, app *dcLedgerApp) model.Keeper {
+	return model.NewKeeper(
+		keys[model.StoreKey],
+		app.cdc,
+	)
+}
+
+func MakeVendorInfoKeeper(keys map[string]*sdk.KVStoreKey, app *dcLedgerApp) vendorinfo.Keeper {
+	return vendorinfo.NewKeeper(
+		keys[vendorinfo.StoreKey],
 		app.cdc,
 	)
 }

deployment/persistent_chains/testnet/genesis.json

@@ -90,8 +90,8 @@
         }
       ]
     },
-    "modelinfo": {
-      "model_info_records": []
+    "model": {
+      "model_records": []
     },
     "compliance": {
       "compliance_model_records": []