Merge branch 'delete-model-version-child-1' of https://github.com/zigbee-alliance/distributed-compliance-ledger into delete-model-version

Author: DenisRybas

integration_tests/cli/model-negative-cases.sh

@@ -27,6 +27,11 @@ vendor_account=vendor_account_$vid
 echo "Create Vendor account - $vendor_account"
 create_new_vendor_account $vendor_account $vid
 
+test_divider
+
+echo "Create CertificationCenter account"
+create_new_account zb_account "CertificationCenter"
+
 # Body
 
 # Ledger side errors
@@ -54,6 +59,24 @@ echo "$result"
 
 test_divider
 
+sv=$RANDOM
+echo "Create a Device Model Version with VID: $vid PID: $pid SV: $sv"
+result=$(echo 'test1234' | dcld tx model add-model-version --cdVersionNumber=1 --maxApplicableSoftwareVersion=10 --minApplicableSoftwareVersion=1 --vid=$vid --pid=$pid --softwareVersion=$sv --softwareVersionString=1 --from=$vendor_account --yes)
+echo "$result"
+check_response "$result" "\"code\": 0"
+
+certification_date="2020-01-01T00:00:01Z"
+zigbee_certification_type="zigbee"
+matter_certification_type="matter"
+cd_certificate_id="123"
+result=$(echo 'test1234' | dcld tx compliance certify-model --vid=$vid --pid=$pid --softwareVersion=$sv --certificationType="$zigbee_certification_type" --certificationDate="$certification_date" --cdCertificateId="$cd_certificate_id" --from $zb_account --yes)
+echo "$result"
+
+echo "Delete Model with VID: ${vid} PID: ${pid}"
+result=$(dcld tx model delete-model --vid=$vid --pid=$pid --from=$vendor_account --yes)
+check_response "$result" "\"code\": 524" # code for model certified error
+
+
 # CLI side errors
 
 echo "Add Model with VID: $vid PID: $pid: Unknown account"

integration_tests/grpc_rest/model/grpc_test.go

@@ -62,3 +62,8 @@ func TestDeleteModelWithAssociatedModelVersionsGRPC(t *testing.T) {
 	suite := utils.SetupTest(t, testconstants.ChainID, false)
 	model.DeleteModelWithAssociatedModelVersions(&suite)
 }
+
+func TestDeleteModelWithAssociatedModelVersionsCertifiedGRPC(t *testing.T) {
+	suite := utils.SetupTest(t, testconstants.ChainID, false)
+	model.DeleteModelWithAssociatedModelVersionsCertified(&suite)
+}

integration_tests/grpc_rest/model/helpers.go

@@ -25,6 +25,7 @@ import (
 	testconstants "github.com/zigbee-alliance/distributed-compliance-ledger/integration_tests/constants"
 	test_dclauth "github.com/zigbee-alliance/distributed-compliance-ledger/integration_tests/grpc_rest/dclauth"
 	"github.com/zigbee-alliance/distributed-compliance-ledger/integration_tests/utils"
+	dclcompltypes "github.com/zigbee-alliance/distributed-compliance-ledger/types/compliance"
 	dclauthtypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth/types"
 	modeltypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/model/types"
 )
@@ -124,6 +125,21 @@ func NewMsgUpdateModelVersion(
 	}
 }
 
