Merge "FAB-16286 protolator understand ChaincodeHeaderExt"

hyperledger · Nov 15, 2019 · 019c7ab · 019c7ab
2 parents 33139a9 + 59bad46
commit 019c7ab
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/common/tools/protolator/protoext/commonext/common.go b/common/tools/protolator/protoext/commonext/common.go
@@ -42,8 +42,6 @@ func (p *Payload) VariablyOpaqueFields() []string {
 	return []string{"data"}
 }
 
-var PayloadDataMap = map[int32]proto.Message{}
-
 func (p *Payload) VariablyOpaqueFieldProto(name string) (proto.Message, error) {
 	if name != p.VariablyOpaqueFields()[0] {
 		return nil, fmt.Errorf("not a marshaled field: %s", name)
@@ -73,6 +71,29 @@ func (p *Payload) VariablyOpaqueFieldProto(name string) (proto.Message, error) {
 	}
 }
 
+type ChannelHeader struct{ *common.ChannelHeader }
+
+func (ch *ChannelHeader) Underlying() proto.Message {
+	return ch.ChannelHeader
+}
+
+func (ch *ChannelHeader) VariablyOpaqueFields() []string {
+	return []string{"extension"}
+}
+
+func (ch *ChannelHeader) VariablyOpaqueFieldProto(name string) (proto.Message, error) {
+	if name != "extension" {
+		return nil, fmt.Errorf("not an opaque field")
+	}
+
+	switch ch.Type {
+	case int32(common.HeaderType_ENDORSER_TRANSACTION):
+		return &peer.ChaincodeHeaderExtension{}, nil
+	default:
+		return nil, fmt.Errorf("channel header extension only valid for endorser transactions")
+	}
+}
+
 type Header struct{ *common.Header }
 
 func (h *Header) Underlying() proto.Message {

diff --git a/common/tools/protolator/protoext/decorate.go b/common/tools/protolator/protoext/decorate.go
@@ -38,6 +38,8 @@ func Decorate(msg proto.Message) proto.Message {
 		return &commonext.Envelope{Envelope: m}
 	case *common.Header:
 		return &commonext.Header{Header: m}
+	case *common.ChannelHeader:
+		return &commonext.ChannelHeader{ChannelHeader: m}
 	case *common.SignatureHeader:
 		return &commonext.SignatureHeader{SignatureHeader: m}
 	case *common.Payload: