ChannelDefinitionCache accepts the previous outcome

brunotm · brunotm · commit da144b0f7c71 · 2025-12-02T10:24:02.000Z
diff --git a/llo/plugin.go b/llo/plugin.go
@@ -162,7 +162,7 @@ type PredecessorRetirementReportCache interface {
 }
 
 type ChannelDefinitionCache interface {
-	Definitions() llotypes.ChannelDefinitions
+	Definitions(previous llotypes.ChannelDefinitions) llotypes.ChannelDefinitions
 }
 
 // A ReportingPlugin allows plugging custom logic into the OCR3 protocol. The OCR
diff --git a/llo/plugin_observation.go b/llo/plugin_observation.go
@@ -75,7 +75,7 @@ func (p *Plugin) observation(ctx context.Context, outctx ocr3types.OutcomeContex
 			// can agree on the same set of changes.
 			//
 			// ChannelIDs should always be sorted the same way (channel ID ascending).
-			expectedChannelDefs := p.ChannelDefinitionCache.Definitions()
+			expectedChannelDefs := p.ChannelDefinitionCache.Definitions(previousOutcome.ChannelDefinitions)
 			if err = VerifyChannelDefinitions(p.ReportCodecs, expectedChannelDefs); err != nil {
 				// If channel definitions is invalid, do not error out but instead
 				// don't vote on any new channels.
diff --git a/llo/plugin_test.go b/llo/plugin_test.go
@@ -29,7 +29,7 @@ type mockChannelDefinitionCache struct {
 	definitions llotypes.ChannelDefinitions
 }
 
-func (m *mockChannelDefinitionCache) Definitions() llotypes.ChannelDefinitions {
+func (m *mockChannelDefinitionCache) Definitions(previous llotypes.ChannelDefinitions) llotypes.ChannelDefinitions {
 	return m.definitions
 }
 
@@ -53,7 +53,7 @@ func (m *mockChannelDefinitionCache) Start(ctx context.Context) error {
 	return nil
 }
 
-var _ llotypes.ChannelDefinitionCache = &mockChannelDefinitionCache{}
+var _ ChannelDefinitionCache = &mockChannelDefinitionCache{}
 
 type mockDataSource struct {
 	s   StreamValues

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ type PredecessorRetirementReportCache interface {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`type ChannelDefinitionCache interface {`
`165`		`- Definitions() llotypes.ChannelDefinitions`
	`165`	`+ Definitions(previous llotypes.ChannelDefinitions) llotypes.ChannelDefinitions`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`// A ReportingPlugin allows plugging custom logic into the OCR3 protocol. The OCR`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type mockChannelDefinitionCache struct {`
`29`	`29`	`definitions llotypes.ChannelDefinitions`
`30`	`30`	`}`
`31`	`31`
`32`		`-func (m *mockChannelDefinitionCache) Definitions() llotypes.ChannelDefinitions {`
	`32`	`+func (m *mockChannelDefinitionCache) Definitions(previous llotypes.ChannelDefinitions) llotypes.ChannelDefinitions {`
`33`	`33`	`return m.definitions`
`34`	`34`	`}`
`35`	`35`
`@@ -53,7 +53,7 @@ func (m *mockChannelDefinitionCache) Start(ctx context.Context) error {`
`53`	`53`	`return nil`
`54`	`54`	`}`
`55`	`55`
`56`		`-var _ llotypes.ChannelDefinitionCache = &mockChannelDefinitionCache{}`
	`56`	`+var _ ChannelDefinitionCache = &mockChannelDefinitionCache{}`
`57`	`57`
`58`	`58`	`type mockDataSource struct {`
`59`	`59`	`s StreamValues`