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

Rename some crates for publishing to crates.io #12837

Merged
merged 3 commits into from
Dec 6, 2022
Merged

Rename some crates for publishing to crates.io #12837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef87bfb
rename some crates for publishing to crates.io
joao-paulo-parity Dec 4, 2022
4ad5a2e
s/remote-ext/frame-remote-externalities
joao-paulo-parity Dec 5, 2022
2560895
Merge branch 'master' of github.com:paritytech/substrate into rename-…
joao-paulo-parity Dec 5, 2022
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
94 changes: 47 additions & 47 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion client/beefy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ log = "0.4"
parking_lot = "0.12.1"
thiserror = "1.0"
wasm-timer = "0.2.5"
beefy-primitives = { version = "4.0.0-dev", path = "../../primitives/beefy" }
beefy-primitives = { version = "4.0.0-dev", path = "../../primitives/beefy", package = "sp-beefy" }
Copy link
Contributor

@acatangiu acatangiu Dec 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

nit:

Why not go full rename from the get-go?

Suggested change
beefy-primitives = { version = "4.0.0-dev", path = "../../primitives/beefy", package = "sp-beefy" }
sp-beefy = { version = "4.0.0-dev", path = "../../primitives/beefy" }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That would incur touching the .rs files as well, right? I followed @athei 's suggestion from https://forum.parity.io/t/new-names-suggestions-for-squatted-crates/1513/2 of only changing the Cargo.tomls.

I went with this approach because it minimizes the amount of changes I have to do in this PR and the companions. However, I'm open to whatever approach is the most agreed upon. Changing the .rs files wouldn't be difficult, it'd just be more work. Also it might require more reviews from other teams.

Do you strongly prefer the full rename or is it acceptable to leave it like this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Unless there's some hurry with this PR, I would prefer the full rename, otherwise you can kick the can down the road and someone will do it later; not blocking the PR on this :)

Copy link
Member

Choose a reason for hiding this comment

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

I think we are a bit in a hurry with it; since we want to release the crates ASAP.

prometheus = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", path = "../../utils/prometheus" }
sc-chain-spec = { version = "4.0.0-dev", path = "../../client/chain-spec" }
sc-client-api = { version = "4.0.0-dev", path = "../api" }
Expand Down
2 changes: 1 addition & 1 deletion client/beefy/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ parking_lot = "0.12.1"
serde = { version = "1.0.136", features = ["derive"] }
thiserror = "1.0"
beefy-gadget = { version = "4.0.0-dev", path = "../." }
beefy-primitives = { version = "4.0.0-dev", path = "../../../primitives/beefy" }
beefy-primitives = { version = "4.0.0-dev", path = "../../../primitives/beefy", package = "sp-beefy" }
sc-rpc = { version = "4.0.0-dev", path = "../../rpc" }
sc-utils = { version = "4.0.0-dev", path = "../../utils" }
sp-core = { version = "7.0.0", path = "../../../primitives/core" }
Expand Down
2 changes: 1 addition & 1 deletion client/merkle-mountain-range/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ homepage = "https://substrate.io"
codec = { package = "parity-scale-codec", version = "3.0.0" }
futures = "0.3"
log = "0.4"
beefy-primitives = { version = "4.0.0-dev", path = "../../primitives/beefy" }
beefy-primitives = { version = "4.0.0-dev", path = "../../primitives/beefy", package = "sp-beefy" }
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
Expand Down
2 changes: 1 addition & 1 deletion frame/bags-list/remote-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sp-runtime = { path = "../../../primitives/runtime", version = "7.0.0" }
sp-std = { path = "../../../primitives/std", version = "5.0.0" }

# utils
remote-externalities = { path = "../../../utils/frame/remote-externalities", version = "0.10.0-dev" }
remote-externalities = { path = "../../../utils/frame/remote-externalities", version = "0.10.0-dev", package = "frame-remote-externalities" }

