[FAB-12614]MockPeerChaincode receives channel name

Chaincode's MockStub has an API "InvokeChaincode", which is used
for unit tests invoking other chaincode. This function converts
chaincodeName to a composite name internally:
chaincodeName = chaincodeName + "/" + channel.
However, this conversion is not applied to "MockPeerChaincode",
which registers another Mockstub. When writing unit tests
invoking chaincode on other channel, developers have to follow
the naming rule manually. In addition, the rule is not described
in the API usage.

This CR updates "MockPeerChaincode" to receive channel name as
a parameter for CC2CC on another channel.

FAB-12614 #done

Change-Id: Ifcabc19bd78cbaa8bcc702c403da112096b16643
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>

Author: yuki-kon

core/chaincode/shim/mockstub.go

@@ -118,10 +118,15 @@ func (stub *MockStub) MockTransactionEnd(uuid string) {
 	stub.TxID = ""
 }
 
-// Register a peer chaincode with this MockStub
-// invokableChaincodeName is the name or hash of the peer
-// otherStub is a MockStub of the peer, already intialised
-func (stub *MockStub) MockPeerChaincode(invokableChaincodeName string, otherStub *MockStub) {
+// Register another MockStub chaincode with this MockStub.
+// invokableChaincodeName is the name of a chaincode.
+// otherStub is a MockStub of the chaincode, already initialized.
+// channel is the name of a channel on which another MockStub is called.
+func (stub *MockStub) MockPeerChaincode(invokableChaincodeName string, otherStub *MockStub, channel string) {
+	// Internally we use chaincode name as a composite name
+	if channel != "" {
+		invokableChaincodeName = invokableChaincodeName + "/" + channel
+	}
 	stub.Invokables[invokableChaincodeName] = otherStub
 }
 
@@ -339,10 +344,10 @@ func (stub *MockStub) GetQueryResultWithPagination(query string, pageSize int32,
 	return nil, nil, nil
 }
 
-// InvokeChaincode calls a peered chaincode.
-// E.g. stub1.InvokeChaincode("stub2Hash", funcArgs, channel)
-// Before calling this make sure to create another MockStub stub2, call stub2.MockInit(uuid, func, args)
-// and register it with stub1 by calling stub1.MockPeerChaincode("stub2Hash", stub2)
+// InvokeChaincode locally calls the specified chaincode `Invoke`.
+// E.g. stub1.InvokeChaincode("othercc", funcArgs, channel)
+// Before calling this make sure to create another MockStub stub2, call shim.NewMockStub("othercc", Chaincode)
+// and register it with stub1 by calling stub1.MockPeerChaincode("othercc", stub2, channel)
 func (stub *MockStub) InvokeChaincode(chaincodeName string, args [][]byte, channel string) pb.Response {
 	// Internally we use chaincode name as a composite name
 	if channel != "" {

core/chaincode/shim/mockstub_test.go

@@ -305,7 +305,7 @@ func TestMockMock(t *testing.T) {
 	stub.GetStateByRange("start", "end")
 	stub.GetQueryResult("q")
 	stub2 := NewMockStub("othercc", &shimTestCC{})
-	stub.MockPeerChaincode("othercc/mychan", stub2)
+	stub.MockPeerChaincode("othercc", stub2, "mychan")
 	stub.InvokeChaincode("othercc", nil, "mychan")
 	stub.GetCreator()
 	stub.GetTransient()