Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Move code from sc-network-common back to sc-network #13592

Merged
merged 11 commits into from
Mar 14, 2023
Merged

Move code from sc-network-common back to sc-network #13592

merged 11 commits into from
Mar 14, 2023

Conversation

altonen
Copy link
Contributor

@altonen altonen commented Mar 13, 2023 •
edited
Loading

This is a preparation task for paritytech/polkadot-sdk#515. Most of the code from sc-network-common is moved to sc-network but some syncing-related code is still left there as those cannot be removed until paritytech/polkadot-sdk#556 is done.

No functional changes

polkadot companion: paritytech/polkadot#6869
cumulus companion: paritytech/cumulus#2310

resolves #13569

@altonen altonen added A0-please_review Pull request needs code review. C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit B1-note_worthy Changes should be noted in the release notes labels Mar 13, 2023
@altonen altonen requested a review from a team March 13, 2023 15:31
@altonen altonen mentioned this pull request Mar 13, 2023
Merged
@altonen altonen added the T0-node This PR/Issue is related to the topic “node”. label Mar 13, 2023
dmitry-markin
dmitry-markin approved these changes Mar 13, 2023
View reviewed changes
Copy link
Contributor

@dmitry-markin dmitry-markin left a comment

Choose a reason for hiding this comment

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

LGTM, I like how you put common code in "types" and "traits".

client/network/src/request_responses.rs Outdated Show resolved Hide resolved
@dmitry-markin dmitry-markin requested a review from a team March 13, 2023 16:48
altonen and others added 2 commits March 14, 2023 09:09
@altonen @dmitry-markin
Update client/network/src/request_responses.rs
f32d652 
Co-authored-by: Dmitry Markin <dmitry@markin.tech>
@altonen
Fix cargo doc
2dd8d36
melekes
melekes approved these changes Mar 14, 2023
View reviewed changes
Copy link
Contributor

@melekes melekes left a comment

Choose a reason for hiding this comment

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

👍

@altonen
Copy link
Contributor Author

altonen commented Mar 14, 2023

bot merge

@paritytech-processbot paritytech-processbot bot merged commit 897b95d into master Mar 14, 2023
@paritytech-processbot paritytech-processbot bot deleted the remove-sc-network-common branch March 14, 2023 12:06
paritytech-processbot bot pushed a commit to paritytech/polkadot that referenced this pull request Mar 14, 2023
@altonen
Companion for paritytech/substrate#13592 (#6869)
3e4cb69 
* Move configs

* Start using `NetworkService` traits from `sc-network`

* Fix stuff

* Remove `sc-network-common` as dependency

* update lockfile for {"substrate"}

---------

Co-authored-by: parity-processbot <>
altonen added a commit to paritytech/cumulus that referenced this pull request Mar 14, 2023
@altonen
Companion for paritytech/substrate#13592 (#2310)
14b9db5 
* Fixes

* Remove `sc-network-common` dependency

* update lockfile for {"polkadot", "substrate"}

* Update Cargo.lock

* Update Cargo.lock

---------

