fix proto fields and events test

events/events_test.go

@@ -45,7 +45,7 @@ var obcEHClient *consumer.EventsClient
 
 func (a *Adapter) GetInterestedEvents() ([]*ehpb.Interest, error) {
 	//return []*ehpb.Interest{&ehpb.Interest{EventType: ehpb.EventType_BLOCK, ResponseType: ehpb.Interest_PROTOBUF}, &ehpb.Interest{EventType: "generic", ResponseType: ehpb.Interest_PROTOBUF}}, nil
-	return []*ehpb.Interest{&ehpb.Interest{EventType: ehpb.EventType_CHAINCODE, ChainEvent: &ehpb.Chaincode{Uuid: "0xffffffff", Eventname: "event1"}}}, nil
+	return []*ehpb.Interest{&ehpb.Interest{EventType: ehpb.EventType_CHAINCODE, ChainEvent: &ehpb.ChaincodeReg{Uuid: "0xffffffff", EventName: "event1"}}}, nil
 	//return []*ehpb.Interest{&ehpb.Interest{EventType: ehpb.EventType_BLOCK}}, nil
 }
 
@@ -54,7 +54,7 @@ func (a *Adapter) Recv(msg *ehpb.Event) (bool, error) {
 	switch x := msg.Event.(type) {
 	case *ehpb.Event_Block:
 	case *ehpb.Event_Generic:
-	case *ehpb.Event_Chaincode:
+	case *ehpb.Event_ChaincodeEvent:
 	case nil:
 		// The field is not set.
 		fmt.Printf("event not set\n")
@@ -84,7 +84,7 @@ func createTestBlock() *ehpb.Event {
 }
 
 func createTestChaincodeEvent() *ehpb.Event {
-	emsg := producer.CreateChaincodeEvent(&ehpb.Chaincode{Uuid: "0xffffffff", Eventname: "event1"})
+	emsg := producer.CreateChaincodeEvent(&ehpb.ChaincodeEvent{Uuid: "0xffffffff", EventName: "event1"})
 	return emsg
 }
 

events/producer/eventhelper.go

@@ -30,6 +30,6 @@ func CreateGenericEvent(te *ehpb.Generic) *ehpb.Event {
 	return &ehpb.Event{&ehpb.Event_Generic{Generic: te}}
 }
 
-func CreateChaincodeEvent(te *ehpb.Chaincode) *ehpb.Event {
-	return &ehpb.Event{&ehpb.Event_Chaincode{Chaincode: te}}
+func CreateChaincodeEvent(te *ehpb.ChaincodeEvent) *ehpb.Event {
+	return &ehpb.Event{&ehpb.Event_ChaincodeEvent{ChaincodeEvent: te}}
 }

events/producer/events.go

@@ -60,7 +60,7 @@ func (hl *chaincodeHandlerList) add(ie *pb.Interest, h *handler) bool {
 		emap = make(map[string]*handler)
 		hl.handlers[ie.GetChainEvent().Uuid] = emap
 	}
-	emap[ie.GetChainEvent().Eventname] = h
+	emap[ie.GetChainEvent().EventName] = h
 	hl.Unlock()
 	return true
 }
@@ -71,14 +71,14 @@ func (hl *chaincodeHandlerList) del(ie *pb.Interest, h *handler) bool {
 		hl.Unlock()
 		return false
 	}
-	delete(emap, ie.GetChainEvent().Eventname)
+	delete(emap, ie.GetChainEvent().EventName)
 	hl.Unlock()
 	return true
 }
 
 func (hl *chaincodeHandlerList) foreach(e *pb.Event, action func(h *handler)) {
 	hl.Lock()
-	for _, h := range hl.handlers[e.GetChaincode().Uuid] {
+	for _, h := range hl.handlers[e.GetChaincodeEvent().Uuid] {
 		action(h)
 	}
 	hl.Unlock()

events/producer/register_internal_events.go

@@ -40,7 +40,7 @@ func getMessageType(e *pb.Event) pb.EventType {
 		return pb.EventType_BLOCK
 	case *pb.Event_Generic:
 		return pb.EventType_GENERIC
-	case *pb.Event_Chaincode:
+	case *pb.Event_ChaincodeEvent:
 		return pb.EventType_CHAINCODE
 	default:
 		return -1

protos/events.proto

@@ -35,7 +35,7 @@ enum EventType {
 //when EventType is CHAINCODE
 message ChaincodeReg {
     string uuid = 1;
-    string eventname = 2;
+    string eventName = 2;
     bool anyTransaction = 3;
 }