Merge pull request #3640 from onflow/fxamacker/update-ccf-cddl-in-com…

…ments Update CCF CDDL for IntersectionType to match CCF codec
onflow · Oct 23, 2024 · 3815ec4 · 3815ec4
2 parents 8b27276 + 95eb472
commit 3815ec4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/encoding/ccf/decode_type.go b/encoding/ccf/decode_type.go
@@ -610,16 +610,14 @@ func (d *Decoder) decodeReferenceType(
 //
 //	; cbor-tag-intersection-type
 //	#6.143([
-//	  type: inline-type / nil,
-//	  types: [* inline-type]
+//	  types: [+ inline-type]
 //	])
 //
 // intersection-type-value =
 //
 //	; cbor-tag-intersection-type-value
 //	#6.191([
-//	  type: type-value / nil,
-//	  types: [* type-value]
+//	  types: [+ type-value]
 //	])
 //
 // NOTE: decodeTypeFn is responsible for decoding inline-type or type-value.

diff --git a/encoding/ccf/encode.go b/encoding/ccf/encode.go
@@ -1569,8 +1569,7 @@ func (e *Encoder) encodeReferenceTypeValue(typ *cadence.ReferenceType, visited c
 //
 //	; cbor-tag-intersection-type-value
 //	#6.191([
-//	  type: type-value / nil,
-//	  types: [* type-value]
+//	  types: [+ type-value]
 //	])
 func (e *Encoder) encodeIntersectionTypeValue(typ *cadence.IntersectionType, visited ccfTypeIDByCadenceType) error {
 	rawTagNum := []byte{0xd8, CBORTagIntersectionTypeValue}

diff --git a/encoding/ccf/encode_type.go b/encoding/ccf/encode_type.go
@@ -604,8 +604,7 @@ func (e *Encoder) encodeReferenceTypeWithRawTag(
 //
 //	; cbor-tag-intersection-type
 //	#6.143([
-//	  type: inline-type / nil,
-//	  types: [* inline-type]
+//	  types: [+ inline-type]
 //	])
 func (e *Encoder) encodeIntersectionType(typ *cadence.IntersectionType, tids ccfTypeIDByCadenceType) error {
 	rawTagNum := []byte{0xd8, CBORTagIntersectionType}