[FAB-9949] Non-instanced collection config retrieval

This change set makes the collection store have a non-instanced method
for collection config retrieval.

This is needed both for pluggable validation, and for service discovery.

Change-Id: Ic7455727a4618c907b2112480e160a53bb6f6ebe
Signed-off-by: yacovm <yacovm@il.ibm.com>

Author: yacovm

core/common/privdata/store.go

@@ -21,15 +21,17 @@ type Support interface {
 	// GetQueryExecutorForLedger returns a query executor for the specified channel
 	GetQueryExecutorForLedger(cid string) (ledger.QueryExecutor, error)
 
-	// GetCollectionKVSKey returns the name of the collection
-	// given the collection criteria
-	GetCollectionKVSKey(cc common.CollectionCriteria) string
-
 	// GetIdentityDeserializer returns an IdentityDeserializer
 	// instance for the specified chain
 	GetIdentityDeserializer(chainID string) msp.IdentityDeserializer
 }
 
+// StateGetter retrieves data from the state
+type State interface {
+	// GetState retrieves the value for the given key in the given namespace
+	GetState(namespace string, key string) ([]byte, error)
+}
+
 type NoSuchCollectionError common.CollectionCriteria
 
 func (f NoSuchCollectionError) Error() string {
@@ -54,8 +56,12 @@ func (c *simpleCollectionStore) retrieveCollectionConfigPackage(cc common.Collec
 		return nil, errors.WithMessage(err, fmt.Sprintf("could not retrieve query executor for collection criteria %#v", cc))
 	}
 	defer qe.Done()
+	return RetrieveCollectionConfigPackageFromState(cc, qe)
+}
 
-	cb, err := qe.GetState("lscc", c.s.GetCollectionKVSKey(cc))
+// RetrieveCollectionConfigPackageFromState retrieves the collection config package from the given key from the given state
+func RetrieveCollectionConfigPackageFromState(cc common.CollectionCriteria, state State) (*common.CollectionConfigPackage, error) {
+	cb, err := state.GetState("lscc", BuildCollectionKVSKey(cc.Namespace))
 	if err != nil {
 		return nil, errors.WithMessage(err, fmt.Sprintf("error while retrieving collection for collection criteria %#v", cc))
 	}

core/common/privdata/store_test.go

@@ -28,10 +28,6 @@ func (c *mockStoreSupport) GetQueryExecutorForLedger(cid string) (ledger.QueryEx
 	return c.Qe, c.QErr
 }
 
-func (c *mockStoreSupport) GetCollectionKVSKey(cc common.CollectionCriteria) string {
-	return cc.Channel + cc.Namespace
-}
-
 func (c *mockStoreSupport) GetIdentityDeserializer(chainID string) msp.IdentityDeserializer {
 	return &mockDeserializer{}
 }
@@ -54,7 +50,7 @@ func TestCollectionStore(t *testing.T) {
 
 	ccr := common.CollectionCriteria{Channel: "ch", Namespace: "cc", Collection: "mycollection"}
 
-	wState["lscc"][support.GetCollectionKVSKey(ccr)] = []byte("barf")
+	wState["lscc"][BuildCollectionKVSKey(ccr.Namespace)] = []byte("barf")
 
 	_, err = cs.RetrieveCollection(ccr)
 	assert.Error(t, err)
@@ -65,7 +61,7 @@ func TestCollectionStore(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, ccpBytes)
 
-	wState["lscc"][support.GetCollectionKVSKey(ccr)] = ccpBytes
+	wState["lscc"][BuildCollectionKVSKey(ccr.Namespace)] = ccpBytes
 
 	_, err = cs.RetrieveCollection(ccr)
 	assert.Error(t, err)
@@ -80,7 +76,7 @@ func TestCollectionStore(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, ccpBytes)
 
-	wState["lscc"][support.GetCollectionKVSKey(ccr)] = ccpBytes
+	wState["lscc"][BuildCollectionKVSKey(ccr.Namespace)] = ccpBytes
 
 	c, err := cs.RetrieveCollection(ccr)
 	assert.NoError(t, err)

core/ledger/pvtdatapolicy/btlpolicy.go

@@ -98,10 +98,6 @@ func (cs *collectionSupport) GetQueryExecutorForLedger(cid string) (ledger.Query
 	return cs.lgr.NewQueryExecutor()
 }
 
-func (*collectionSupport) GetCollectionKVSKey(cc common.CollectionCriteria) string {
-	return privdata.BuildCollectionKVSKey(cc.Namespace)
-}
-
 func (*collectionSupport) GetIdentityDeserializer(chainID string) msp.IdentityDeserializer {
 	return nil
 }

core/peer/peer.go

@@ -672,10 +672,6 @@ func (cs *collectionSupport) GetQueryExecutorForLedger(cid string) (ledger.Query
 	return cs.NewQueryExecutor()
 }
 
-func (*collectionSupport) GetCollectionKVSKey(cc common.CollectionCriteria) string {
-	return privdata.BuildCollectionKVSKey(cc.Namespace)
-}
-
 func (*collectionSupport) GetIdentityDeserializer(chainID string) msp.IdentityDeserializer {
 	return mspmgmt.GetManagerForChain(chainID)
 }

core/scc/vscc/validator_onevalidsignature.go

@@ -70,10 +70,6 @@ type collectionStoreSupport struct {
 	sysccprovider.SystemChaincodeProvider
 }
 
-func (c *collectionStoreSupport) GetCollectionKVSKey(cc common.CollectionCriteria) string {
-	return privdata.BuildCollectionKVSKey(cc.Namespace)
-}
-
 func (c *collectionStoreSupport) GetIdentityDeserializer(chainID string) m.IdentityDeserializer {
 	return mspmgmt.GetIdentityDeserializer(chainID)
 }

core/scc/vscc/validator_onevalidsignature_test.go

@@ -1609,7 +1609,7 @@ func validateUpgradeWithCollection(t *testing.T, V1_2Validation bool) {
 		assert.Equal(t, string(resp.Message), "LSCC can only issue a single putState upon deploy/upgrade")
 	}
 
-	State["lscc"][(&collectionStoreSupport{v.sccprovider}).GetCollectionKVSKey(common.CollectionCriteria{Channel: "testchainid", Namespace: ccname})] = ccpBytes
+	State["lscc"][privdata.BuildCollectionKVSKey(ccname)] = ccpBytes
 
 	if V1_2Validation {
 		ccver = "3"
@@ -2202,7 +2202,7 @@ func TestValidateRWSetAndCollectionForUpgrade(t *testing.T) {
 	err = testValidateCollection(t, v, []*common.CollectionConfig{coll1}, cdRWSet, lsccFunc, ac, chid)
 	assert.NoError(t, err)
 
-	State["lscc"][(&collectionStoreSupport{v.sccprovider}).GetCollectionKVSKey(common.CollectionCriteria{Channel: chid, Namespace: ccid})] = ccpBytes
+	State["lscc"][privdata.BuildCollectionKVSKey(ccid)] = ccpBytes
 
 	// Test 2: exactly same as the existing collection config package -> success
 	err = testValidateCollection(t, v, []*common.CollectionConfig{coll1, coll2}, cdRWSet, lsccFunc, ac, chid)