[FAB-10026] Store to filter collection configs

While the transient store returns results of the private data simulations
it uses filter to return the relevant namespaces and collections, however
the provided filter is not applied for for the collections configs. This
comments adds filtering of the configs based on filter used for private
data itself.

Change-Id: I8788717ae93a1f522feaf2aa2feb935a780f6594
Signed-off-by: Artem Barger <bartem@il.ibm.com>

Author: C0rWin

core/transientstore/store.go

@@ -403,7 +403,13 @@ func (scanner *RwsetScanner) NextWithConfig() (*EndorserPvtSimulationResultsWith
 		if err := proto.Unmarshal(dbVal[1:], txPvtRWSetWithConfig); err != nil {
 			return nil, err
 		}
+
 		filteredTxPvtRWSet = trimPvtWSet(txPvtRWSetWithConfig.GetPvtRwset(), scanner.filter)
+		configs, err := trimPvtCollectionConfigs(txPvtRWSetWithConfig.CollectionConfigs, scanner.filter)
+		if err != nil {
+			return nil, err
+		}
+		txPvtRWSetWithConfig.CollectionConfigs = configs
 	} else {
 		// old proto, i.e., TxPvtReadWriteSet
 		if err := proto.Unmarshal(dbVal, txPvtRWSet); err != nil {

core/transientstore/store_helper.go

@@ -8,11 +8,13 @@ package transientstore
 
 import (
 	"bytes"
+	"errors"
 	"path/filepath"
 
 	"github.com/hyperledger/fabric/common/ledger/util"
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/core/ledger"
+	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/ledger/rwset"
 )
 
@@ -215,3 +217,26 @@ func trimPvtWSet(pvtWSet *rwset.TxPvtReadWriteSet, filter ledger.PvtNsCollFilter
 	}
 	return filteredTxPvtRwSet
 }
+
+func trimPvtCollectionConfigs(configs map[string]*common.CollectionConfigPackage,
+	filter ledger.PvtNsCollFilter) (map[string]*common.CollectionConfigPackage, error) {
+	if filter == nil {
+		return configs, nil
+	}
+	result := make(map[string]*common.CollectionConfigPackage)
+
+	for ns, pkg := range configs {
+		result[ns] = &common.CollectionConfigPackage{}
+		for _, colConf := range pkg.GetConfig() {
+			switch cconf := colConf.Payload.(type) {
+			case *common.CollectionConfig_StaticCollectionConfig:
+				if filter.Has(ns, cconf.StaticCollectionConfig.Name) {
+					result[ns].Config = append(result[ns].Config, colConf)
+				}
+			default:
+				return nil, errors.New("unexpected collection type")
+			}
+		}
+	}
+	return result, nil
+}

core/transientstore/store_test.go

@@ -12,7 +12,6 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/golang/protobuf/proto"
 
 	"github.com/hyperledger/fabric/common/cauthdsl"
@@ -479,6 +478,16 @@ func TestTransientStoreRetrievalWithFilter(t *testing.T) {
 	expectedSimulationRes := samplePvtSimResWithConfig
 	expectedSimulationRes.GetPvtRwset().NsPvtRwset[0].CollectionPvtRwset = expectedSimulationRes.GetPvtRwset().NsPvtRwset[0].CollectionPvtRwset[0:1]
 	expectedSimulationRes.GetPvtRwset().NsPvtRwset[1].CollectionPvtRwset = expectedSimulationRes.GetPvtRwset().NsPvtRwset[1].CollectionPvtRwset[1:]
+	expectedSimulationRes.CollectionConfigs, err = trimPvtCollectionConfigs(expectedSimulationRes.CollectionConfigs, filter)
+	assert.NoError(t, err)
+	for ns, colName := range map[string]string{"ns-1": "coll-1", "ns-2": "coll-2"} {
+		config := expectedSimulationRes.CollectionConfigs[ns]
+		assert.NotNil(t, config)
+		ns1Config := config.Config
+		assert.Equal(t, len(ns1Config), 1)
+		ns1ColConfig := ns1Config[0].GetStaticCollectionConfig()
+		assert.NotNil(t, ns1ColConfig.Name, colName)
+	}
 
 	var expectedRes []*EndorserPvtSimulationResultsWithConfig
 	for i := 0; i < numEntries; i++ {
@@ -490,7 +499,6 @@ func TestTransientStoreRetrievalWithFilter(t *testing.T) {
 	sortResults(expectedRes)
 	sortResults(actualRes)
 	assert.Equal(t, expectedRes, actualRes)
-	t.Logf("Actual Res = %s", spew.Sdump(actualRes))
 }
 
 func sortResults(res []*EndorserPvtSimulationResultsWithConfig) {

integration/runner/cryptogen.go

@@ -8,6 +8,7 @@ package runner
 
 import (
 	"os/exec"
+
 	"github.com/tedsuo/ifrit/ginkgomon"
 )