remove opts cache

Author: brunotm

llo/channel_definitions.go

@@ -52,7 +52,7 @@ func VerifyChannelDefinitions(codecs map[llotypes.ReportFormat]ReportCodec, chan
 func subtractChannelDefinitions(minuend llotypes.ChannelDefinitions, subtrahend llotypes.ChannelDefinitions, limit int) llotypes.ChannelDefinitions {
 	differenceList := []ChannelDefinitionWithID{}
 	for channelID, channelDefinition := range minuend {
-		if _, ok := subtrahend[channelID]; !ok {
+		if _, ok := subtrahend[channelID]; !ok || channelDefinition.Tombstone {
 			differenceList = append(differenceList, ChannelDefinitionWithID{channelDefinition, channelID})
 		}
 	}

llo/plugin.go

@@ -316,7 +316,6 @@ type Plugin struct {
 	PredecessorRetirementReportCache PredecessorRetirementReportCache
 	ShouldRetireCache                ShouldRetireCache
 	ChannelDefinitionCache           llotypes.ChannelDefinitionCache
-	ChannelDefinitionOptsCache       ChannelDefinitionOptsCache
 	DataSource                       DataSource
 	Logger                           logger.Logger
 	N                                int

llo/plugin_outcome_test.go

@@ -174,8 +174,8 @@ func testOutcome(t *testing.T, outcomeCodec OutcomeCodec) {
 			}
 
 			// Verify channel is reportable before tombstoning
-			require.Nil(t, previousOutcome.IsReportable(channelID, 1, uint64(100*time.Millisecond), p.ReportCodecs, p.ChannelDefinitionOptsCache))
-			reportable, _ := previousOutcome.ReportableChannels(1, uint64(100*time.Millisecond), p.ReportCodecs, p.ChannelDefinitionOptsCache)
+			require.Nil(t, previousOutcome.IsReportable(channelID, 1, uint64(100*time.Millisecond)))
+			reportable, _ := previousOutcome.ReportableChannels(1, uint64(100*time.Millisecond))
 			assert.Contains(t, reportable, channelID)
 
 			// Encode previous outcome
@@ -215,12 +215,12 @@ func testOutcome(t *testing.T, outcomeCodec OutcomeCodec) {
 			assert.Equal(t, tombstonedCd, decoded.ChannelDefinitions[channelID])
 
 			// Verify channel is no longer reportable
-			err = decoded.IsReportable(channelID, 1, uint64(100*time.Millisecond), p.ReportCodecs, p.ChannelDefinitionOptsCache)
+			err = decoded.IsReportable(channelID, 1, uint64(100*time.Millisecond))
 			require.NotNil(t, err)
 			assert.Contains(t, err.Error(), "tombstone channel")
 
 			// Verify ReportableChannels excludes the tombstoned channel
-			reportable, unreportable := decoded.ReportableChannels(1, uint64(100*time.Millisecond), p.ReportCodecs, p.ChannelDefinitionOptsCache)
+			reportable, unreportable := decoded.ReportableChannels(1, uint64(100*time.Millisecond))
 			assert.NotContains(t, reportable, channelID, "Tombstoned channel should not be in reportable list")
 			require.Len(t, unreportable, 1)
 			assert.Equal(t, channelID, unreportable[0].ChannelID)

llo/plugin_reports_test.go

@@ -199,12 +199,12 @@ func testReports(t *testing.T, outcomeCodec OutcomeCodec) {
 		}
 
 		// Verify tombstoned channel is not reportable
-		unreportableErr := outcome.IsReportable(1, protocolVersion, uint64(minReportInterval), p.ReportCodecs, p.ChannelDefinitionOptsCache)
+		unreportableErr := outcome.IsReportable(1, protocolVersion, uint64(minReportInterval))
 		require.NotNil(t, unreportableErr)
 		assert.Contains(t, unreportableErr.Error(), "tombstone channel")
 
 		// Verify non-tombstoned channel is reportable
-		require.Nil(t, outcome.IsReportable(2, protocolVersion, uint64(minReportInterval), p.ReportCodecs, p.ChannelDefinitionOptsCache))
+		require.Nil(t, outcome.IsReportable(2, protocolVersion, uint64(minReportInterval)))
 
 		encoded, err := p.OutcomeCodec.Encode(outcome)
 		require.NoError(t, err)