[CAL][3] - Implement GetChainFeeComponents

Author: ogtownsend

pkg/chainaccessor/legacy_accessor.go

@@ -59,16 +59,13 @@ func (l *LegacyAccessor) GetContractAddress(contractName string) ([]byte, error)
 	return addressBytes, nil
 }
 
-func (l *LegacyAccessor) GetChainFeeComponents(
-	ctx context.Context,
-) map[cciptypes.ChainSelector]cciptypes.ChainFeeComponents {
-	// TODO(NONEVM-1865): implement
-	panic("implement me")
-}
+func (l *LegacyAccessor) GetChainFeeComponents(ctx context.Context) (cciptypes.ChainFeeComponents, error) {
+	fc, err := l.contractWriter.GetFeeComponents(ctx)
+	if err != nil {
+		return cciptypes.ChainFeeComponents{}, fmt.Errorf("get fee components: %w", err)
+	}
 
-func (l *LegacyAccessor) GetDestChainFeeComponents(ctx context.Context) (types.ChainFeeComponents, error) {
-	// TODO(NONEVM-1865): implement
-	panic("implement me")
+	return *fc, nil
 }
 
 func (l *LegacyAccessor) Sync(ctx context.Context, contracts cciptypes.ContractAddresses) error {

pkg/reader/ccip.go

@@ -881,12 +881,12 @@ func (r *ccipChainReader) GetChainsFeeComponents(
 	feeComponents := make(map[cciptypes.ChainSelector]types.ChainFeeComponents, len(r.contractWriters))
 
 	for _, chain := range chains {
-		chainWriter, ok := r.contractWriters[chain]
-		if !ok {
-			lggr.Errorw("contract writer not found", "chain", chain)
+		if err := validateAccessorExistence(r.accessors, chain); err != nil {
+			lggr.Errorw("accessor not found", "chain", chain, "err", err)
 			continue
 		}
-		feeComponent, err := chainWriter.GetFeeComponents(ctx)
+
+		feeComponent, err := r.accessors[chain].GetChainFeeComponents(ctx)
 		if err != nil {
 			lggr.Errorw("failed to get chain fee components", "chain", chain, "err", err)
 			continue
@@ -901,7 +901,7 @@ func (r *ccipChainReader) GetChainsFeeComponents(
 			continue
 		}
 
-		feeComponents[chain] = *feeComponent
+		feeComponents[chain] = feeComponent
 	}
 	return feeComponents
 }

pkg/reader/ccip_test.go

@@ -1085,9 +1085,6 @@ func TestCCIPChainReader_getFeeQuoterTokenPriceUSD(t *testing.T) {
 }
 
 func TestCCIPFeeComponents_HappyPath(t *testing.T) {
-	destCR := reader_mocks.NewMockContractReaderFacade(t)
-	destCR.EXPECT().Bind(mock.Anything, mock.Anything).Return(nil)
-
 	cw := writer_mocks.NewMockContractWriter(t)
 	cw.EXPECT().GetFeeComponents(mock.Anything).Return(
 		&types.ChainFeeComponents{
@@ -1097,15 +1094,25 @@ func TestCCIPFeeComponents_HappyPath(t *testing.T) {
 	)
 
 	contractWriters := make(map[cciptypes.ChainSelector]types.ContractWriter)
-	// Missing writer for chainB
 	contractWriters[chainA] = cw
+	contractWriters[chainB] = cw
 	contractWriters[chainC] = cw
 
+	sourceCRs := make(map[cciptypes.ChainSelector]*reader_mocks.MockContractReaderFacade)
+	for _, chain := range []cciptypes.ChainSelector{chainA, chainB, chainC} {
+		sourceCRs[chain] = reader_mocks.NewMockContractReaderFacade(t)
+	}
+
+	destChain := chainC
+	sourceCRs[destChain].EXPECT().Bind(mock.Anything, mock.Anything).Return(nil)
+
 	ccipReader, err := newCCIPChainReaderInternal(
 		tests.Context(t),
 		logger.Test(t),
 		map[cciptypes.ChainSelector]contractreader.ContractReaderFacade{
-			chainC: destCR,
+			chainA: sourceCRs[chainA],
+			chainB: sourceCRs[chainB],
+			chainC: sourceCRs[chainC],
 		},
 		contractWriters,
 		chainC,
@@ -1124,10 +1131,12 @@ func TestCCIPFeeComponents_HappyPath(t *testing.T) {
 
 	ctx := context.Background()
 	feeComponents := ccipReader.GetChainsFeeComponents(ctx, []cciptypes.ChainSelector{chainA, chainB, chainC})
-	assert.Len(t, feeComponents, 2)
+	assert.Len(t, feeComponents, 3)
 	assert.Equal(t, big.NewInt(1), feeComponents[chainA].ExecutionFee)
-	assert.Equal(t, big.NewInt(2), feeComponents[chainA].DataAvailabilityFee)
+	assert.Equal(t, big.NewInt(1), feeComponents[chainB].ExecutionFee)
 	assert.Equal(t, big.NewInt(1), feeComponents[chainC].ExecutionFee)
+	assert.Equal(t, big.NewInt(2), feeComponents[chainA].DataAvailabilityFee)
+	assert.Equal(t, big.NewInt(2), feeComponents[chainB].DataAvailabilityFee)
 	assert.Equal(t, big.NewInt(2), feeComponents[chainC].DataAvailabilityFee)
 
 	destChainFeeComponent, err := ccipReader.GetDestChainFeeComponents(ctx)

pkg/types/ccipocr3/chain_accessor.go

@@ -68,17 +68,7 @@ type AllAccessors interface {
 	// Access Type: ChainWriter
 	// Contract: N/A
 	// Confidence: N/A
-	GetChainFeeComponents(
-		ctx context.Context,
-	) map[ChainSelector]ChainFeeComponents
-
-	// GetDestChainFeeComponents seems redundant. If the error is needed lets
-	// add it to GetChainFeeComponents.
-	//
-	// Deprecated: use GetChainFeeComponents instead.
-	GetDestChainFeeComponents(
-		ctx context.Context,
-	) (types.ChainFeeComponents, error)
+	GetChainFeeComponents(ctx context.Context) (ChainFeeComponents, error)
 
 	// Sync can be used to perform frequent syncing operations inside the reader implementation.
 	// Returns a bool indicating whether something was updated.