Skip to content

Update bridges subtree#1392

Merged
acatangiu merged 8 commits intoparitytech:masterfrom
serban300:update-bridges-subtree-2
Sep 11, 2023
Merged

Update bridges subtree#1392
acatangiu merged 8 commits intoparitytech:masterfrom
serban300:update-bridges-subtree-2

Conversation

@serban300
Copy link
Copy Markdown
Contributor

@serban300 serban300 commented Sep 4, 2023 •
edited
Loading

@serban300 serban300 added A3-backport Pull request is already reviewed well in another branch. T15-bridges This PR/Issue is related to bridges. labels Sep 4, 2023
@serban300 serban300 self-assigned this Sep 4, 2023
@acatangiu
Copy link
Copy Markdown
Contributor

acatangiu commented Sep 4, 2023 •
edited
Loading

We were actually talking that bridges dir could be moved from under cumulus directly into root: cumulus/bridges -> bridges.
When we’ll migrate parity-bridges-common repo to monorepo bridges dir, it’ll contain other components too not just bridge-hub pallets and primitives.

@bkchr @ggwpez wdyt?

@bkchr
Copy link
Copy Markdown
Member

bkchr commented Sep 4, 2023

Sounds like a good idea to also move the bridges stuff over! Having it on the top level also sounds about right to me!

svyatonik
svyatonik approved these changes Sep 5, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@svyatonik svyatonik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we also change the bridges subtree rule here?

@serban300
Copy link
Copy Markdown
Contributor Author

serban300 commented Sep 5, 2023

Sounds like a good idea to also move the bridges stuff over! Having it on the top level also sounds about right to me!

Ok, I will adjust the PR then and move the subtree under root.

Shall we also change the bridges subtree rule here?

Good point. Will do.

@serban300
Move the bridges subtree under root
f4a992c
@serban300
Squashed 'bridges/' changes from 277f0d5..e50398d
00ad53a 
e50398d bridges subtree fixes (#2528)
99af075 Markdown linter (#1309) (#2526)
733ff0f `polkadot-staging` branch: Use polkadot-sdk dependencies (#2524)
e8a59f1 Fix benchmark with new XCM::V3 `MAX_INSTRUCTIONS_TO_DECODE` (#2514)
62b185d Backport `polkadot-sdk` changes to `polkadot-staging` (#2518)
d9658f4 Fix equivocation detection containers startup (#2516) (#2517)
d65db28 Backport: building images from locally built binaries (#2513)
5fdbaf4 Start the equivocation detection loop from the complex relayer (#2507) (#2512)
7fbb67d Backport: Implement basic equivocations detection loop (#2375)
cb7efe2 Manually update deps in polkadot staging (#2371)
d17981f #2351 to polkadot-staging (#2359)

git-subtree-dir: bridges
git-subtree-split: e50398d
@serban300
Merge commit '00ad53a57f11f448c727bbd71d710c0f51fca691' into update-b…
ad5130f 
…ridges-subtree-2
@serban300
Reapply diener workspacify
9471bd6
@serban300
Fix Cargo.toml
bc382e1
@serban300
Fix test
efd004a
@serban300
Adjustments
22c962f
@paritytech-ci paritytech-ci requested review from a team September 5, 2023 07:07
@serban300
Copy link
Copy Markdown
Contributor Author

serban300 commented Sep 5, 2023

Updated the PR in order to move the bridges subtree under root. Sorry, I had to force push.

@svyatonik @acatangiu @bkchr PTAL when you have time.

acatangiu
acatangiu approved these changes Sep 5, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@acatangiu acatangiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

One more thing we should do is rename bridges/modules/ -> bridges/pallets/. We could do that in this PR (and also do it in our repo), or postpone renaming to when we migrate full repo here.

@serban300
Copy link
Copy Markdown
Contributor Author

serban300 commented Sep 5, 2023

Looks good!

One more thing we should do is rename bridges/modules/ -> bridges/pallets/. We could do that in this PR (and also do it in our repo), or postpone renaming to when we migrate full repo here.

I would do it in a future PR. We might also need to rename some traits and structs. It might require more attention.

@acatangiu
Copy link
Copy Markdown
Contributor

acatangiu commented Sep 5, 2023

FYI: this is where we're tracking parity-bridges-common migration: paritytech/parity-bridges-common#2538

@serban300
Copy link
Copy Markdown
Contributor Author

serban300 commented Sep 5, 2023

@paritytech/release-engineering , @paritytech/ci can you please take a look on this PR ?

@paritytech-ci paritytech-ci requested a review from a team September 6, 2023 07:50
@ggwpez ggwpez mentioned this pull request Sep 6, 2023
Closed
@acatangiu acatangiu merged commit 142a11a into paritytech:master Sep 11, 2023
Daanvdplas pushed a commit that referenced this pull request Sep 11, 2023
@serban300 @Daanvdplas
Update bridges subtree (#1392)
46b96f5 
* Move the bridges subtree under root

* Squashed 'bridges/' changes from 277f0d5..e50398d

e50398d bridges subtree fixes (#2528)
99af075 Markdown linter (#1309) (#2526)
733ff0f `polkadot-staging` branch: Use polkadot-sdk dependencies (#2524)
e8a59f1 Fix benchmark with new XCM::V3 `MAX_INSTRUCTIONS_TO_DECODE` (#2514)
62b185d Backport `polkadot-sdk` changes to `polkadot-staging` (#2518)
d9658f4 Fix equivocation detection containers startup (#2516) (#2517)
d65db28 Backport: building images from locally built binaries (#2513)
5fdbaf4 Start the equivocation detection loop from the complex relayer (#2507) (#2512)
7fbb67d Backport: Implement basic equivocations detection loop (#2375)
cb7efe2 Manually update deps in polkadot staging (#2371)
d17981f #2351 to polkadot-staging (#2359)

git-subtree-dir: bridges
git-subtree-split: e50398d

* Reapply diener workspacify

* Fix Cargo.toml

* Fix test

* Adjustments
@kiltbot kiltbot mentioned this pull request Oct 19, 2023
Closed
@ahmadkaouk ahmadkaouk mentioned this pull request Nov 16, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bkchr bkchr bkchr approved these changes

@EgorPopelyaev EgorPopelyaev EgorPopelyaev approved these changes

@bkontur bkontur bkontur approved these changes

@ggwpez ggwpez ggwpez approved these changes

@acatangiu acatangiu acatangiu approved these changes

@lexnv lexnv lexnv approved these changes

+2 more reviewers

@svyatonik svyatonik svyatonik approved these changes

@sergejparity sergejparity sergejparity approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@serban300 serban300

Labels

A3-backport Pull request is already reviewed well in another branch. T15-bridges This PR/Issue is related to bridges.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@serban300 @acatangiu @bkchr @svyatonik @EgorPopelyaev @bkontur @ggwpez @lexnv @sergejparity @patriciobcs