Skip to content

Commit

Permalink
[Bridges] Move chain definitions to separate folder (paritytech#3822)
Browse files Browse the repository at this point in the history
Related to
paritytech/parity-bridges-common#2538

This PR doesn't contain any functional changes. 

The PR moves specific bridged chain definitions from
`bridges/primitives` to `bridges/chains` folder in order to facilitate
the migration of the `parity-bridges-repo` into `polkadot-sdk` as
discussed in https://hackmd.io/LprWjZ0bQXKpFeveYHIRXw?view

Apart from this it also includes some cosmetic changes to some
`Cargo.toml` files as a result of running `diener workspacify`.
  • Loading branch information
serban300 authored Mar 25, 2024
1 parent e88d1cb commit 0711729
Show file tree
Hide file tree
Showing 53 changed files with 94 additions and 94 deletions.
24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ resolver = "2"

members = [
"bridges/bin/runtime-common",
"bridges/chains/chain-asset-hub-rococo",
"bridges/chains/chain-asset-hub-westend",
"bridges/chains/chain-bridge-hub-cumulus",
"bridges/chains/chain-bridge-hub-kusama",
"bridges/chains/chain-bridge-hub-polkadot",
"bridges/chains/chain-bridge-hub-rococo",
"bridges/chains/chain-bridge-hub-westend",
"bridges/chains/chain-kusama",
"bridges/chains/chain-polkadot",
"bridges/chains/chain-polkadot-bulletin",
"bridges/chains/chain-rococo",
"bridges/chains/chain-westend",
"bridges/modules/grandpa",
"bridges/modules/messages",
"bridges/modules/parachains",
"bridges/modules/relayers",
"bridges/modules/xcm-bridge-hub",
"bridges/modules/xcm-bridge-hub-router",
"bridges/primitives/chain-asset-hub-rococo",
"bridges/primitives/chain-asset-hub-westend",
"bridges/primitives/chain-bridge-hub-cumulus",
"bridges/primitives/chain-bridge-hub-kusama",
"bridges/primitives/chain-bridge-hub-polkadot",
"bridges/primitives/chain-bridge-hub-rococo",
"bridges/primitives/chain-bridge-hub-westend",
"bridges/primitives/chain-kusama",
"bridges/primitives/chain-polkadot",
"bridges/primitives/chain-polkadot-bulletin",
"bridges/primitives/chain-rococo",
"bridges/primitives/chain-westend",
"bridges/primitives/header-chain",
"bridges/primitives/messages",
"bridges/primitives/parachains",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
frame-support = { path = "../../../substrate/frame/support", default-features = false }

# Bridge Dependencies
bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
bp-xcm-bridge-hub-router = { path = "../../primitives/xcm-bridge-hub-router", default-features = false }

[features]
default = ["std"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
frame-support = { path = "../../../substrate/frame/support", default-features = false }

# Bridge Dependencies
bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
bp-xcm-bridge-hub-router = { path = "../../primitives/xcm-bridge-hub-router", default-features = false }

[features]
default = ["std"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ workspace = true
[dependencies]
# Bridge Dependencies

bp-polkadot-core = { path = "../polkadot-core", default-features = false }
bp-messages = { path = "../messages", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false }
bp-messages = { path = "../../primitives/messages", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }

# Substrate Based Dependencies

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ workspace = true
# Bridge Dependencies

bp-bridge-hub-cumulus = { path = "../chain-bridge-hub-cumulus", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-messages = { path = "../messages", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }
bp-messages = { path = "../../primitives/messages", default-features = false }

# Substrate Based Dependencies

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ workspace = true
# Bridge Dependencies

bp-bridge-hub-cumulus = { path = "../chain-bridge-hub-cumulus", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-messages = { path = "../messages", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }
bp-messages = { path = "../../primitives/messages", default-features = false }

# Substrate Based Dependencies

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ workspace = true
# Bridge Dependencies

bp-bridge-hub-cumulus = { path = "../chain-bridge-hub-cumulus", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-messages = { path = "../messages", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }
bp-messages = { path = "../../primitives/messages", default-features = false }

# Substrate Based Dependencies

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ workspace = true
# Bridge Dependencies

bp-bridge-hub-cumulus = { path = "../chain-bridge-hub-cumulus", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-messages = { path = "../messages", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }
bp-messages = { path = "../../primitives/messages", default-features = false }

# Substrate Based Dependencies

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ workspace = true

# Bridge Dependencies

bp-header-chain = { path = "../header-chain", default-features = false }
bp-polkadot-core = { path = "../polkadot-core", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }

# Substrate Based Dependencies

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive

# Bridge Dependencies

bp-header-chain = { path = "../header-chain", default-features = false }
bp-messages = { path = "../messages", default-features = false }
bp-polkadot-core = { path = "../polkadot-core", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
bp-messages = { path = "../../primitives/messages", default-features = false }
bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }

# Substrate Based Dependencies

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ workspace = true

# Bridge Dependencies

bp-header-chain = { path = "../header-chain", default-features = false }
bp-polkadot-core = { path = "../polkadot-core", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }

# Substrate Based Dependencies

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ workspace = true

# Bridge Dependencies

bp-header-chain = { path = "../header-chain", default-features = false }
bp-polkadot-core = { path = "../polkadot-core", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }

# Substrate Based Dependencies

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ workspace = true

# Bridge Dependencies

bp-header-chain = { path = "../header-chain", default-features = false }
bp-polkadot-core = { path = "../polkadot-core", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
bp-polkadot-core = { path = "../../primitives/polkadot-core", default-features = false }
bp-runtime = { path = "../../primitives/runtime", default-features = false }

# Substrate Based Dependencies

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions bridges/snowbridge/pallets/ethereum-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sp-io = { path = "../../../../substrate/primitives/io", default-features = false

snowbridge-core = { path = "../../primitives/core", default-features = false }
snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false }
snowbridge-pallet-ethereum-client-fixtures = { path = "./fixtures", default-features = false, optional = true }
snowbridge-pallet-ethereum-client-fixtures = { path = "fixtures", default-features = false, optional = true }
primitives = { package = "snowbridge-beacon-primitives", path = "../../primitives/beacon", default-features = false }
static_assertions = { version = "1.1.0", default-features = false }
bp-runtime = { path = "../../../primitives/runtime", default-features = false }
Expand All @@ -48,7 +48,7 @@ sp-keyring = { path = "../../../../substrate/primitives/keyring" }
serde_json = { workspace = true, default-features = true }
hex-literal = "0.4.1"
pallet-timestamp = { path = "../../../../substrate/frame/timestamp" }
snowbridge-pallet-ethereum-client-fixtures = { path = "./fixtures" }
snowbridge-pallet-ethereum-client-fixtures = { path = "fixtures" }
sp-io = { path = "../../../../substrate/primitives/io" }
serde = { workspace = true, default-features = true }

Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/pallets/inbound-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ snowbridge-core = { path = "../../primitives/core", default-features = false }
snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false }
snowbridge-router-primitives = { path = "../../primitives/router", default-features = false }
snowbridge-beacon-primitives = { path = "../../primitives/beacon", default-features = false }
snowbridge-pallet-inbound-queue-fixtures = { path = "./fixtures", default-features = false, optional = true }
snowbridge-pallet-inbound-queue-fixtures = { path = "fixtures", default-features = false, optional = true }

[dev-dependencies]
frame-benchmarking = { path = "../../../../substrate/frame/benchmarking" }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/client/consensus/aura/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ substrate-prometheus-endpoint = { path = "../../../../substrate/utils/prometheus
cumulus-client-consensus-common = { path = "../common" }
cumulus-relay-chain-interface = { path = "../../relay-chain-interface" }
cumulus-client-consensus-proposer = { path = "../proposer" }
cumulus-client-parachain-inherent = { path = "../../../client/parachain-inherent" }
cumulus-client-parachain-inherent = { path = "../../parachain-inherent" }
cumulus-primitives-aura = { path = "../../../primitives/aura" }
cumulus-primitives-core = { path = "../../../primitives/core" }
cumulus-client-collator = { path = "../../collator" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sp-core = { path = "../../../../../../../../substrate/primitives/core", default-
frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../../parachains/common" }
parachains-common = { path = "../../../../../../common" }
cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
emulated-integration-tests-common = { path = "../../../../common", default-features = false }
asset-hub-rococo-runtime = { path = "../../../../../../runtimes/assets/asset-hub-rococo" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sp-core = { path = "../../../../../../../../substrate/primitives/core", default-
frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../../parachains/common" }
parachains-common = { path = "../../../../../../common" }
cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
emulated-integration-tests-common = { path = "../../../../common", default-features = false }
asset-hub-westend-runtime = { path = "../../../../../../runtimes/assets/asset-hub-westend" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sp-core = { path = "../../../../../../../../substrate/primitives/core", default-
frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../../parachains/common" }
parachains-common = { path = "../../../../../../common" }
emulated-integration-tests-common = { path = "../../../../common", default-features = false }
bridge-hub-rococo-runtime = { path = "../../../../../../runtimes/bridge-hubs/bridge-hub-rococo" }
bridge-hub-common = { path = "../../../../../../runtimes/bridge-hubs/common", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sp-core = { path = "../../../../../../../../substrate/primitives/core", default-
frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../../parachains/common" }
parachains-common = { path = "../../../../../../common" }
emulated-integration-tests-common = { path = "../../../../common", default-features = false }
bridge-hub-westend-runtime = { path = "../../../../../../runtimes/bridge-hubs/bridge-hub-westend" }
bridge-hub-common = { path = "../../../../../../runtimes/bridge-hubs/common", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sp-core = { path = "../../../../../../../../substrate/primitives/core", default-
frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../../parachains/common" }
parachains-common = { path = "../../../../../../common" }
cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
emulated-integration-tests-common = { path = "../../../../common", default-features = false }
collectives-westend-runtime = { path = "../../../../../../runtimes/collectives/collectives-westend" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sp-core = { path = "../../../../../../../../substrate/primitives/core", default-
frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../../parachains/common" }
parachains-common = { path = "../../../../../../common" }
cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
emulated-integration-tests-common = { path = "../../../../common", default-features = false }
people-rococo-runtime = { path = "../../../../../../runtimes/people/people-rococo" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sp-core = { path = "../../../../../../../../substrate/primitives/core", default-
frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../../parachains/common" }
parachains-common = { path = "../../../../../../common" }
cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
emulated-integration-tests-common = { path = "../../../../common", default-features = false }
people-westend-runtime = { path = "../../../../../../runtimes/people/people-westend" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ frame-support = { path = "../../../../../../../../substrate/frame/support", defa
xcm = { package = "staging-xcm", path = "../../../../../../../../polkadot/xcm", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../../parachains/common" }
parachains-common = { path = "../../../../../../common" }
cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
emulated-integration-tests-common = { path = "../../../../common", default-features = false }
penpal-runtime = { path = "../../../../../../runtimes/testing/penpal" }
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ rococo-runtime-constants = { path = "../../../../../../../polkadot/runtime/rococ
rococo-runtime = { path = "../../../../../../../polkadot/runtime/rococo" }

# Cumulus
parachains-common = { path = "../../../../../../parachains/common" }
parachains-common = { path = "../../../../../common" }
emulated-integration-tests-common = { path = "../../../common", default-features = false }
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ westend-runtime-constants = { path = "../../../../../../../polkadot/runtime/west
westend-runtime = { path = "../../../../../../../polkadot/runtime/westend" }

# Cumulus
parachains-common = { path = "../../../../../../parachains/common" }
parachains-common = { path = "../../../../../common" }
emulated-integration-tests-common = { path = "../../../common", default-features = false }
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ rococo-runtime = { path = "../../../../../../../polkadot/runtime/rococo" }

# Cumulus
asset-test-utils = { path = "../../../../../runtimes/assets/test-utils" }
parachains-common = { path = "../../../../../../parachains/common" }
parachains-common = { path = "../../../../../common" }
cumulus-pallet-parachain-system = { path = "../../../../../../pallets/parachain-system", default-features = false }
testnet-parachains-constants = { path = "../../../../../runtimes/constants", features = ["rococo"] }
asset-hub-rococo-runtime = { path = "../../../../../runtimes/assets/asset-hub-rococo" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ pallet-xcm = { path = "../../../../../../../polkadot/xcm/pallet-xcm", default-fe
westend-runtime = { path = "../../../../../../../polkadot/runtime/westend" }

# Cumulus
parachains-common = { path = "../../../../../../parachains/common" }
parachains-common = { path = "../../../../../common" }
testnet-parachains-constants = { path = "../../../../../runtimes/constants", features = ["westend"] }
penpal-runtime = { path = "../../../../../runtimes/testing/penpal" }
asset-hub-westend-runtime = { path = "../../../../../runtimes/assets/asset-hub-westend" }
asset-test-utils = { path = "../../../../../runtimes/assets/test-utils" }
cumulus-pallet-xcmp-queue = { default-features = false, path = "../../../../../../pallets/xcmp-queue" }
cumulus-pallet-parachain-system = { default-features = false, path = "../../../../../../pallets/parachain-system" }
cumulus-pallet-xcmp-queue = { path = "../../../../../../pallets/xcmp-queue", default-features = false }
cumulus-pallet-parachain-system = { path = "../../../../../../pallets/parachain-system", default-features = false }
emulated-integration-tests-common = { path = "../../../common", default-features = false }
westend-system-emulated-network = { path = "../../../networks/westend-system" }
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ pallet-bridge-messages = { path = "../../../../../../../bridges/modules/messages
bp-messages = { path = "../../../../../../../bridges/primitives/messages", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../parachains/common" }
parachains-common = { path = "../../../../../common" }
testnet-parachains-constants = { path = "../../../../../runtimes/constants", features = ["rococo"] }
cumulus-pallet-xcmp-queue = { path = "../../../../../../pallets/xcmp-queue", default-features = false }
bridge-hub-rococo-runtime = { path = "../../../../../../parachains/runtimes/bridge-hubs/bridge-hub-rococo", default-features = false }
bridge-hub-rococo-runtime = { path = "../../../../../runtimes/bridge-hubs/bridge-hub-rococo", default-features = false }
emulated-integration-tests-common = { path = "../../../common", default-features = false }
rococo-westend-system-emulated-network = { path = "../../../networks/rococo-westend-system" }
rococo-system-emulated-network = { path = "../../../networks/rococo-system" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ pallet-bridge-messages = { path = "../../../../../../../bridges/modules/messages
bp-messages = { path = "../../../../../../../bridges/primitives/messages", default-features = false }

# Cumulus
parachains-common = { path = "../../../../../../parachains/common" }
parachains-common = { path = "../../../../../common" }
cumulus-pallet-xcmp-queue = { path = "../../../../../../pallets/xcmp-queue", default-features = false }
bridge-hub-westend-runtime = { path = "../../../../../../parachains/runtimes/bridge-hubs/bridge-hub-westend", default-features = false }
bridge-hub-westend-runtime = { path = "../../../../../runtimes/bridge-hubs/bridge-hub-westend", default-features = false }
emulated-integration-tests-common = { path = "../../../common", default-features = false }
rococo-westend-system-emulated-network = { path = "../../../networks/rococo-westend-system" }
Loading

0 comments on commit 0711729

Please sign in to comment.