Skip to content

Commit 38e3bc1

Browse files
muralisrinimuralisrini
committedApr 12, 2018
[FAB-9401] sanitize resource names and add doc
Cleans up resource names to be consistent with respect to case, changes names to be more descriptive where necessary and adds doc to resource name to indicate where they are used. Change-Id: I6d30548c7b5da0f88800a593694e70d1c093057f Signed-off-by: Srinivasan Muralidharan <srinivasan.muralidharan99@gmail.com>
·
v3.1.0v1.2.0-rc1
1 parent 9c51f9f commit 38e3bc1

14 files changed

+215
-182
lines changed
 

‎core/aclmgmt/aclmgmt_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestRegisterNilProvider(t *testing.T) {
5050
func TestBadID(t *testing.T) {
5151
reinit()
5252
RegisterACLProvider(nil)
53-
err := GetACLProvider().CheckACL(resources.PROPOSE, "somechain", "badidtype")
53+
err := GetACLProvider().CheckACL(resources.Peer_Propose, "somechain", "badidtype")
5454
assert.Error(t, err, "Expected error")
5555
}
5656

@@ -65,16 +65,16 @@ func TestWithProvider(t *testing.T) {
6565
reinit()
6666
aclprov := registerACLProvider()
6767
prop := &pb.SignedProposal{}
68-
aclprov.On("CheckACL", resources.PROPOSE, "somechain", prop).Return(nil)
69-
err := GetACLProvider().CheckACL(resources.PROPOSE, "somechain", prop)
68+
aclprov.On("CheckACL", resources.Peer_Propose, "somechain", prop).Return(nil)
69+
err := GetACLProvider().CheckACL(resources.Peer_Propose, "somechain", prop)
7070
assert.NoError(t, err)
7171
}
7272

7373
func TestBadACL(t *testing.T) {
7474
reinit()
7575
aclprov := registerACLProvider()
7676
prop := &pb.SignedProposal{}
77-
aclprov.On("CheckACL", resources.PROPOSE, "somechain", prop).Return(errors.New("badacl"))
78-
err := GetACLProvider().CheckACL(resources.PROPOSE, "somechain", prop)
77+
aclprov.On("CheckACL", resources.Peer_Propose, "somechain", prop).Return(errors.New("badacl"))
78+
err := GetACLProvider().CheckACL(resources.Peer_Propose, "somechain", prop)
7979
assert.Error(t, err, "Expected error")
8080
}

‎core/aclmgmt/defaultaclprovider.go

+24-26
Original file line numberDiff line numberDiff line change
@@ -54,47 +54,45 @@ func (d *defaultACLProvider) initialize() {
5454

5555
//-------------- LSCC --------------
5656
//p resources (implemented by the chaincode currently)
57-
d.pResourcePolicyMap[resources.LSCC_INSTALL] = ""
58-
d.pResourcePolicyMap[resources.LSCC_GETCHAINCODES] = ""
59-
d.pResourcePolicyMap[resources.LSCC_GETINSTALLEDCHAINCODES] = ""
57+
d.pResourcePolicyMap[resources.Lscc_Install] = ""
58+
d.pResourcePolicyMap[resources.Lscc_GetInstantiatedChaincodes] = ""
59+
d.pResourcePolicyMap[resources.Lscc_GetInstalledChaincodes] = ""
6060

6161
//c resources
62-
d.cResourcePolicyMap[resources.LSCC_DEPLOY] = "" //ACL check covered by PROPOSAL
63-
d.cResourcePolicyMap[resources.LSCC_UPGRADE] = "" //ACL check covered by PROPOSAL
64-
d.cResourcePolicyMap[resources.LSCC_GETCCINFO] = CHANNELREADERS
65-
d.cResourcePolicyMap[resources.LSCC_GETDEPSPEC] = CHANNELREADERS
66-
d.cResourcePolicyMap[resources.LSCC_GETCCDATA] = CHANNELREADERS
62+
d.cResourcePolicyMap[resources.Lscc_Deploy] = "" //ACL check covered by PROPOSAL
63+
d.cResourcePolicyMap[resources.Lscc_Upgrade] = "" //ACL check covered by PROPOSAL
64+
d.cResourcePolicyMap[resources.Lscc_ChaincodeExists] = CHANNELREADERS
65+
d.cResourcePolicyMap[resources.Lscc_GetDeploymentSpec] = CHANNELREADERS
66+
d.cResourcePolicyMap[resources.Lscc_GetChaincodeData] = CHANNELREADERS
6767

6868
//-------------- QSCC --------------
6969
//p resources (none)
7070

7171
//c resources
72-
d.cResourcePolicyMap[resources.QSCC_GetChainInfo] = CHANNELREADERS
73-
d.cResourcePolicyMap[resources.QSCC_GetBlockByNumber] = CHANNELREADERS
74-
d.cResourcePolicyMap[resources.QSCC_GetBlockByHash] = CHANNELREADERS
75-
d.cResourcePolicyMap[resources.QSCC_GetTransactionByID] = CHANNELREADERS
76-
d.cResourcePolicyMap[resources.QSCC_GetBlockByTxID] = CHANNELREADERS
72+
d.cResourcePolicyMap[resources.Qscc_GetChainInfo] = CHANNELREADERS
73+
d.cResourcePolicyMap[resources.Qscc_GetBlockByNumber] = CHANNELREADERS
74+
d.cResourcePolicyMap[resources.Qscc_GetBlockByHash] = CHANNELREADERS
75+
d.cResourcePolicyMap[resources.Qscc_GetTransactionByID] = CHANNELREADERS
76+
d.cResourcePolicyMap[resources.Qscc_GetBlockByTxID] = CHANNELREADERS
7777

7878
//--------------- CSCC resources -----------
7979
//p resources (implemented by the chaincode currently)
80-
d.pResourcePolicyMap[resources.CSCC_JoinChain] = ""
81-
d.pResourcePolicyMap[resources.CSCC_GetChannels] = ""
80+
d.pResourcePolicyMap[resources.Cscc_JoinChain] = ""
81+
d.pResourcePolicyMap[resources.Cscc_GetChannels] = ""
8282

8383
//c resources
84-
d.cResourcePolicyMap[resources.CSCC_GetConfigBlock] = CHANNELREADERS
85-
d.cResourcePolicyMap[resources.CSCC_GetConfigTree] = CHANNELREADERS
86-
d.cResourcePolicyMap[resources.CSCC_SimulateConfigTreeUpdate] = CHANNELWRITERS
84+
d.cResourcePolicyMap[resources.Cscc_GetConfigBlock] = CHANNELREADERS
85+
d.cResourcePolicyMap[resources.Cscc_GetConfigTree] = CHANNELREADERS
86+
d.cResourcePolicyMap[resources.Cscc_SimulateConfigTreeUpdate] = CHANNELWRITERS
8787

8888
//---------------- non-scc resources ------------
89-
//Propose
90-
d.cResourcePolicyMap[resources.PROPOSE] = CHANNELWRITERS
89+
//Peer resources
90+
d.cResourcePolicyMap[resources.Peer_Propose] = CHANNELWRITERS
91+
d.cResourcePolicyMap[resources.Peer_ChaincodeToChaincode] = CHANNELWRITERS
9192

92-
//Chaincode-to-Chaincode
93-
d.cResourcePolicyMap[resources.CC2CC] = CHANNELWRITERS
94-
95-
//Events (not used currently - for future)
96-
d.cResourcePolicyMap[resources.BLOCKEVENT] = CHANNELREADERS
97-
d.cResourcePolicyMap[resources.FILTEREDBLOCKEVENT] = CHANNELREADERS
93+
//Event resources
94+
d.cResourcePolicyMap[resources.Event_Block] = CHANNELREADERS
95+
d.cResourcePolicyMap[resources.Event_FilteredBlock] = CHANNELREADERS
9896
}
9997

10098
//this should cover an exhaustive list of everything called from the peer

‎core/aclmgmt/resources/resources.go

+30-31
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,39 @@ SPDX-License-Identifier: Apache-2.0
77
package resources
88

99
//fabric resources used for ACL checks. Note that some of the checks
10-
//such as LSCC_INSTALL are "peer wide" (current access checks in peer are
10+
//such as Lscc_INSTALL are "peer wide" (current access checks in peer are
1111
//based on local MSP). These are not currently covered by resource or default
1212
//ACLProviders
1313
const (
14-
PROPOSE = "PROPOSE"
15-
16-
//LSCC resources
17-
LSCC_INSTALL = "LSCC.INSTALL"
18-
LSCC_DEPLOY = "LSCC.DEPLOY"
19-
LSCC_UPGRADE = "LSCC.UPGRADE"
20-
LSCC_GETCCINFO = "LSCC.GETCCINFO"
21-
LSCC_GETDEPSPEC = "LSCC.GETDEPSPEC"
22-
LSCC_GETCCDATA = "LSCC.GETCCDATA"
23-
LSCC_GETCHAINCODES = "LSCC.GETCHAINCODES"
24-
LSCC_GETINSTALLEDCHAINCODES = "LSCC.GETINSTALLEDCHAINCODES"
25-
26-
//QSCC resources
27-
QSCC_GetChainInfo = "QSCC.GetChainInfo"
28-
QSCC_GetBlockByNumber = "QSCC.GetBlockByNumber"
29-
QSCC_GetBlockByHash = "QSCC.GetBlockByHash"
30-
QSCC_GetTransactionByID = "QSCC.GetTransactionByID"
31-
QSCC_GetBlockByTxID = "QSCC.GetBlockByTxID"
32-
33-
//CSCC resources
34-
CSCC_JoinChain = "CSCC.JoinChain"
35-
CSCC_GetConfigBlock = "CSCC.GetConfigBlock"
36-
CSCC_GetChannels = "CSCC.GetChannels"
37-
CSCC_GetConfigTree = "CSCC.GetConfigTree"
38-
CSCC_SimulateConfigTreeUpdate = "CSCC.SimulateConfigTreeUpdate"
39-
40-
//Chaincode-to-Chaincode call
41-
CC2CC = "CC2CC"
14+
//Lscc resources
15+
Lscc_Install = "lscc.Install"
16+
Lscc_Deploy = "lscc.Deploy"
17+
Lscc_Upgrade = "lscc.Upgrade"
18+
Lscc_ChaincodeExists = "lscc.ChaincodeExists"
19+
Lscc_GetDeploymentSpec = "lscc.GetDeploymentSpec"
20+
Lscc_GetChaincodeData = "lscc.GetChaincodeData"
21+
Lscc_GetInstantiatedChaincodes = "lscc.GetInstantiatedChaincodes"
22+
Lscc_GetInstalledChaincodes = "lscc.GetInstalledChaincodes"
23+
24+
//Qscc resources
25+
Qscc_GetChainInfo = "qscc.GetChainInfo"
26+
Qscc_GetBlockByNumber = "qscc.GetBlockByNumber"
27+
Qscc_GetBlockByHash = "qscc.GetBlockByHash"
28+
Qscc_GetTransactionByID = "qscc.GetTransactionByID"
29+
Qscc_GetBlockByTxID = "qscc.GetBlockByTxID"
30+
31+
//Cscc resources
32+
Cscc_JoinChain = "cscc.JoinChain"
33+
Cscc_GetConfigBlock = "cscc.GetConfigBlock"
34+
Cscc_GetChannels = "cscc.GetChannels"
35+
Cscc_GetConfigTree = "cscc.GetConfigTree"
36+
Cscc_SimulateConfigTreeUpdate = "cscc.SimulateConfigTreeUpdate"
37+
38+
//Peer resources
39+
Peer_Propose = "peer.Propose"
40+
Peer_ChaincodeToChaincode = "peer.ChaincodeToChaincode"
4241

4342
//Events
44-
BLOCKEVENT = "BLOCKEVENT"
45-
FILTEREDBLOCKEVENT = "FILTEREDBLOCKEVENT"
43+
Event_Block = "event.Block"
44+
Event_FilteredBlock = "event.FilteredBlock"
4645
)

‎core/chaincode/chaincode_support_test.go

+45-45
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,9 @@ func initializeCC(t *testing.T, chainID, ccname string, ccSide *mockpeer.MockCCC
391391

392392
//setup CheckACL calls
393393
mockAclProvider.Reset()
394-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
395-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
396-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
394+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
395+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
396+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
397397

398398
//bad txid in response (should be "1"), should fail
399399
resp := &mockpeer.MockResponse{&pb.ChaincodeMessage{Type: pb.ChaincodeMessage_TRANSACTION}, &pb.ChaincodeMessage{Type: pb.ChaincodeMessage_COMPLETED, Payload: putils.MarshalOrPanic(&pb.Response{Status: shim.OK, Payload: []byte("init succeeded")}), Txid: "unknowntxid", ChannelId: chainID}}
@@ -449,9 +449,9 @@ func invokeCC(t *testing.T, chainID, ccname string, ccSide *mockpeer.MockCCComm)
449449

450450
//setup CheckACL calls
451451
mockAclProvider.Reset()
452-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
453-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
454-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
452+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
453+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
454+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
455455

456456
respSet := &mockpeer.MockResponseSet{errorFunc, nil, []*mockpeer.MockResponse{
457457
{&pb.ChaincodeMessage{Type: pb.ChaincodeMessage_TRANSACTION}, &pb.ChaincodeMessage{Type: pb.ChaincodeMessage_GET_STATE, Payload: putils.MarshalOrPanic(&pb.GetState{Collection: "", Key: "A"}), Txid: txid, ChannelId: chainID}},
@@ -550,9 +550,9 @@ func getQueryStateByRange(t *testing.T, collection, chainID, ccname string, ccSi
550550

551551
//setup CheckACL calls
552552
mockAclProvider.Reset()
553-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
554-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
555-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
553+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
554+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
555+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
556556

557557
//create the response
558558
queryStateNextFunc := func(reqMsg *pb.ChaincodeMessage) *pb.ChaincodeMessage {
@@ -617,10 +617,10 @@ func cc2cc(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.Mock
617617

618618
//setup CheckACL calls
619619
mockAclProvider.Reset()
620-
mockAclProvider.On("CheckACL", resources.CC2CC, chainID, sprop).Return(nil)
621-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
622-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
623-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
620+
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID, sprop).Return(nil)
621+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
622+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
623+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
624624

625625
cccid := ccprovider.NewCCContext(chainID, calledCC, "0", txid, false, sprop, prop)
626626

@@ -638,13 +638,13 @@ func cc2cc(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.Mock
638638

639639
//we want hooks for both chaincodes
640640
mockAclProvider.Reset()
641-
mockAclProvider.On("CheckACL", resources.CC2CC, chainID2, sprop).Return(nil)
642-
mockAclProvider.On("CheckACL", resources.CC2CC, chainID, sprop).Return(nil)
643-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID2, sprop).Return(nil)
644-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
645-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID2, sprop).Return(nil)
646-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
647-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
641+
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID2, sprop).Return(nil)
642+
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID, sprop).Return(nil)
643+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID2, sprop).Return(nil)
644+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
645+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID2, sprop).Return(nil)
646+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
647+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
648648

649649
sysCCVers := util.GetSysCCVersion()
650650
//call a callable system CC, a regular cc, a regular but different cc on a different chain, a regular but same cc on a different chain, and an uncallable system cc and expect an error inthe last one
@@ -672,13 +672,13 @@ func cc2cc(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.Mock
672672
ctxt, txsim, sprop, prop = startTx(t, chainID, cis, txid)
673673

674674
mockAclProvider.Reset()
675-
mockAclProvider.On("CheckACL", resources.CC2CC, chainID2, sprop).Return(nil)
676-
mockAclProvider.On("CheckACL", resources.CC2CC, chainID, sprop).Return(errors.New("Bad ACL calling CC"))
677-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID2, sprop).Return(nil)
678-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
679-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID2, sprop).Return(nil)
680-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
681-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
675+
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID2, sprop).Return(nil)
676+
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID, sprop).Return(errors.New("Bad ACL calling CC"))
677+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID2, sprop).Return(nil)
678+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
679+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID2, sprop).Return(nil)
680+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
681+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
682682
//call regular cc but without ACL on called CC
683683
respSet = &mockpeer.MockResponseSet{errorFunc, nil, []*mockpeer.MockResponse{
684684
{&pb.ChaincodeMessage{Type: pb.ChaincodeMessage_RESPONSE}, &pb.ChaincodeMessage{Type: pb.ChaincodeMessage_INVOKE_CHAINCODE, Payload: putils.MarshalOrPanic(&pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "calledCC:0/" + chainID}, Input: &pb.ChaincodeInput{Args: [][]byte{{}}}}), Txid: txid, ChannelId: chainID}}}}
@@ -711,9 +711,9 @@ func getQueryResult(t *testing.T, collection, chainID, ccname string, ccSide *mo
711711
ctxt, txsim, sprop, prop := startTx(t, chainID, cis, txid)
712712

713713
mockAclProvider.Reset()
714-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
715-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
716-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
714+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
715+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
716+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
717717

718718
kvs := make([]*plgr.KV, 1000)
719719
for i := 0; i < 1000; i++ {
@@ -779,9 +779,9 @@ func getHistory(t *testing.T, chainID, ccname string, ccSide *mockpeer.MockCCCom
779779
ctxt, txsim, sprop, prop := startTx(t, chainID, cis, txid)
780780

781781
mockAclProvider.Reset()
782-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
783-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
784-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
782+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
783+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
784+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
785785

786786
kvs := make([]*plgr.KV, 1000)
787787
for i := 0; i < 1000; i++ {
@@ -1076,10 +1076,10 @@ func cc2SameCC(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.
10761076

10771077
//setup CheckACL calls
10781078
mockAclProvider.Reset()
1079-
mockAclProvider.On("CheckACL", resources.CC2CC, chainID2, sprop).Return(nil)
1080-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID2, sprop).Return(nil)
1081-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID2, sprop).Return(nil)
1082-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID2, sprop).Return(nil)
1079+
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID2, sprop).Return(nil)
1080+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID2, sprop).Return(nil)
1081+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID2, sprop).Return(nil)
1082+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID2, sprop).Return(nil)
10831083

