[FAB-6634] Filtered block should include type

This CR adds the block type (e.g. Config, Endorser_Transaction) to the filtered block. Change-Id: Iea60502c8fcda30a4811bf556a8dc09db76de922 Signed-off-by: Will Lahti <[email protected]>
stiartsly · Oct 23, 2017 · b183fce · b183fce
1 parent 2c89bb8
commit b183fce
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 57 deletions.
diff --git a/events/producer/eventhelper.go b/events/producer/eventhelper.go
@@ -35,6 +35,7 @@ func CreateBlockEvents(block *common.Block) (bevent *pb.Event, fbevent *pb.Event
 	blockForEvent := &common.Block{}
 	filteredBlockForEvent := &pb.FilteredBlock{}
 	filteredTxArray := []*pb.FilteredTransaction{}
+	var headerType common.HeaderType
 	blockForEvent.Header = block.Header
 	blockForEvent.Metadata = block.Metadata
 	blockForEvent.Data = &common.BlockData{}
@@ -56,9 +57,11 @@ func CreateBlockEvents(block *common.Block) (bevent *pb.Event, fbevent *pb.Event
 				if err != nil {
 					return nil, nil, "", err
 				}
+
 				channelID = chdr.ChannelId
+				headerType = common.HeaderType(chdr.Type)
 
-				if common.HeaderType(chdr.Type) == common.HeaderType_ENDORSER_TRANSACTION {
+				if headerType == common.HeaderType_ENDORSER_TRANSACTION {
 					logger.Debugf("Channel [%s]: Block event for block number [%d] contains transaction id: %s", channelID, block.Header.Number, chdr.TxId)
 					tx, err := utils.GetTransaction(payload.Data)
 					if err != nil {
@@ -133,6 +136,7 @@ func CreateBlockEvents(block *common.Block) (bevent *pb.Event, fbevent *pb.Event
 	}
 	filteredBlockForEvent.ChannelId = channelID
 	filteredBlockForEvent.Number = block.Header.Number
+	filteredBlockForEvent.Type = headerType
 	filteredBlockForEvent.FilteredTx = filteredTxArray
 
 	return CreateBlockEvent(blockForEvent), CreateFilteredBlockEvent(filteredBlockForEvent), channelID, nil

diff --git a/protos/peer/events.pb.go b/protos/peer/events.pb.go
diff --git a/protos/peer/events.proto b/protos/peer/events.proto
@@ -81,7 +81,8 @@ message Unregister {
 message FilteredBlock {
     string channel_id = 1;
     uint64 number = 2; // The position in the blockchain
-    repeated FilteredTransaction filtered_tx = 3;
+    common.HeaderType type = 3;
+    repeated FilteredTransaction filtered_tx = 4;
 }
 
 //FilteredTransaction is a minimal set of information about a transaction