Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use GetSourceChainConfig instead of OffRampGetAllSourceChainConfigs #527

Merged
merged 2 commits into from
Feb 7, 2025
Merged

Use GetSourceChainConfig instead of OffRampGetAllSourceChainConfigs #527

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3113af7
Use GetSourceChainConfig instead of OffRampGetAllSourceChainConfigs
reductionista Jan 29, 2025
86e8f4f
Merge branch 'main' into domino/get_all_chain_configs
winder Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions commit/plugin_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion internal/mocks/inmem/ccipreader_inmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
9 changes: 7 additions & 2 deletions internal/plugincommon/discovery/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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)
}
Expand Down
9 changes: 6 additions & 3 deletions internal/plugincommon/discovery/processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down
29 changes: 15 additions & 14 deletions mocks/pkg/reader/ccip_reader.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions pkg/contractreader/extended_unit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading
Loading