[FAB-3965] Review go lint suggestions

This patch updates ID in the eventshub interface according to Go style guidelines. Change-Id: I3137a950ddc6bcf8e2ae340c2b2bf970db495f98 Signed-off-by: Troy Ronda <[email protected]>
hyperledger · May 17, 2017 · 84f596f · 84f596f
1 parent 93f5da5
commit 84f596f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/fabric-client/events/eventhub.go b/fabric-client/events/eventhub.go
@@ -93,8 +93,8 @@ type eventHub struct {
 
 // ChaincodeEvent contains the current event data for the event handler
 type ChaincodeEvent struct {
-	ChaincodeId string
-	TxId        string
+	ChaincodeID string
+	TxID        string
 	EventName   string
 	Payload     []byte
 	ChannelID   string
@@ -562,8 +562,8 @@ func (eventHub *eventHub) notifyChaincodeRegistrants(channelID string, ccEvent *
 			callback := v.CallbackFunc
 			if callback != nil {
 				callback(&ChaincodeEvent{
-					ChaincodeId: ccEvent.ChaincodeId,
-					TxId:        ccEvent.TxId,
+					ChaincodeID: ccEvent.ChaincodeId,
+					TxID:        ccEvent.TxId,
 					EventName:   ccEvent.EventName,
 					Payload:     ccEvent.Payload,
 					ChannelID:   channelID,

diff --git a/fabric-client/events/eventhub_test.go b/fabric-client/events/eventhub_test.go
@@ -159,8 +159,8 @@ func TestChaincodeEvent(t *testing.T) {
 	}
 
 	// Check CC event
-	if event.ChaincodeId != ccID {
-		t.Fatalf("Expecting chaincode ID [%s] but got [%s]", ccID, event.ChaincodeId)
+	if event.ChaincodeID != ccID {
+		t.Fatalf("Expecting chaincode ID [%s] but got [%s]", ccID, event.ChaincodeID)
 	}
 	if event.EventName != eventName {
 		t.Fatalf("Expecting event name [%s] but got [%s]", eventName, event.EventName)
@@ -213,14 +213,14 @@ func TestChaincodeBlockEvent(t *testing.T) {
 	if event.ChannelID != channelID {
 		t.Fatalf("Expecting channel ID [%s] but got [%s]", channelID, event.ChannelID)
 	}
-	if event.ChaincodeId != ccID {
-		t.Fatalf("Expecting chaincode ID [%s] but got [%s]", ccID, event.ChaincodeId)
+	if event.ChaincodeID != ccID {
+		t.Fatalf("Expecting chaincode ID [%s] but got [%s]", ccID, event.ChaincodeID)
 	}
 	if event.EventName != eventName {
 		t.Fatalf("Expecting event name [%s] but got [%s]", eventName, event.EventName)
 	}
-	if event.TxId == "" {
-		t.Fatalf("Expecting TxID [%s] but got [%s]", txID, event.TxId)
+	if event.TxID == "" {
+		t.Fatalf("Expecting TxID [%s] but got [%s]", txID, event.TxID)
 	}
 }