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

Change contract name to reflect latest changes in home chain reader #9

Merged
merged 1 commit into from
Jul 1, 2024
Merged

Change contract name to reflect latest changes in home chain reader #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion commit/plugin_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ func newNode(
func setupHomeChainPoller(lggr logger.Logger, chainConfigInfos []reader.ChainConfigInfo) reader.HomeChain {
homeChainReader := mocks.NewContractReaderMock()
homeChainReader.On(
"GetLatestValue", mock.Anything, "CCIPCapabilityConfiguration", "getAllChainConfigs", mock.Anything, mock.Anything,
"GetLatestValue", mock.Anything, "CCIPConfig", "getAllChainConfigs", mock.Anything, mock.Anything,
).Run(
func(args mock.Arguments) {
arg := args.Get(4).(*[]reader.ChainConfigInfo)
Expand Down
10 changes: 5 additions & 5 deletions internal/reader/home_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (r *homeChainPoller) poll() {
func (r *homeChainPoller) fetchAndSetConfigs(ctx context.Context) error {
var chainConfigInfos []ChainConfigInfo
err := r.homeChainReader.GetLatestValue(
ctx, "CCIPCapabilityConfiguration", "getAllChainConfigs", nil, &chainConfigInfos,
ctx, "CCIPConfig", "getAllChainConfigs", nil, &chainConfigInfos,
)
if err != nil {
return err
Expand Down Expand Up @@ -192,7 +192,7 @@ func (r *homeChainPoller) GetOCRConfigs(
ctx context.Context, donID uint32, pluginType uint8,
) ([]OCR3ConfigWithMeta, error) {
var ocrConfigs []OCR3ConfigWithMeta
err := r.homeChainReader.GetLatestValue(ctx, "CCIPCapabilityConfiguration", "getOCRConfig", map[string]any{
err := r.homeChainReader.GetLatestValue(ctx, "CCIPConfig", "getOCRConfig", map[string]any{
"donId": donID,
"pluginType": pluginType,
}, &ocrConfigs)
Expand Down Expand Up @@ -290,7 +290,7 @@ type HomeChainConfigMapper struct {
// se/deserializing easier
type ChainConfigInfo struct {
// nolint:lll // don't split up the long url
// Calling function https://github.com/smartcontractkit/ccip/blob/330c5e98f624cfb10108c92fe1e00ced6d345a99/contracts/src/v0.8/ccip/capability/CCIPCapabilityConfiguration.sol#L140
// Calling function https://github.com/smartcontractkit/ccip/blob/330c5e98f624cfb10108c92fe1e00ced6d345a99/contracts/src/v0.8/ccip/capability/CCIPConfig.sol#L140
ChainSelector cciptypes.ChainSelector `json:"chainSelector"`
ChainConfig HomeChainConfigMapper `json:"chainConfig"`
}
Expand All @@ -306,7 +306,7 @@ type ChainConfig struct {
Config []byte `json:"config"`
}

// OCR3Config mirrors CCIPCapabilityConfiguration.sol's OCR3Config struct
// OCR3Config mirrors CCIPConfig.sol's OCR3Config struct
type OCR3Config struct {
PluginType uint8 `json:"pluginType"`
ChainSelector cciptypes.ChainSelector `json:"chainSelector"`
Expand All @@ -320,7 +320,7 @@ type OCR3Config struct {
OffchainConfig []byte `json:"offchainConfig"`
}

// OCR3ConfigWithmeta mirrors CCIPCapabilityConfiguration.sol's OCR3ConfigWithMeta struct
// OCR3ConfigWithmeta mirrors CCIPConfig.sol's OCR3ConfigWithMeta struct
type OCR3ConfigWithMeta struct {
Config OCR3Config `json:"config"`
ConfigCount uint64 `json:"configCount"`
Expand Down
6 changes: 3 additions & 3 deletions internal/reader/home_chain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestHomeChainConfigPoller_HealthReport(t *testing.T) {
homeChainReader.On(
"GetLatestValue",
mock.Anything,
"CCIPCapabilityConfiguration",
"CCIPConfig",
"getAllChainConfigs",
mock.Anything,
mock.Anything).Return(fmt.Errorf("error"))
Expand Down Expand Up @@ -116,7 +116,7 @@ func Test_PollingWorking(t *testing.T) {

homeChainReader := mocks.NewContractReaderMock()
homeChainReader.On(
"GetLatestValue", mock.Anything, "CCIPCapabilityConfiguration", "getAllChainConfigs", mock.Anything, mock.Anything,
"GetLatestValue", mock.Anything, "CCIPConfig", "getAllChainConfigs", mock.Anything, mock.Anything,
).Run(
func(args mock.Arguments) {
arg := args.Get(4).(*[]ChainConfigInfo)
Expand Down Expand Up @@ -163,7 +163,7 @@ func Test_HomeChainPoller_GetOCRConfig(t *testing.T) {
homeChainReader.On(
"GetLatestValue",
mock.Anything,
"CCIPCapabilityConfiguration",
"CCIPConfig",
"getOCRConfig",
map[string]any{
"donId": donID,
Expand Down