Co-authored-by: parity-processbot <>
ordian added a commit to paritytech/polkadot that referenced this pull request Mar 16, 2023
@ordian
Merge branch 'master' into ao-kusama-enable-dispute-slashes
05dc083 
* master: (50 commits)
  Issue 4393: Correcting Unnecessary Use of Arc (#6882)
  Companion for #13287  (#6655)
  timestamp ci job logs (#6890)
  Release parachain host API v4 (#6885)
  polkadot companion: #13128 (Pools commission) (#6264)
  companion for #13555 (#6842)
  Bump libgit2-sys from 0.14.1+1.5.0 to 0.14.2+1.5.1 (#6600)
  Bump bumpalo from 3.8.0 to 3.12.0 (#6599)
  Bump git2 from 0.16.0 to 0.16.1 (#6601)
  Council as SpendOrigin (#6877)
  PVF: Document that preparation cannot lead to disputes (#6873)
  Sync versions with current release (0.9.39) (#6875)
  Companion for paritytech/substrate#13592 (#6869)
  Update orchestra to the recent version (#6854)
  Delete unused Cargo.lock (#6870)
  Remove use of Store trait (#6835)
  Companion for Substrate #13564 (#6845)
  Adding Dispute Participation Metrics (#6838)
  Update `substrate` to 48e7cb1 (#6851)
  Move PVF timeouts to executor environment parameters (#6823)
  ...
ordian added a commit to paritytech/cumulus that referenced this pull request Mar 16, 2023
@ordian
Merge branch 'master' into ao-past-session-slashing-companion
1ba14e8 
* master: (44 commits)
  Companion for #13287 (#2155)
  timestamp ci job logs (#2327)
  Release parachain host API v4 (#2325)
  Bump clap from 4.1.6 to 4.1.8 (#2272)
  Enabled `polkadot-parachain` build for `runtime-benchmarks`, e.g.: (#2324)
  Bump tokio from 1.25.0 to 1.26.0 (#2273)
  Bump async-trait from 0.1.64 to 0.1.66 (#2318)
  ReadMe followup for  #2313 (#2317)
  Fix runtime api import path (#2319)
  Update Westend collectives chainspec (#2311)
  README: Document usage of RPC node (#2313)
  Companion for paritytech/substrate#13592 (#2310)
  Update orchestra and metered-channel (#2304)
  Backport: Brigehub: Add in force upgrade xcm version (into master) (#2289)
  [Backport] version bumps from 9380 (#2309)
  Bump proc-macro2 from 1.0.50 to 1.0.52 (#2312)
  Remove use of trait Store (#2286)
  Companion for #13482 (#2303)
  add amforc bootnodes (#2246)
  Cleanup dependencies + dead code (#2302)
  ...
ordian added a commit to paritytech/polkadot that referenced this pull request Mar 21, 2023
@ordian
Merge branch 'ao-past-session-slashing-runtime' into ao-past-session-…
b3b094c 
…slashing-client

* ao-past-session-slashing-runtime: (23 commits)
  Issue 4393: Correcting Unnecessary Use of Arc (#6882)
  Companion for #13287  (#6655)
  timestamp ci job logs (#6890)
  Release parachain host API v4 (#6885)
  polkadot companion: #13128 (Pools commission) (#6264)
  companion for #13555 (#6842)
  Bump libgit2-sys from 0.14.1+1.5.0 to 0.14.2+1.5.1 (#6600)
  Bump bumpalo from 3.8.0 to 3.12.0 (#6599)
  Bump git2 from 0.16.0 to 0.16.1 (#6601)
  Council as SpendOrigin (#6877)
  PVF: Document that preparation cannot lead to disputes (#6873)
  Sync versions with current release (0.9.39) (#6875)
  Companion for paritytech/substrate#13592 (#6869)
  Update orchestra to the recent version (#6854)
  Delete unused Cargo.lock (#6870)
  Remove use of Store trait (#6835)
  Companion for Substrate #13564 (#6845)
  Adding Dispute Participation Metrics (#6838)
  Update `substrate` to 48e7cb1 (#6851)
  Move PVF timeouts to executor environment parameters (#6823)
  ...
@kiltbot kiltbot mentioned this pull request Apr 3, 2023
Closed
@librelois librelois mentioned this pull request Apr 6, 2023
Closed
ukint-vs pushed a commit to gear-tech/substrate that referenced this pull request Apr 10, 2023
@altonen @dmitry-markin @ukint-vs
Move code from sc-network-common back to sc-network (paritytech#1…
4ab64d6 
…3592)

* Move service tests to `client/network/tests`

These tests depend on `sc-network` and `sc-network-sync` so they should
live outside the crate.

* Move some configs from `sc-network-common` to `sc-network`

* Move `NetworkService` traits to `sc-network`

* Move request-responses to `sc-network`

* Remove more stuff

* Remove rest of configs from `sc-network-common` to `sc-network`

* Remove more stuff

* Fix warnings

* Update client/network/src/request_responses.rs

Co-authored-by: Dmitry Markin <dmitry@markin.tech>

* Fix cargo doc

---------

Co-authored-by: Dmitry Markin <dmitry@markin.tech>
@nbaztec nbaztec mentioned this pull request Apr 25, 2023
Merged
AurevoirXavier added a commit to darwinia-network/darwinia that referenced this pull request May 22, 2023
@AurevoirXavier
Companion of paritytech/substrate#13592
e2e2900
AurevoirXavier added a commit to darwinia-network/darwinia that referenced this pull request May 23, 2023
@AurevoirXavier @jiguantong @boundless-forest
To polkadot-v0.9.40 (#1153)
d87a45b 
* Remove `account`

* Update and companions

* Companion of paritytech/cumulus#2164

* Companion of paritytech/substrate#13159

* Companion of paritytech/cumulus#1909

* Fmt

* Companion of paritytech/polkadot#6744

* Companion of paritytech/cumulus#2245

* Companion of paritytech/substrate#12828

* Companion of paritytech/cumulus#2287

* Companion of paritytech/substrate#13592

* Companion of paritytech/cumulus#2308

* Companion of paritytech/substrate#13410

* Companion of paritytech/substrate#13305

* Companion of polkadot-evm/frontier#1050

* TODO weight

* TODO weight

* Companion of polkadot-evm/frontier#1040

Signed-off-by: Xavier Lau <xavier@inv.cafe>

* Remove unused dep

* Try fix dev node paritytech/substrate#12828

* Fix the frontier part (#1154)

* Fix dev node

* Fmt

* Bump moonbeam

* Bump moonbeam

* Remove unnecessary clone

* Fix tests

---------

Signed-off-by: Xavier Lau <xavier@inv.cafe>
Co-authored-by: Guantong <i@gt.email>
Co-authored-by: bear <boundless.forest@outlook.com>
@ashutoshvarma ashutoshvarma mentioned this pull request May 31, 2023
Merged
6 tasks
@kacperzuk-neti kacperzuk-neti mentioned this pull request Jun 23, 2023
Merged
15 tasks
@salman01zp salman01zp mentioned this pull request Jul 13, 2023
Merged
ggwpez pushed a commit to ggwpez/runtimes that referenced this pull request Jul 13, 2023
@altonen
Companion for paritytech/substrate#13592 (#2310)
ca56151 
* Fixes

* Remove `sc-network-common` dependency

* update lockfile for {"polkadot", "substrate"}

* Update Cargo.lock

* Update Cargo.lock

---------

Co-authored-by: parity-processbot <>
nathanwhit pushed a commit to nathanwhit/substrate that referenced this pull request Jul 19, 2023
@altonen @dmitry-markin @nathanwhit
Move code from sc-network-common back to sc-network (paritytech#1…
370d216 
…3592)

* Move service tests to `client/network/tests`

These tests depend on `sc-network` and `sc-network-sync` so they should
live outside the crate.

* Move some configs from `sc-network-common` to `sc-network`

* Move `NetworkService` traits to `sc-network`

* Move request-responses to `sc-network`

* Remove more stuff

* Remove rest of configs from `sc-network-common` to `sc-network`

* Remove more stuff

* Fix warnings

* Update client/network/src/request_responses.rs

Co-authored-by: Dmitry Markin <dmitry@markin.tech>

* Fix cargo doc

---------

Co-authored-by: Dmitry Markin <dmitry@markin.tech>
@dmitrylavrenov dmitrylavrenov mentioned this pull request Nov 28, 2023
Closed
46 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@melekes melekes melekes approved these changes

@dmitry-markin dmitry-markin dmitry-markin approved these changes

@andresilva andresilva Awaiting requested review from andresilva

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. B1-note_worthy Changes should be noted in the release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit T0-node This PR/Issue is related to the topic “node”.
Projects
Networking
Status: Done ✅
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Move code from sc-network-common to sc-network
3 participants
@altonen @melekes @dmitry-markin