Use GetSourceChainConfig instead of OffRampGetAllSourceChainConfigs

commit/plugin_e2e_test.go

@@ -736,7 +736,7 @@ func prepareCcipReaderMock(
 	}
 
 	if enableDiscovery {
-		ccipReader.EXPECT().DiscoverContracts(mock.Anything).Return(nil, nil)
+		ccipReader.EXPECT().DiscoverContracts(mock.Anything, mock.Anything).Return(nil, nil)
 		ccipReader.EXPECT().Sync(mock.Anything, mock.Anything).Return(nil)
 	}
 }
@@ -801,8 +801,10 @@ func setupNode(params SetupNodeParams) nodeSetup {
 	}
 
 	homeChainReader.EXPECT().GetFChain().Return(fChain, nil)
-	homeChainReader.EXPECT().
-		GetOCRConfigs(mock.Anything, params.donID, consts.PluginTypeCommit).
+	if params.enableDiscovery {
+		homeChainReader.EXPECT().GetAllChainConfigs().Return(params.chainCfg, nil)
+	}
+	homeChainReader.EXPECT().GetOCRConfigs(mock.Anything, params.donID, consts.PluginTypeCommit).
 		Return(reader.ActiveAndCandidate{
 			ActiveConfig: reader.OCR3ConfigWithMeta{
 				ConfigDigest: params.reportingCfg.ConfigDigest,

internal/mocks/inmem/ccipreader_inmem.go

@@ -162,7 +162,9 @@ func (r InMemoryCCIPReader) GetChainFeePriceUpdate(
 	return nil
 }
 
-func (r InMemoryCCIPReader) DiscoverContracts(ctx context.Context) (reader.ContractAddresses, error) {
+func (r InMemoryCCIPReader) DiscoverContracts(
+	ctx context.Context,
+	allChains []cciptypes.ChainSelector) (reader.ContractAddresses, error) {
 	return nil, nil
 }
 

internal/plugincommon/discovery/processor.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/smartcontractkit/libocr/commontypes"
 	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
+	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
@@ -68,8 +69,12 @@ func (cdp *ContractDiscoveryProcessor) Observation(
 		return dt.Observation{}, fmt.Errorf("unable to get fchain: %w, seqNr: %d", err, seqNr)
 	}
 
-	// TODO: discover the full list of source chain selectors and pass it into DiscoverContracts.
-	contracts, err := (*cdp.reader).DiscoverContracts(ctx)
+	chainConfigs, err := cdp.homechain.GetAllChainConfigs()
+	if err != nil {
+		return dt.Observation{}, fmt.Errorf("unable to get chain configs: %w, seqNr: %d", err, seqNr)
+	}
+
+	contracts, err := (*cdp.reader).DiscoverContracts(ctx, maps.Keys(chainConfigs))
 	if err != nil {
 		return dt.Observation{}, fmt.Errorf("unable to discover contracts: %w, seqNr: %d", err, seqNr)
 	}

internal/plugincommon/discovery/processor_test.go

@@ -64,10 +64,11 @@ func TestContractDiscoveryProcessor_Observation_SupportsDest_HappyPath(t *testin
 	}
 	mockReader.
 		EXPECT().
-		DiscoverContracts(mock.Anything).
+		DiscoverContracts(mock.Anything, mock.Anything).
 		Return(expectedContracts, nil)
 
 	mockHomeChain.EXPECT().GetFChain().Return(expectedFChain, nil)
+	mockHomeChain.EXPECT().GetAllChainConfigs().Return(nil, nil)
 	defer mockReader.AssertExpectations(t)
 	defer mockHomeChain.AssertExpectations(t)
 
@@ -140,10 +141,11 @@ func TestContractDiscoveryProcessor_Observation_SourceReadersNotReady(t *testing
 	}
 	mockReader.
 		EXPECT().
-		DiscoverContracts(mock.Anything).
+		DiscoverContracts(mock.Anything, mock.Anything).
 		Return(nil, nil)
 
 	mockHomeChain.EXPECT().GetFChain().Return(expectedFChain, nil)
+	mockHomeChain.EXPECT().GetAllChainConfigs().Return(nil, nil)
 	defer mockReader.AssertExpectations(t)
 	defer mockHomeChain.AssertExpectations(t)
 
@@ -179,9 +181,10 @@ func TestContractDiscoveryProcessor_Observation_ErrorDiscoveringContracts(t *tes
 	discoveryErr := fmt.Errorf("discovery error")
 	mockReader.
 		EXPECT().
-		DiscoverContracts(mock.Anything).
+		DiscoverContracts(mock.Anything, mock.Anything).
 		Return(nil, discoveryErr)
 	mockHomeChain.EXPECT().GetFChain().Return(expectedFChain, nil)
+	mockHomeChain.EXPECT().GetAllChainConfigs().Return(nil, nil)
 	defer mockReader.AssertExpectations(t)
 	defer mockHomeChain.AssertExpectations(t)
 

pkg/contractreader/extended_unit_test.go

@@ -5,9 +5,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetOneBinding(t *testing.T) {