Skip to content

Commit

Permalink
Rename squatted crates (#1241)
Browse files Browse the repository at this point in the history
* Rename squatted crates

This commit adds the staging- prefix to squatted crates so we can go forward and publish them to crates.io.

Using the staging- prefix is a temp fix until we decide on replacement names.
https://forum.parity.io/t/renaming-squated-crates-in-substrate-polkadot-cumulus/1964/6

* Fix test after crate renames

* Update Lockfile
  • Loading branch information
Morganamilo authored Aug 30, 2023
1 parent be7f124 commit 31c7947
Show file tree
Hide file tree
Showing 59 changed files with 438 additions and 436 deletions.
604 changes: 302 additions & 302 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cumulus/bridges/bin/runtime-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ sp-std = { path = "../../../../substrate/primitives/std", default-features = fal
sp-trie = { path = "../../../../substrate/primitives/trie", default-features = false }

# Polkadot dependencies
xcm = { path = "../../../../polkadot/xcm", default-features = false }
xcm-builder = { path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false }

[dev-dependencies]
bp-test-utils = { path = "../../primitives/test-utils" }
Expand Down
4 changes: 2 additions & 2 deletions cumulus/bridges/modules/xcm-bridge-hub-router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ sp-std = { path = "../../../../substrate/primitives/std", default-features = fal

# Polkadot Dependencies

xcm = { path = "../../../../polkadot/xcm", default-features = false }
xcm-builder = { path = "../../../../polkadot/xcm/xcm-builder", default-features = false }
xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false }
xcm-builder = { package = "staging-xcm-builder", path = "../../../../polkadot/xcm/xcm-builder", default-features = false }

[dev-dependencies]
sp-io = { path = "../../../../substrate/primitives/io" }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/pallets/dmp-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
sp-std = { path = "../../../substrate/primitives/std", default-features = false}

# Polkadot
xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}

# Cumulus
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/pallets/parachain-system/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sp-version = { path = "../../../substrate/primitives/version", default-features

# Polkadot
polkadot-parachain = { path = "../../../polkadot/parachain", default-features = false, features = [ "wasm-api" ]}
xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}

# Cumulus
cumulus-pallet-parachain-system-proc-macro = { path = "proc-macro", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/pallets/xcm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
frame-support = { path = "../../../substrate/frame/support", default-features = false}
frame-system = { path = "../../../substrate/frame/system", default-features = false}

xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}

cumulus-primitives-core = { path = "../../primitives/core", default-features = false }

Expand Down
6 changes: 3 additions & 3 deletions cumulus/pallets/xcmp-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false}

# Polkadot
polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false}
xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false}

# Cumulus
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
Expand All @@ -35,7 +35,7 @@ sp-core = { path = "../../../substrate/primitives/core" }
pallet-balances = { path = "../../../substrate/frame/balances" }

# Polkadot
xcm-builder = { path = "../../../polkadot/xcm/xcm-builder" }
xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder" }

# Cumulus
cumulus-pallet-parachain-system = { path = "../parachain-system" }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachain-template/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ substrate-prometheus-endpoint = { path = "../../../substrate/utils/prometheus" }
# Polkadot
polkadot-cli = { path = "../../../polkadot/cli", features = ["rococo-native"] }
polkadot-primitives = { path = "../../../polkadot/primitives" }
xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}

# Cumulus
cumulus-client-cli = { path = "../../client/cli" }
Expand Down
6 changes: 3 additions & 3 deletions cumulus/parachain-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ sp-version = { path = "../../../substrate/primitives/version", default-features
pallet-xcm = { path = "../../../polkadot/xcm/pallet-xcm", default-features = false}
polkadot-parachain = { path = "../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../polkadot/runtime/common", default-features = false}
xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false}

# Cumulus
cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false }
Expand Down
6 changes: 3 additions & 3 deletions cumulus/parachains/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false

# Polkadot
polkadot-primitives = { path = "../../../polkadot/primitives", default-features = false}
xcm = { path = "../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
xcm-builder = { package = "staging-xcm-builder", path = "../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../polkadot/xcm/xcm-executor", default-features = false}

# Cumulus
pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# Cumulus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# Cumulus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# Cumulus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# Cumulus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives"
polkadot-parachain = { path = "../../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../../polkadot/runtime/polkadot" }
xcm = { path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# Cumulus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ polkadot-primitives = { path = "../../../../../polkadot/primitives", default-fea
polkadot-runtime-parachains = { path = "../../../../../polkadot/runtime/parachains" }
polkadot-runtime = { path = "../../../../../polkadot/runtime/polkadot" }
polkadot-runtime-constants = { path = "../../../../../polkadot/runtime/polkadot/constants" }
kusama-runtime = { path = "../../../../../polkadot/runtime/kusama" }
kusama-runtime = { package = "staging-kusama-runtime", path = "../../../../../polkadot/runtime/kusama" }
kusama-runtime-constants = { path = "../../../../../polkadot/runtime/kusama/constants" }
rococo-runtime = { path = "../../../../../polkadot/runtime/rococo" }
rococo-runtime-constants = { path = "../../../../../polkadot/runtime/rococo/constants" }
westend-runtime = { path = "../../../../../polkadot/runtime/westend" }
westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants" }
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}

# Cumulus
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/pallets/ping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sp-runtime = { path = "../../../../substrate/primitives/runtime", default-featur
frame-support = { path = "../../../../substrate/frame/support", default-features = false}
frame-system = { path = "../../../../substrate/frame/system", default-features = false}

xcm = { path = "../../../../polkadot/xcm", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false}

cumulus-primitives-core = { path = "../../../primitives/core", default-features = false }
cumulus-pallet-xcm = { path = "../../../pallets/xcm", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchma
polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", d
polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
polkadot-runtime-constants = { path = "../../../../../polkadot/runtime/polkadot/constants", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", d
polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
westend-runtime-constants = { path = "../../../../../polkadot/runtime/westend/constants", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
Expand Down
6 changes: 3 additions & 3 deletions cumulus/parachains/runtimes/assets/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ pallet-asset-tx-payment = { path = "../../../../../substrate/frame/transaction-p

# Polkadot
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}

# Cumulus
parachains-common = { path = "../../../common", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ parachain-info = { path = "../../../pallets/parachain-info", default-features =
parachains-runtimes-test-utils = { path = "../../test-utils", default-features = false }

# Polkadot
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../polkadot/xcm/pallet-xcm", default-features = false}
polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchma
polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ pallet-xcm-benchmarks = { path = "../../../../../polkadot/xcm/pallet-xcm-benchma
polkadot-core-primitives = { path = "../../../../../polkadot/core-primitives", default-features = false}
polkadot-parachain = { path = "../../../../../polkadot/parachain", default-features = false}
polkadot-runtime-common = { path = "../../../../../polkadot/runtime/common", default-features = false}
xcm = { path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}
xcm = { package = "staging-xcm", path = "../../../../../polkadot/xcm", default-features = false}
xcm-builder = { package = "staging-xcm-builder", path = "../../../../../polkadot/xcm/xcm-builder", default-features = false}
xcm-executor = { package = "staging-xcm-executor", path = "../../../../../polkadot/xcm/xcm-executor", default-features = false}

# Cumulus
cumulus-pallet-aura-ext = { path = "../../../../pallets/aura-ext", default-features = false }
Expand Down
Loading

0 comments on commit 31c7947

Please sign in to comment.