# others
log = "0.4.17"
2 changes: 1 addition & 1 deletion frame/beefy-mmr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
serde = { version = "1.0.136", optional = true }
beefy-merkle-tree = { version = "4.0.0-dev", default-features = false, path = "./primitives" }
beefy-primitives = { version = "4.0.0-dev", default-features = false, path = "../../primitives/beefy" }
beefy-primitives = { version = "4.0.0-dev", default-features = false, path = "../../primitives/beefy", package = "sp-beefy" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-beefy = { version = "4.0.0-dev", default-features = false, path = "../beefy" }
Expand Down
2 changes: 1 addition & 1 deletion frame/beefy-mmr/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ homepage = "https://substrate.io"
array-bytes = { version = "4.1", optional = true }
log = { version = "0.4", default-features = false, optional = true }

beefy-primitives = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/beefy" }
beefy-primitives = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/beefy", package = "sp-beefy" }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
sp-runtime = { version = "7.0.0", default-features = false, path = "../../../primitives/runtime" }

Expand Down
2 changes: 1 addition & 1 deletion frame/beefy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ homepage = "https://substrate.io"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
serde = { version = "1.0.136", optional = true }
beefy-primitives = { version = "4.0.0-dev", default-features = false, path = "../../primitives/beefy" }
beefy-primitives = { version = "4.0.0-dev", default-features = false, path = "../../primitives/beefy", package = "sp-beefy" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-session = { version = "4.0.0-dev", default-features = false, path = "../session" }
Expand Down
2 changes: 1 addition & 1 deletion frame/state-trie-migration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ zstd = { version = "0.11.2", default-features = false, optional = true }
frame-benchmarking = { default-features = false, optional = true, path = "../benchmarking" }
frame-support = { default-features = false, path = "../support" }
frame-system = { default-features = false, path = "../system" }
remote-externalities = { optional = true, path = "../../utils/frame/remote-externalities" }
remote-externalities = { optional = true, path = "../../utils/frame/remote-externalities", package = "frame-remote-externalities" }
sp-core = { default-features = false, path = "../../primitives/core" }
sp-io = { default-features = false, path = "../../primitives/io" }
sp-runtime = { default-features = false, path = "../../primitives/runtime" }
Expand Down
2 changes: 1 addition & 1 deletion primitives/beefy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "beefy-primitives"
name = "sp-beefy"
version = "4.0.0-dev"
authors = ["Parity Technologies <[email protected]>"]
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion test-utils/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
beefy-primitives = { version = "4.0.0-dev", default-features = false, path = "../../primitives/beefy" }
beefy-primitives = { version = "4.0.0-dev", default-features = false, path = "../../primitives/beefy", package = "sp-beefy" }
beefy-merkle-tree = { version = "4.0.0-dev", default-features = false, path = "../../frame/beefy-mmr/primitives" }
sp-application-crypto = { version = "7.0.0", default-features = false, path = "../../primitives/application-crypto" }
sp-consensus-aura = { version = "0.10.0-dev", default-features = false, path = "../../primitives/consensus/aura" }
Expand Down
2 changes: 1 addition & 1 deletion utils/frame/remote-externalities/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "remote-externalities"
name = "frame-remote-externalities"
version = "0.10.0-dev"
authors = ["Parity Technologies <[email protected]>"]
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion utils/frame/try-runtime/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ log = "0.4.17"
parity-scale-codec = "3.0.0"
serde = "1.0.136"
zstd = { version = "0.11.2", default-features = false }
remote-externalities = { version = "0.10.0-dev", path = "../../remote-externalities" }
remote-externalities = { version = "0.10.0-dev", path = "../../remote-externalities", package = "frame-remote-externalities" }
sc-chain-spec = { version = "4.0.0-dev", path = "../../../../client/chain-spec" }
sc-cli = { version = "0.10.0-dev", path = "../../../../client/cli" }
sc-executor = { version = "0.10.0-dev", path = "../../../../client/executor" }
Expand Down