10841084
cccid := ccprovider.NewCCContext(chainID2, ccname, "0", txid, false, sprop, prop)
10851085

@@ -1101,15 +1101,15 @@ func cc2SameCC(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.
11011101
txid = util.GenerateUUID()
11021102
ctxt, txsim, sprop, prop = startTx(t, chainID, cis, txid)
11031103

1104-
mockAclProvider.On("CheckACL", resources.CC2CC, chainID, sprop).Return(nil)
1105-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
1106-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
1107-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
1104+
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID, sprop).Return(nil)
1105+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
1106+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
1107+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
11081108

1109-
mockAclProvider.On("CheckACL", resources.CC2CC, chainID2, sprop).Return(nil)
1110-
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID2, sprop).Return(nil)
1111-
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID2, sprop).Return(nil)
1112-
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID2, sprop).Return(nil)
1109+
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID2, sprop).Return(nil)
1110+
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID2, sprop).Return(nil)
1111+
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID2, sprop).Return(nil)
1112+
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID2, sprop).Return(nil)
11131113

11141114
txid = "cctosamecctx"
11151115
respSet := &mockpeer.MockResponseSet{errorFunc, nil, []*mockpeer.MockResponse{

‎core/chaincode/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ func (handler *Handler) checkACL(signedProp *pb.SignedProposal, proposal *pb.Pro
256256
return errors.Errorf("signed proposal must not be nil from caller [%s]", ccIns.String())
257257
}
258258

259-
return aclmgmt.GetACLProvider().CheckACL(resources.CC2CC, ccIns.ChainID, signedProp)
259+
return aclmgmt.GetACLProvider().CheckACL(resources.Peer_ChaincodeToChaincode, ccIns.ChainID, signedProp)
260260
}
261261

262262
func (handler *Handler) deregister() error {

0 commit comments

Comments
 (0)
Please sign in to comment.