Comments

smartcontractkit · Jul 17, 2024 · fb6eb58 · fb6eb58
1 parent e59453c
commit fb6eb58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/llo/channel_definitions.go b/llo/channel_definitions.go
@@ -21,7 +21,6 @@ func VerifyChannelDefinitions(channelDefs llotypes.ChannelDefinitions) error {
 			}
 			uniqueStreamIDs[strm.StreamID] = struct{}{}
 		}
-		// TODO: verify opts?
 	}
 	if len(uniqueStreamIDs) > MaxObservationStreamValuesLength {
 		return fmt.Errorf("too many unique stream IDs, got: %d/%d", len(uniqueStreamIDs), MaxObservationStreamValuesLength)

diff --git a/llo/plugin_codecs.go b/llo/plugin_codecs.go
@@ -84,6 +84,7 @@ func channelDefinitionsToProtoObservation(in llotypes.ChannelDefinitions) (out m
 }
 
 // TODO: Guard against untrusted inputs!
+// MERC-3524
 func (c protoObservationCodec) Decode(b types.Observation) (Observation, error) {
 	pbuf := &LLOObservationProto{}
 	err := proto.Unmarshal(b, pbuf)
@@ -123,6 +124,7 @@ func (c protoObservationCodec) Decode(b types.Observation) (Observation, error)
 }
 
 // TODO: Needs fuzz testing
+// MERC-3524
 func channelDefinitionsFromProtoObservation(channelDefinitions map[uint32]*LLOChannelDefinitionProto) llotypes.ChannelDefinitions {
 	if len(channelDefinitions) == 0 {
 		return nil
@@ -207,6 +209,7 @@ func channelDefinitionsToProtoOutcome(in llotypes.ChannelDefinitions) (out []*LL
 }
 
 // TODO: Needs thorough unit testing of all paths including nil handling
+// MERC-3524
 func StreamAggregatesToProtoOutcome(in StreamAggregates) (out []*LLOStreamAggregate, err error) {
 	if len(in) > 0 {
 		out = make([]*LLOStreamAggregate, 0, len(in))
@@ -257,6 +260,7 @@ func validAfterSecondsToProtoOutcome(in map[llotypes.ChannelID]uint32) (out []*L
 }
 
 // TODO: Guard against untrusted inputs!
+// MERC-3524
 func (protoOutcomeCodec) Decode(b ocr3types.Outcome) (outcome Outcome, err error) {
 	pbuf := &LLOOutcomeProto{}
 	err = proto.Unmarshal(b, pbuf)
@@ -280,6 +284,7 @@ func (protoOutcomeCodec) Decode(b ocr3types.Outcome) (outcome Outcome, err error
 }
 
 // TODO: Needs fuzz testing
+// MERC-3524
 func channelDefinitionsFromProtoOutcome(in []*LLOChannelIDAndDefinitionProto) (out llotypes.ChannelDefinitions) {
 	if len(in) > 0 {
 		out = make(map[llotypes.ChannelID]llotypes.ChannelDefinition, len(in))
@@ -302,6 +307,7 @@ func channelDefinitionsFromProtoOutcome(in []*LLOChannelIDAndDefinitionProto) (o
 }
 
 // TODO: Needs fuzz testing
+// MERC-3524
 func streamAggregatesFromProtoOutcome(in []*LLOStreamAggregate) (out StreamAggregates, err error) {
 	if len(in) > 0 {
 		out = make(StreamAggregates, len(in))
@@ -323,6 +329,7 @@ func streamAggregatesFromProtoOutcome(in []*LLOStreamAggregate) (out StreamAggre
 }
 
 // TODO: Needs fuzz testing
+// MERC-3524
 func validAfterSecondsFromProtoOutcome(in []*LLOChannelIDAndValidAfterSecondsProto) (out map[llotypes.ChannelID]uint32) {
 	if len(in) > 0 {
 		out = make(map[llotypes.ChannelID]uint32, len(in))

diff --git a/mercury/v3/mercury.go b/mercury/v3/mercury.go
@@ -127,7 +127,6 @@ func (rp *reportingPlugin) Observation(ctx context.Context, repts types.ReportTi
 		return nil, fmt.Errorf("DataSource.Observe returned an error: %s", err)
 	}
 
-	// TODO: Move this to before Observe is called
 	observationTimestamp := time.Now()
 	if observationTimestamp.Unix() > math.MaxUint32 {
 		return nil, fmt.Errorf("current unix epoch %d exceeds max uint32", observationTimestamp.Unix())