-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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.
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
[DON'T MERGE] CCIP Repository Merge - ocr2 #13975
Conversation
merge core develop -> ccip-develop fix conflicts, build use openzeppelin-solidity v4.8.3 add ERC165Checker.sol to the vendor, wasn't there before add missing file update shared snapshot update gethwrappers add ERC165.sol to fix metatx compile update generated files update modgraph fix one config test fix some config tests fix config again more config test fixes bump mockery version in contracts makefile go.mod updates more updates remove integration-tests dependencies USDC filter fix (#383) fix integration-tests go mod more fixes fix lint errors fix TestSecrets_Validate fix TestResolver_ConfigV2 fix TestIntegration_CCIP try using crypto/rand remove build-publish-pr.yml skip metatx test
fix integration-tests/go.mod fix imports
8b07397
to
9520696
Compare
@@ -107,6 +107,9 @@ type Service interface { | |||
ListSpecsByJobProposalIDs(ctx context.Context, ids []int64) ([]JobProposalSpec, error) | |||
RejectSpec(ctx context.Context, id int64) error | |||
UpdateSpecDefinition(ctx context.Context, id int64, spec string) error | |||
|
|||
// UnsafeSetConnectionsManager Only for testing | |||
UnsafeSetConnectionsManager(ConnectionsManager) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@asoliman92 Have you checked if it's still needed? Locally integration_tests.go
and integration_legacy_test.go
works for me when removed
Checking here smartcontractkit/ccip#1253
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ignore that, it's needed for CLO tests I created long time ago :P (Test_CLOSpecApprovalFlow)
if err2 != nil { | ||
d.lggr.Errorw("failed to unregister ccip exec plugin filters", "err", err2, "spec", spec) | ||
} | ||
return nil |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why does this logic live in cleanupEVM
as opposed to triggering when a service is closed?
var multiErr error | ||
for _, fn := range unregisterFuncs { | ||
if err := fn(); err != nil { | ||
multiErr = multierr.Append(multiErr, err) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We've been trying to drop this import in favor of the std lib:
multiErr = multierr.Append(multiErr, err) | |
multiErr = errors.Join(multiErr, err) |
That can be a follow up change though.
} | ||
} | ||
|
||
return allStatuses, counter - 1, nil |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why subtract one? Returning from here means the break on 42 was encountered, before incrementing on 45. Isn't counter
accurate as-is?
To review this we should start with the following:
On a quick inspection it looks like about 1/3 of the files were modified during the migration:
|
6e65920
to
e9bcab8
Compare
This branch is to help review the move from CCIP to Chainlink repo in #13975
Quality Gate passedIssues Measures |
The following commits are identical according to the script: ccip: |
DO NOT MERGE THAT PR, once approved and working we need to figure out way to merge it instead of squashing. Otherwise, entire effort on preserving commits history from CCIP repo will be lost.
Next steps: