Merge "[FAB-9544] added notification about chaincode upgrade"

core/chaincode/shim/mockstub.go

@@ -59,6 +59,9 @@ type MockStub struct {
 	ChannelID string
 
 	PvtState map[string]map[string][]byte
+
+	// channel to store ChaincodeEvents
+	ChaincodeEventsChannel chan *pb.ChaincodeEvent
 }
 
 func (stub *MockStub) GetTxID() string {
@@ -362,8 +365,8 @@ func (stub *MockStub) GetTxTimestamp() (*timestamp.Timestamp, error) {
 	return stub.TxTimestamp, nil
 }
 
-// Not implemented
 func (stub *MockStub) SetEvent(name string, payload []byte) error {
+	stub.ChaincodeEventsChannel <- &pb.ChaincodeEvent{EventName: name, Payload: payload}
 	return nil
 }
 
@@ -377,6 +380,7 @@ func NewMockStub(name string, cc Chaincode) *MockStub {
 	s.PvtState = make(map[string]map[string][]byte)
 	s.Invokables = make(map[string]*MockStub)
 	s.Keys = list.New()
+	s.ChaincodeEventsChannel = make(chan *pb.ChaincodeEvent, 100) //define large capacity for non-blocking setEvent calls.
 
 	return s
 }

core/scc/lscc/lscc.go

@@ -42,6 +42,7 @@ import (
 var logger = flogging.MustGetLogger("lscc")
 
 const (
+
 	//chaincode lifecycle commands
 
 	//INSTALL install command
@@ -592,7 +593,9 @@ func (lscc *lifeCycleSysCC) executeUpgrade(stub shim.ChaincodeStubInterface, cha
 	if err != nil {
 		return nil, err
 	}
-
+	lifecycleEvent := &pb.LifecycleEvent{ChaincodeName: chaincodeName}
+	lifecycleEventBytes := utils.MarshalOrPanic(lifecycleEvent)
+	stub.SetEvent(UPGRADE, lifecycleEventBytes)
 	return cdfs, nil
 }
 

core/scc/lscc/lscc_test.go

@@ -402,6 +402,13 @@ func testUpgrade(t *testing.T, ccname string, version string, newccname string,
 
 		expectVer := "1"
 		assert.Equal(t, newVer, expectVer, fmt.Sprintf("Upgrade chaincode version error, expected %s, got %s", expectVer, newVer))
+
+		chaincodeEvent := <-stub.ChaincodeEventsChannel
+		assert.Equal(t, UPGRADE, chaincodeEvent.EventName)
+		lifecycleEvent := &pb.LifecycleEvent{}
+		err = proto.Unmarshal(chaincodeEvent.Payload, lifecycleEvent)
+		assert.NoError(t, err)
+		assert.Equal(t, newccname, lifecycleEvent.ChaincodeName)
 	} else {
 		assert.Equal(t, expectedErrorMsg, string(res.Message))
 	}

protos/peer/chaincode.proto

@@ -104,3 +104,8 @@ message ChaincodeInvocationSpec {
     // Currently, SHA256 with BASE64 is supported (e.g. idGenerationAlg='sha256base64')
     string id_generation_alg = 2;
 }
+
+// LifecycleEvent is used as the payload of the chaincode event emitted by LSCC
+message LifecycleEvent {
+    string chaincode_name = 1;
+}