Update tests

commit/plugin_e2e_test.go

@@ -735,7 +735,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)
 	}
 }
@@ -800,8 +800,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/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/reader/ccip.go

@@ -1203,12 +1203,12 @@ func (r *ccipChainReader) getAllOffRampSourceChainsConfig(
 	for i, chainSel := range sourceChains {
 		v, err := results[i].GetResult()
 		if err != nil {
-			return nil, fmt.Errorf("GetSourceChainConfig for chainSelector=%d failed: %w", err)
+			return nil, fmt.Errorf("GetSourceChainConfig for chainSelector=%d failed: %w", chainSel, err)
 		}
 
 		cfg, ok := v.(sourceChainConfig)
 		if !ok {
-			return nil, fmt.Errorf("invalid result type from GetSourceChainConfig for chainSelector=%d: %w", err)
+			return nil, fmt.Errorf("invalid result type from GetSourceChainConfig for chainSelector=%d: %w", chainSel, err)
 		}
 
 		enabled, err := cfg.check()

pkg/reader/ccip_test.go

@@ -431,9 +431,19 @@ func TestCCIPChainReader_DiscoverContracts_HappyPath_Round1(t *testing.T) {
 	destRMNRemote := []byte{0x4}
 	destFeeQuoter := []byte{0x5}
 	destRouter := []byte{0x6}
-	//srcRouters := []byte{0x7, 0x8}
+	srcRouters := [][]byte{{0x7}, {0x8}}
 	//srcFeeQuoters := [2][]byte{{0x7}, {0x8}}
 
+	sourceChainConfigs := make(map[cciptypes.ChainSelector]sourceChainConfig, len(sourceChain))
+	for i, chain := range sourceChain {
+		sourceChainConfigs[chain] = sourceChainConfig{
+			Router:    srcRouters[i],
+			IsEnabled: true,
+			MinSeqNr:  0,
+			OnRamp:    onramps[i],
+		}
+	}
+
 	// Build expected addresses.
 	var expectedContractAddresses ContractAddresses
 	// Source FeeQuoter's and destRouter are missing.
@@ -514,7 +524,7 @@ func TestCCIPChainReader_DiscoverContracts_HappyPath_Round1(t *testing.T) {
 		lggr:            lggr,
 	}
 
-	contractAddresses, err := ccipChainReader.DiscoverContracts(ctx)
+	contractAddresses, err := ccipChainReader.DiscoverContracts(ctx, sourceChain[:])
 	require.NoError(t, err)
 
 	assert.Equal(t, expectedContractAddresses, contractAddresses)
@@ -661,7 +671,7 @@ func TestCCIPChainReader_DiscoverContracts_HappyPath_Round2(t *testing.T) {
 		lggr:            logger.Test(t),
 	}
 
-	contractAddresses, err := ccipChainReader.DiscoverContracts(ctx)
+	contractAddresses, err := ccipChainReader.DiscoverContracts(ctx, sourceChain[:])
 	require.NoError(t, err)
 
 	require.Equal(t, expectedContractAddresses, contractAddresses)
@@ -701,7 +711,7 @@ func TestCCIPChainReader_DiscoverContracts_GetAllSourceChainConfig_Errors(t *tes
 		lggr: logger.Test(t),
 	}
 
-	_, err := ccipChainReader.DiscoverContracts(ctx)
+	_, err := ccipChainReader.DiscoverContracts(ctx, []cciptypes.ChainSelector{sourceChain1, sourceChain2})
 	require.Error(t, err)
 	require.ErrorIs(t, err, getLatestValueErr)
 }
@@ -747,7 +757,7 @@ func TestCCIPChainReader_DiscoverContracts_GetOfframpStaticConfig_Errors(t *test
 		lggr: logger.Test(t),
 	}
 
-	_, err := ccipChainReader.DiscoverContracts(ctx)
+	_, err := ccipChainReader.DiscoverContracts(ctx, []cciptypes.ChainSelector{sourceChain1, sourceChain2})
 	require.Error(t, err)
 	require.ErrorIs(t, err, getLatestValueErr)
 }