[FAB-5870] Configuration proto for a collection

Defined collection configuration protos (passed at chaincode
initialisation time).

Change-Id: I0c9cdb332bd9dadd46b51fe2b57d2102b02d50ee
Signed-off-by: Mathias Bjoerkqvist <mbj@zurich.ibm.com>

Author: mbjoerkqvist

core/common/privdata/policies.go

@@ -8,7 +8,6 @@ package privdata
 
 import (
 	"github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/protos/ledger/rwset"
 )
 
 // SerializedPolicy defines a persisted policy
@@ -26,7 +25,7 @@ type PolicyStore interface {
 	// If the TxID exists in the ledger, the policy that is returned is the latest policy
 	// which was committed into the ledger before this txID was committed.
 	// Else - it's the latest policy for the collection.
-	CollectionPolicy(rwset.CollectionCriteria) SerializedPolicy
+	CollectionPolicy(common.CollectionCriteria) SerializedPolicy
 }
 
 // Filter defines a rule that filters peers according to data signed by them.

core/peer/peer.go

@@ -31,7 +31,6 @@ import (
 	"github.com/hyperledger/fabric/msp"
 	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/protos/ledger/rwset"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/pkg/errors"
@@ -641,7 +640,7 @@ func (*noopPolicyParser) Parse(privdata.SerializedPolicy) privdata.Filter {
 type noopPolicyStore struct {
 }
 
-func (*noopPolicyStore) CollectionPolicy(rwset.CollectionCriteria) privdata.SerializedPolicy {
+func (*noopPolicyStore) CollectionPolicy(common.CollectionCriteria) privdata.SerializedPolicy {
 	return &serializedPolicy{}
 }
 

gossip/privdata/coordinator.go

@@ -497,7 +497,7 @@ func (c *coordinator) listMissingPrivateData(block *common.Block, ownedRWsets ma
 
 // isEligible checks if this peer is eligible for a collection in a given namespace
 func (c *coordinator) isEligible(chdr *common.ChannelHeader, namespace string, col string) bool {
-	cp := rwset.CollectionCriteria{
+	cp := common.CollectionCriteria{
 		Channel:    chdr.ChannelId,
 		Namespace:  namespace,
 		Collection: col,
@@ -580,7 +580,7 @@ func (c *coordinator) GetPvtDataAndBlockByNum(seqNum uint64, peerAuthInfo common
 
 		for _, ns := range item.WriteSet.NsPvtRwset {
 			for _, col := range ns.CollectionPvtRwset {
-				cc := rwset.CollectionCriteria{
+				cc := common.CollectionCriteria{
 					Channel:    chdr.ChannelId,
 					TxId:       chdr.TxId,
 					Namespace:  ns.Namespace,

gossip/privdata/coordinator_test.go

@@ -225,24 +225,24 @@ func (f *fetcherMock) fetch(req *proto.RemotePvtDataRequest) ([]*proto.PvtDataEl
 func createPolicyStore(expectedSignedData common.SignedData) *policyStore {
 	return &policyStore{
 		expectedSignedData: expectedSignedData,
-		policies:           make(map[serializedPolicy]rwset.CollectionCriteria),
-		store:              make(map[rwset.CollectionCriteria]serializedPolicy),
+		policies:           make(map[serializedPolicy]common.CollectionCriteria),
+		store:              make(map[common.CollectionCriteria]serializedPolicy),
 	}
 }
 
 type policyStore struct {
 	expectedSignedData common.SignedData
 	acceptsAll         bool
-	store              map[rwset.CollectionCriteria]serializedPolicy
-	policies           map[serializedPolicy]rwset.CollectionCriteria
+	store              map[common.CollectionCriteria]serializedPolicy
+	policies           map[serializedPolicy]common.CollectionCriteria
 }
 
 func (ps *policyStore) thatAcceptsAll() *policyStore {
 	ps.acceptsAll = true
 	return ps
 }
 
-func (ps *policyStore) thatAccepts(cc rwset.CollectionCriteria) *policyStore {
+func (ps *policyStore) thatAccepts(cc common.CollectionCriteria) *policyStore {
 	sp := serializedPolicy{
 		ps: ps,
 		n:  util.RandomUInt64(),
@@ -252,7 +252,7 @@ func (ps *policyStore) thatAccepts(cc rwset.CollectionCriteria) *policyStore {
 	return ps
 }
 
-func (ps *policyStore) CollectionPolicy(cc rwset.CollectionCriteria) privdata.SerializedPolicy {
+func (ps *policyStore) CollectionPolicy(cc common.CollectionCriteria) privdata.SerializedPolicy {
 	if sp, exists := ps.store[cc]; exists {
 		return &sp
 	}
@@ -779,7 +779,7 @@ func TestCoordinatorStoreBlock(t *testing.T) {
 	// private data from the transient store or peers, and in fact- if it attempts to fetch the data it's not eligible
 	// for from the transient store or from peers - the test would fail because the Mock wasn't initialized.
 	block = bf.AddTxn("tx3", "ns3", hash, "c3", "c2", "c1").AddTxn("tx1", "ns1", hash, "c1").create()
-	ps = createPolicyStore(peerSelfSignedData).thatAccepts(rwset.CollectionCriteria{
+	ps = createPolicyStore(peerSelfSignedData).thatAccepts(common.CollectionCriteria{
 		TxId:       "tx3",
 		Collection: "c3",
 		Namespace:  "ns3",
@@ -837,7 +837,7 @@ func TestCoordinatorGetBlocks(t *testing.T) {
 
 	// Green path - block and private data is returned, but the requester isn't eligible for all the private data,
 	// but only to a subset of it.
-	ps = createPolicyStore(sd).thatAccepts(rwset.CollectionCriteria{
+	ps = createPolicyStore(sd).thatAccepts(common.CollectionCriteria{
 		Namespace:  "ns1",
 		Collection: "c2",
 		TxId:       "tx1",

gossip/privdata/distributor.go

@@ -63,7 +63,7 @@ func (d *distributorImpl) Distribute(txID string, privData *rwset.TxPvtReadWrite
 		namespace := pvtRwset.Namespace
 		for _, collection := range pvtRwset.CollectionPvtRwset {
 			collectionName := collection.CollectionName
-			policyFilter := pp.Parse(ps.CollectionPolicy(rwset.CollectionCriteria{
+			policyFilter := pp.Parse(ps.CollectionPolicy(common.CollectionCriteria{
 				Namespace:  namespace,
 				Collection: collectionName,
 				TxId:       txID,

gossip/privdata/pull.go

@@ -22,7 +22,6 @@ import (
 	"github.com/hyperledger/fabric/gossip/util"
 	fcommon "github.com/hyperledger/fabric/protos/common"
 	proto "github.com/hyperledger/fabric/protos/gossip"
-	"github.com/hyperledger/fabric/protos/ledger/rwset"
 	"github.com/op/go-logging"
 	"github.com/pkg/errors"
 )
@@ -133,7 +132,7 @@ func (p *puller) createResponse(message proto.ReceivedMessage) []*proto.PvtDataE
 	}()
 	msg := message.GetGossipMessage()
 	for _, dig := range msg.GetPrivateReq().Digests {
-		pol := p.ps.CollectionPolicy(rwset.CollectionCriteria{
+		pol := p.ps.CollectionPolicy(fcommon.CollectionCriteria{
 			Channel:    p.channel,
 			Collection: dig.Collection,
 			TxId:       dig.TxId,
@@ -358,7 +357,7 @@ func (dig2Filter digestToFilterMapping) String() string {
 func (p *puller) computeFilters(req *proto.RemotePvtDataRequest) (digestToFilterMapping, error) {
 	filters := make(map[proto.PvtDataDigest]filter.RoutingFilter)
 	for _, digest := range req.Digests {
-		pol := p.ps.CollectionPolicy(rwset.CollectionCriteria{
+		pol := p.ps.CollectionPolicy(fcommon.CollectionCriteria{
 			Channel:    p.channel,
 			TxId:       digest.TxId,
 			Collection: digest.Collection,

gossip/privdata/pull_test.go

@@ -22,7 +22,6 @@ import (
 	"github.com/hyperledger/fabric/gossip/util"
 	fcommon "github.com/hyperledger/fabric/protos/common"
 	proto "github.com/hyperledger/fabric/protos/gossip"
-	"github.com/hyperledger/fabric/protos/ledger/rwset"
 	"github.com/op/go-logging"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
@@ -79,7 +78,7 @@ func (ps *mockPolicyStore) withPolicy(collection string) *mockSerializedPolicy {
 	return sp
 }
 
-func (ps mockPolicyStore) CollectionPolicy(cc rwset.CollectionCriteria) privdata.SerializedPolicy {
+func (ps mockPolicyStore) CollectionPolicy(cc fcommon.CollectionCriteria) privdata.SerializedPolicy {
 	return ps.m[cc.Collection]
 }