Support v0.3 schema report format in LLO

llo/channel_definitions.go

@@ -2,6 +2,7 @@ package llo
 
 import (
 	"fmt"
+	"sort"
 
 	llotypes "github.com/smartcontractkit/chainlink-common/pkg/types/llo"
 )
@@ -27,3 +28,28 @@ func VerifyChannelDefinitions(channelDefs llotypes.ChannelDefinitions) error {
 	}
 	return nil
 }
+
+func subtractChannelDefinitions(minuend llotypes.ChannelDefinitions, subtrahend llotypes.ChannelDefinitions, limit int) llotypes.ChannelDefinitions {
+	differenceList := []ChannelDefinitionWithID{}
+	for channelID, channelDefinition := range minuend {
+		if _, ok := subtrahend[channelID]; !ok {
+			differenceList = append(differenceList, ChannelDefinitionWithID{channelDefinition, channelID})
+		}
+	}
+
+	// Sort so we return deterministic result
+	sort.Slice(differenceList, func(i, j int) bool {
+		return differenceList[i].ChannelID < differenceList[j].ChannelID
+	})
+
+	if len(differenceList) > limit {
+		differenceList = differenceList[:limit]
+	}
+
+	difference := llotypes.ChannelDefinitions{}
+	for _, defWithID := range differenceList {
+		difference[defWithID.ChannelID] = defWithID.ChannelDefinition
+	}
+
+	return difference
+}

llo/json_codec.go → llo/json_report_codec.go

@@ -55,6 +55,9 @@ func (cdc JSONReportCodec) Encode(r Report, _ llotypes.ChannelDefinition) ([]byt
 	}
 	values := make([]JSONStreamValue, len(r.Values))
 	for i, sv := range r.Values {
+		if sv == nil {
+			return nil, ErrNilStreamValue
+		}
 		b, err := sv.MarshalText()
 		if err != nil {
 			return nil, fmt.Errorf("failed to encode StreamValue: %w", err)