+func NewMsgCertifyModelVersion(
+	signer string,
+	vid int32,
+	pid int32,
+) *dclcompltypes.MsgCertifyModel {
+	return &dclcompltypes.MsgCertifyModel{
+		Signer:            signer,
+		Vid:               vid,
+		Pid:               pid,
+		CertificationDate: testconstants.CertificationDate,
+		CDCertificateId:   testconstants.CDCertificateID,
+		CertificationType: testconstants.CertificationType,
+	}
+}
+
 func AddModel(
 	suite *utils.TestSuite,
 	msg *modeltypes.MsgCreateModel,
@@ -395,6 +411,75 @@ func DeleteModelWithAssociatedModelVersions(suite *utils.TestSuite) {
 	require.Nil(suite.T, modelVersion2)
 }
 
+func DeleteModelWithAssociatedModelVersionsCertified(suite *utils.TestSuite) {
+	// Alice and Bob are predefined Trustees
+	aliceName := testconstants.AliceAccount
+	aliceKeyInfo, err := suite.Kr.Key(aliceName)
+	require.NoError(suite.T, err)
+	aliceAccount, err := test_dclauth.GetAccount(suite, aliceKeyInfo.GetAddress())
+	require.NoError(suite.T, err)
+
+	bobName := testconstants.BobAccount
+	bobKeyInfo, err := suite.Kr.Key(bobName)
+	require.NoError(suite.T, err)
+	bobAccount, err := test_dclauth.GetAccount(suite, bobKeyInfo.GetAddress())
+	require.NoError(suite.T, err)
+
+	// Register new Vendor account
+	vid := int32(tmrand.Uint16())
+	vendorName := utils.RandString()
+	vendorAccount := test_dclauth.CreateVendorAccount(
+		suite,
+		vendorName,
+		dclauthtypes.AccountRoles{dclauthtypes.Vendor},
+		vid,
+		aliceName,
+		aliceAccount,
+		bobName,
+		bobAccount,
+		testconstants.Info,
+	)
+	require.NotNil(suite.T, vendorAccount)
+
+	// New vendor adds a model
+	pid := int32(tmrand.Uint16())
+	createModelMsg := NewMsgCreateModel(vid, pid, vendorAccount.Address)
+	_, err = suite.BuildAndBroadcastTx([]sdk.Msg{createModelMsg}, vendorName, vendorAccount)
+	require.NoError(suite.T, err)
+
+	createModelVersionMsg1 := NewMsgCreateModelVersion(vid, pid, 1, "1", vendorName)
+	_, err = suite.BuildAndBroadcastTx([]sdk.Msg{createModelVersionMsg1}, vendorName, vendorAccount)
+	require.NoError(suite.T, err)
+
+	createModelVersionMsg2 := NewMsgCreateModelVersion(vid, pid, 2, "2", vendorName)
+	_, err = suite.BuildAndBroadcastTx([]sdk.Msg{createModelVersionMsg2}, vendorName, vendorAccount)
+	require.NoError(suite.T, err)
+
+	// certify model version
+	certifyModelVersionMsg := NewMsgCertifyModelVersion(aliceName, vid, pid)
+	_, err = suite.BuildAndBroadcastTx([]sdk.Msg{certifyModelVersionMsg}, aliceName, aliceAccount)
+	require.NoError(suite.T, err)
+
+	deleteModelMsg := NewMsgDeleteModel(vid, pid, vendorName)
+	_, err = suite.BuildAndBroadcastTx([]sdk.Msg{deleteModelMsg}, vendorName, vendorAccount)
+	require.Error(suite.T, err)
+
+	// check if model is not deleted
+	model, err := GetModel(suite, deleteModelMsg.Vid, deleteModelMsg.Pid)
+	require.NoError(suite.T, err)
+	require.NotNil(suite.T, model)
+
+	// check if model version 1 is deleted
+	modelVersion1, err := GetModelVersion(suite, createModelVersionMsg1.Vid, createModelVersionMsg1.Pid, createModelVersionMsg1.SoftwareVersion)
+	require.NoError(suite.T, err)
+	require.NotNil(suite.T, modelVersion1)
+
+	// check if model version 2 is deleted
+	modelVersion2, err := GetModelVersion(suite, createModelVersionMsg2.Vid, createModelVersionMsg2.Pid, createModelVersionMsg2.SoftwareVersion)
+	require.NoError(suite.T, err)
+	require.NotNil(suite.T, modelVersion2)
+}
+
 func Demo(suite *utils.TestSuite) {
 	// Alice and Bob are predefined Trustees
 	aliceName := testconstants.AliceAccount

integration_tests/grpc_rest/model/rest_test.go

@@ -67,3 +67,8 @@ func TestDeleteModelWithAssociatedModelVersionsREST(t *testing.T) {
 	suite := utils.SetupTest(t, testconstants.ChainID, true)
 	model.DeleteModelWithAssociatedModelVersions(&suite)
 }
+
+func TestDeleteModelWithAssociatedModelVersionsCertifiedREST(t *testing.T) {
+	suite := utils.SetupTest(t, testconstants.ChainID, true)
+	model.DeleteModelWithAssociatedModelVersionsCertified(&suite)
+}

x/model/handler_test.go

@@ -427,7 +427,7 @@ func TestHandler_DeleteModel(t *testing.T) {
 	require.Equal(t, codes.NotFound, status.Code(err))
 }
 
-func TestHandler_DeleteModelWithAssociatedModelVersions(t *testing.T) {
+func TestHandler_DeleteModelWithAssociatedModelVersionsNotCertified(t *testing.T) {
 	setup := Setup(t)
 
 	// add new model
@@ -444,6 +444,7 @@ func TestHandler_DeleteModelWithAssociatedModelVersions(t *testing.T) {
 	_, err = setup.Handler(setup.Ctx, msgCreateModelVersion2)
 	require.NoError(t, err)
 
+	// mock model versions not to be certified
 	complianceKeeper := setup.ComplianceKeeper
 	complianceKeeper.On("GetComplianceInfo", mock.Anything, msgCreateModelVersion1.Vid, msgCreateModelVersion1.Pid, msgCreateModelVersion1.SoftwareVersion, mock.Anything).Return(false)
 	complianceKeeper.On("GetComplianceInfo", mock.Anything, msgCreateModelVersion2.Vid, msgCreateModelVersion2.Pid, msgCreateModelVersion2.SoftwareVersion, mock.Anything).Return(false)
@@ -472,6 +473,60 @@ func TestHandler_DeleteModelWithAssociatedModelVersions(t *testing.T) {
 	)
 	require.Error(t, err)
 	require.Equal(t, codes.NotFound, status.Code(err))
+
+	// query deleted model
+	_, err = queryModel(setup, msgDeleteModel.Vid, msgDeleteModel.Pid)
+	require.Error(t, err)
+	require.Equal(t, codes.NotFound, status.Code(err))
+}
+
+func TestHandler_DeleteModelWithAssociatedModelVersionsCertified(t *testing.T) {
+	setup := Setup(t)
+
+	// add new model
+	msgCreateModel := NewMsgCreateModel(setup.Vendor)
+	_, err := setup.Handler(setup.Ctx, msgCreateModel)
+	require.NoError(t, err)
+
+	// add two new model versions
+	msgCreateModelVersion1 := NewMsgCreateModelVersion(setup.Vendor, testconstants.SoftwareVersion)
+	_, err = setup.Handler(setup.Ctx, msgCreateModelVersion1)
+	require.NoError(t, err)
+
+	msgCreateModelVersion2 := NewMsgCreateModelVersion(setup.Vendor, testconstants.SoftwareVersion+1)
+	_, err = setup.Handler(setup.Ctx, msgCreateModelVersion2)
+	require.NoError(t, err)
+
+	// mock one model version to be certified
+	complianceKeeper := setup.ComplianceKeeper
+	complianceKeeper.On("GetComplianceInfo", mock.Anything, msgCreateModelVersion1.Vid, msgCreateModelVersion1.Pid, msgCreateModelVersion1.SoftwareVersion, mock.Anything).Return(false)
+	complianceKeeper.On("GetComplianceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(true)
+
+	msgDeleteModel := NewMsgDeleteModel(setup.Vendor)
+	_, err = setup.Handler(setup.Ctx, msgDeleteModel)
+	require.Error(t, err)
+
+	// query first deleted model version - should not be deleted
+	_, err = queryModelVersion(
+		setup,
+		msgCreateModelVersion1.Vid,
+		msgCreateModelVersion1.Pid,
+		msgCreateModelVersion1.SoftwareVersion,
+	)
+	require.NoError(t, err)
+
+	// query second deleted model version - should not be deleted
+	_, err = queryModelVersion(
+		setup,
+		msgCreateModelVersion2.Vid,
+		msgCreateModelVersion2.Pid,
+		msgCreateModelVersion2.SoftwareVersion,
+	)
+	require.NoError(t, err)
+
+	// query deleted model - should not be deleted
+	_, err = queryModel(setup, msgDeleteModel.Vid, msgDeleteModel.Pid)
+	require.NoError(t, err)
 }
 
 func TestHandler_OnlyOwnerAndVendorWithSameVidCanDeleteModel(t *testing.T) {

x/model/keeper/msg_server_model.go

@@ -172,7 +172,7 @@ func (k msgServer) DeleteModel(goCtx context.Context, msg *types.MsgDeleteModel)
 	if err != nil {
 		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid Address: (%s)", err)
 	}
-	
+
 	if err := checkModelRights(ctx, k.Keeper, signerAddr, msg.Vid, "MsgDeleteModel"); err != nil {
 		return nil, err
 	}
@@ -188,6 +188,14 @@ func (k msgServer) DeleteModel(goCtx context.Context, msg *types.MsgDeleteModel)
 		return nil, types.NewErrModelDoesNotExist(msg.Vid, msg.Pid)
 	}
 
+	modelVersions, found := k.GetModelVersions(ctx, msg.Vid, msg.Pid)
+
+	if found {
+		if err = removeAssociatedModelVersions(k, goCtx, modelVersions, *msg); err != nil {
+			return nil, err
+		}
+	}
+
 	// remove model from store
 	k.RemoveModel(
 		ctx,
@@ -198,24 +206,33 @@ func (k msgServer) DeleteModel(goCtx context.Context, msg *types.MsgDeleteModel)
 	// remove product from VendorProducts
 	k.RemoveVendorProduct(ctx, msg.Vid, msg.Pid)
 
-	modelVersions, found := k.GetModelVersions(ctx, msg.Vid, msg.Pid)
+	return &types.MsgDeleteModelResponse{}, nil
+}
 
-	if found {
-		// remove modelVersion for each softwareVersion
-		for _, softwareVersion := range modelVersions.SoftwareVersions {
-			msgDeleteModelVersion := types.NewMsgDeleteModelVersion(
-				msg.Creator, 
-				msg.Vid, 
-				msg.Pid, 
-				softwareVersion,
-			)
-	
-			k.DeleteModelVersion(goCtx, msgDeleteModelVersion)
+func removeAssociatedModelVersions(k msgServer, goCtx context.Context, modelVersions types.ModelVersions, msg types.MsgDeleteModel) error {
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	// check if no model version has certification record
+	for _, softwareVersion := range modelVersions.SoftwareVersions {
+		if k.IsModelCertified(ctx, msg.Vid, msg.Pid, softwareVersion) {
+			return types.NewErrModelVersionCertified(msg.Vid, msg.Pid, softwareVersion)
 		}
-	
-		// remove modelVersions record
-		k.RemoveModelVersions(ctx, msg.Vid, msg.Pid)
 	}
 
-	return &types.MsgDeleteModelResponse{}, nil
+	// remove modelVersion for each softwareVersion
+	for _, softwareVersion := range modelVersions.SoftwareVersions {
+		msgDeleteModelVersion := types.NewMsgDeleteModelVersion(
+			msg.Creator,
+			msg.Vid,
+			msg.Pid,
+			softwareVersion,
+		)
+
+		k.DeleteModelVersion(goCtx, msgDeleteModelVersion)
+	}
+
+	// remove modelVersions record
+	k.RemoveModelVersions(ctx, msg.Vid, msg.Pid)
+
+	return nil
 }