Merge pull request #1716 from smartcontractkit/DS-1142-llo-channeldefinitioncache

pkg/types/llo: ChannelDefinitionCache accepts the previous definition

Author: brunotm

pkg/types/llo/types.go

@@ -279,6 +279,14 @@ type ChannelDefinition struct {
 }
 
 func (a ChannelDefinition) Equals(b ChannelDefinition) bool {
+	if a.Tombstone != b.Tombstone {
+		return false
+	}
+
+	if a.Source != b.Source {
+		return false
+	}
+
 	if a.ReportFormat != b.ReportFormat {
 		return false
 	}
@@ -359,7 +367,7 @@ func (c ChannelDefinitions) Value() (driver.Value, error) {
 type ChannelID = uint32
 
 type ChannelDefinitionCache interface {
-	Definitions() ChannelDefinitions
+	Definitions(previous ChannelDefinitions) ChannelDefinitions
 	services.Service
 }
 

pkg/types/llo/types_test.go

@@ -101,6 +101,37 @@ func Test_ChannelDefinition_Equals(t *testing.T) {
 		}
 		assert.False(t, a.Equals(b))
 	})
+	t.Run("different Tombstone", func(t *testing.T) {
+		a := ChannelDefinition{
+			ReportFormat: ReportFormatJSON,
+			Streams:      []Stream{{0, AggregatorMedian}, {1, AggregatorMode}},
+			Opts:         nil,
+		}
+		b := ChannelDefinition{
+			ReportFormat: ReportFormatJSON,
+			Streams:      []Stream{{0, AggregatorMedian}, {1, AggregatorMode}},
+			Opts:         nil,
+			Tombstone:    true,
+		}
+		assert.False(t, a.Equals(b))
+	})
+
+	t.Run("different Source", func(t *testing.T) {
+		a := ChannelDefinition{
+			ReportFormat: ReportFormatJSON,
+			Streams:      []Stream{{0, AggregatorMedian}, {1, AggregatorMode}},
+			Opts:         nil,
+			Source:       1,
+		}
+		b := ChannelDefinition{
+			ReportFormat: ReportFormatJSON,
+			Streams:      []Stream{{0, AggregatorMedian}, {1, AggregatorMode}},
+			Opts:         nil,
+			Source:       2,
+		}
+		assert.False(t, a.Equals(b))
+	})
+
 	t.Run("equal", func(t *testing.T) {
 		a := ChannelDefinition{
 			ReportFormat: ReportFormatJSON,