[FAB-6671] call VSCC for tx with pvt writes only

VSCC validation applies only if there are public writes in a transaction.
This change set forces VSCC validation if there are only private writes
in a transaction (hashed rwset).

Change-Id: Ie3abc4e613a5c547fa8676d9aa390f17d167a9d9
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>

Author: ale-linux

core/committer/txvalidator/validator.go

@@ -654,6 +654,29 @@ func (v *vsccValidatorImpl) GetInfoForValidate(txid, chID, ccID string) (*sysccp
 	return cc, vscc, policy, nil
 }
 
+// txWritesToNamespace returns true if the supplied NsRwSet
+// performs a ledger write
+func (v *vsccValidatorImpl) txWritesToNamespace(ns *rwsetutil.NsRwSet) bool {
+	// check for public writes first
+	if ns.KvRwSet != nil && len(ns.KvRwSet.Writes) > 0 {
+		return true
+	}
+
+	// do not look at collection data if we don't support that capability
+	if !v.support.Capabilities().PrivateChannelData() {
+		return false
+	}
+
+	// check for private writes for all collections
+	for _, c := range ns.CollHashedRwSets {
+		if c.HashedRwSet != nil && len(c.HashedRwSet.HashedWrites) > 0 {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (v *vsccValidatorImpl) VSCCValidateTx(payload *common.Payload, envBytes []byte, env *common.Envelope) (error, peer.TxValidationCode) {
 	logger.Debugf("VSCCValidateTx starts for env %p envbytes %p", env, envBytes)
 	defer logger.Debugf("VSCCValidateTx completes for env %p envbytes %p", env, envBytes)
@@ -687,7 +710,7 @@ func (v *vsccValidatorImpl) VSCCValidateTx(payload *common.Payload, envBytes []b
 		return fmt.Errorf("txRWSet.FromProtoBytes failed, error %s", err), peer.TxValidationCode_BAD_RWSET
 	}
 	for _, ns := range txRWSet.NsRwSets {
-		if len(ns.KvRwSet.Writes) > 0 {
+		if v.txWritesToNamespace(ns) {
 			wrNamespace = append(wrNamespace, ns.NameSpace)
 
 			if !writesToLSCC && ns.NameSpace == "lscc" {

core/committer/txvalidator/validator_test.go

@@ -208,6 +208,38 @@ func TestInvokeOK(t *testing.T) {
 	assertValid(b, t)
 }
 
+func TestInvokeOKPvtDataOnly(t *testing.T) {
+	l, v := setupLedgerAndValidator(t)
+	defer ledgermgmt.CleanupTestEnv()
+	defer l.Close()
+
+	v.(*txValidator).support.(struct {
+		*mocktxvalidator.Support
+		*semaphore.Weighted
+	}).ACVal = &mockconfig.MockApplicationCapabilities{PrivateChannelDataRv: true}
+
+	ccID := "mycc"
+
+	putCCInfo(l, ccID, signedByAnyMember([]string{"DEFAULT"}), t)
+
+	rwsetBuilder := rwsetutil.NewRWSetBuilder()
+	rwsetBuilder.AddToPvtAndHashedWriteSet(ccID, "mycollection", "somekey", nil)
+	rwset, err := rwsetBuilder.GetTxSimulationResults()
+	assert.NoError(t, err)
+	rwsetBytes, err := rwset.GetPubSimulationBytes()
+	assert.NoError(t, err)
+
+	tx := getEnv(ccID, rwsetBytes, t)
+	b := &common.Block{Data: &common.BlockData{Data: [][]byte{utils.MarshalOrPanic(tx)}}}
+
+	v.(*txValidator).vscc.(*vsccValidatorImpl).ccprovider.(*ccprovider.MockCcProviderImpl).ExecuteResultProvider = nil
+	v.(*txValidator).vscc.(*vsccValidatorImpl).ccprovider.(*ccprovider.MockCcProviderImpl).ExecuteChaincodeResponse = &peer.Response{Status: shim.ERROR}
+
+	err = v.Validate(b)
+	assert.NoError(t, err)
+	assertInvalid(b, t, peer.TxValidationCode_ENDORSEMENT_POLICY_FAILURE)
+}
+
 func TestInvokeOKSCC(t *testing.T) {
 	l, v := setupLedgerAndValidator(t)
 	defer ledgermgmt.CleanupTestEnv()

core/mocks/ccprovider/ccprovider.go

@@ -38,12 +38,13 @@ type MockCcProviderFactory struct {
 
 // NewChaincodeProvider returns a mock implementation of the ccprovider.ChaincodeProvider interface
 func (c *MockCcProviderFactory) NewChaincodeProvider() ccprovider.ChaincodeProvider {
-	return &mockCcProviderImpl{c.ExecuteResultProvider}
+	return &MockCcProviderImpl{ExecuteResultProvider: c.ExecuteResultProvider}
 }
 
 // mockCcProviderImpl is a mock implementation of the chaincode provider
-type mockCcProviderImpl struct {
-	executeResultProvider ExecuteChaincodeResultProvider
+type MockCcProviderImpl struct {
+	ExecuteResultProvider    ExecuteChaincodeResultProvider
+	ExecuteChaincodeResponse *peer.Response
 }
 
 type mockCcProviderContextImpl struct {
@@ -121,34 +122,43 @@ func (m *MockTxSim) SetPrivateDataMultipleKeys(namespace, collection string, kvs
 }
 
 // GetContext does nothing
-func (c *mockCcProviderImpl) GetContext(ledger ledger.PeerLedger, txid string) (context.Context, ledger.TxSimulator, error) {
+func (c *MockCcProviderImpl) GetContext(ledger ledger.PeerLedger, txid string) (context.Context, ledger.TxSimulator, error) {
 	return nil, &MockTxSim{}, nil
 }
 
 // GetCCContext does nothing
-func (c *mockCcProviderImpl) GetCCContext(cid, name, version, txid string, syscc bool, signedProp *peer.SignedProposal, prop *peer.Proposal) interface{} {
+func (c *MockCcProviderImpl) GetCCContext(cid, name, version, txid string, syscc bool, signedProp *peer.SignedProposal, prop *peer.Proposal) interface{} {
 	return &mockCcProviderContextImpl{}
 }
 
+// GetCCValidationInfoFromLSCC does nothing
+func (c *MockCcProviderImpl) GetCCValidationInfoFromLSCC(ctxt context.Context, txid string, signedProp *peer.SignedProposal, prop *peer.Proposal, chainID string, chaincodeID string) (string, []byte, error) {
+	return "vscc", nil, nil
+}
+
 // ExecuteChaincode does nothing
-func (c *mockCcProviderImpl) ExecuteChaincode(ctxt context.Context, cccid interface{}, args [][]byte) (*peer.Response, *peer.ChaincodeEvent, error) {
-	if c.executeResultProvider != nil {
-		return c.executeResultProvider.ExecuteChaincodeResult()
+func (c *MockCcProviderImpl) ExecuteChaincode(ctxt context.Context, cccid interface{}, args [][]byte) (*peer.Response, *peer.ChaincodeEvent, error) {
+	if c.ExecuteResultProvider != nil {
+		return c.ExecuteResultProvider.ExecuteChaincodeResult()
+	}
+	if c.ExecuteChaincodeResponse == nil {
+		return &peer.Response{Status: shim.OK}, nil, nil
+	} else {
+		return c.ExecuteChaincodeResponse, nil, nil
 	}
-	return &peer.Response{Status: shim.OK}, nil, nil
 }
 
 // Execute executes the chaincode given context and spec (invocation or deploy)
-func (c *mockCcProviderImpl) Execute(ctxt context.Context, cccid interface{}, spec interface{}) (*peer.Response, *peer.ChaincodeEvent, error) {
+func (c *MockCcProviderImpl) Execute(ctxt context.Context, cccid interface{}, spec interface{}) (*peer.Response, *peer.ChaincodeEvent, error) {
 	return nil, nil, nil
 }
 
 // ExecuteWithErrorFilter executes the chaincode given context and spec and returns payload
-func (c *mockCcProviderImpl) ExecuteWithErrorFilter(ctxt context.Context, cccid interface{}, spec interface{}) ([]byte, *peer.ChaincodeEvent, error) {
+func (c *MockCcProviderImpl) ExecuteWithErrorFilter(ctxt context.Context, cccid interface{}, spec interface{}) ([]byte, *peer.ChaincodeEvent, error) {
 	return nil, nil, nil
 }
 
 // Stop stops the chaincode given context and deployment spec
-func (c *mockCcProviderImpl) Stop(ctxt context.Context, cccid interface{}, spec *peer.ChaincodeDeploymentSpec) error {
+func (c *MockCcProviderImpl) Stop(ctxt context.Context, cccid interface{}, spec *peer.ChaincodeDeploymentSpec) error {
 	return nil
 }