Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport from polkadot-sdk] Move chain definitions to separate folder #2892

Merged
merged 2 commits into from
Mar 25, 2024
Merged

[Backport from polkadot-sdk] Move chain definitions to separate folder #2892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aab42d4
[Bridges] Move chain definitions to separate folder (#3822)
serban300 Mar 25, 2024
8d62789
diener workspacify
serban300 Mar 25, 2024
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
26 changes: 13 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,20 @@ license = "GPL-3.0-only"

[workspace]
resolver = "2"

members = [
"bin/runtime-common",
"chains/chain-asset-hub-rococo",
"chains/chain-asset-hub-westend",
"chains/chain-bridge-hub-cumulus",
"chains/chain-bridge-hub-kusama",
"chains/chain-bridge-hub-polkadot",
"chains/chain-bridge-hub-rococo",
"chains/chain-bridge-hub-westend",
"chains/chain-kusama",
"chains/chain-polkadot",
"chains/chain-polkadot-bulletin",
"chains/chain-rococo",
"chains/chain-westend",
"modules/beefy",
"modules/grandpa",
"modules/messages",
Expand All @@ -17,25 +28,14 @@ members = [
"modules/xcm-bridge-hub",
"modules/xcm-bridge-hub-router",
"primitives/beefy",
"primitives/chain-asset-hub-rococo",
"primitives/chain-asset-hub-westend",
"primitives/chain-bridge-hub-cumulus",
"primitives/chain-bridge-hub-kusama",
"primitives/chain-bridge-hub-polkadot",
"primitives/chain-bridge-hub-rococo",
"primitives/chain-bridge-hub-westend",
"primitives/chain-kusama",
"primitives/chain-polkadot",
"primitives/chain-polkadot-bulletin",
"primitives/chain-rococo",
"primitives/chain-westend",
"primitives/header-chain",
"primitives/messages",
"primitives/parachains",
"primitives/polkadot-core",
"primitives/relayers",
"primitives/runtime",
"primitives/test-utils",
"primitives/xcm-bridge-hub",
"primitives/xcm-bridge-hub-router",
"relays/bin-substrate",
"relays/client-bridge-hub-kusama",
Expand Down
2 changes: 1 addition & 1 deletion primitives/chain-asset-hub-rococo/Cargo.toml → chains/chain-asset-hub-rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ scale-info = { version = "2.11.0", default-features = false, features = ["derive
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", 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
0 primitives/chain-asset-hub-rococo/src/lib.rs → chains/chain-asset-hub-rococo/src/lib.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...itives/chain-asset-hub-westend/Cargo.toml → chains/chain-asset-hub-westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ scale-info = { version = "2.11.0", default-features = false, features = ["derive
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", 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
0 ...itives/chain-asset-hub-westend/src/lib.rs → chains/chain-asset-hub-westend/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...tives/chain-bridge-hub-cumulus/Cargo.toml → chains/chain-bridge-hub-cumulus/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 ...tives/chain-bridge-hub-cumulus/src/lib.rs → chains/chain-bridge-hub-cumulus/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...itives/chain-bridge-hub-kusama/Cargo.toml → chains/chain-bridge-hub-kusama/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 ...itives/chain-bridge-hub-kusama/src/lib.rs → chains/chain-bridge-hub-kusama/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...ives/chain-bridge-hub-polkadot/Cargo.toml → chains/chain-bridge-hub-polkadot/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 ...ives/chain-bridge-hub-polkadot/src/lib.rs → chains/chain-bridge-hub-polkadot/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...itives/chain-bridge-hub-rococo/Cargo.toml → chains/chain-bridge-hub-rococo/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 ...itives/chain-bridge-hub-rococo/src/lib.rs → chains/chain-bridge-hub-rococo/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...tives/chain-bridge-hub-westend/Cargo.toml → chains/chain-bridge-hub-westend/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 ...tives/chain-bridge-hub-westend/src/lib.rs → chains/chain-bridge-hub-westend/src/lib.rs
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions primitives/chain-kusama/Cargo.toml → chains/chain-kusama/Cargo.toml
View file
Open in desktop
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
0 primitives/chain-kusama/src/lib.rs → chains/chain-kusama/src/lib.rs
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...itives/chain-polkadot-bulletin/Cargo.toml → chains/chain-polkadot-bulletin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ scale-info = { version = "2.11.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
0 ...itives/chain-polkadot-bulletin/src/lib.rs → chains/chain-polkadot-bulletin/src/lib.rs
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions primitives/chain-polkadot/Cargo.toml → chains/chain-polkadot/Cargo.toml
View file
Open in desktop
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
0 primitives/chain-polkadot/src/lib.rs → chains/chain-polkadot/src/lib.rs
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions primitives/chain-rococo/Cargo.toml → chains/chain-rococo/Cargo.toml
View file
Open in desktop
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
0 primitives/chain-rococo/src/lib.rs → chains/chain-rococo/src/lib.rs
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions primitives/chain-westend/Cargo.toml → chains/chain-westend/Cargo.toml
View file
Open in desktop
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
0 primitives/chain-westend/src/lib.rs → chains/chain-westend/src/lib.rs
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions relays/bin-substrate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ signal-hook-async-std = "0.2.2"
strum = { version = "0.26.2", features = ["derive"] }

# Bridge dependencies
bp-bridge-hub-polkadot = { path = "../../primitives/chain-bridge-hub-polkadot" }
bp-bridge-hub-rococo = { path = "../../primitives/chain-bridge-hub-rococo" }
bp-bridge-hub-polkadot = { path = "../../chains/chain-bridge-hub-polkadot" }
bp-bridge-hub-rococo = { path = "../../chains/chain-bridge-hub-rococo" }
bp-header-chain = { path = "../../primitives/header-chain" }
bp-messages = { path = "../../primitives/messages" }
bp-parachains = { path = "../../primitives/parachains" }
bp-polkadot-bulletin = { path = "../../primitives/chain-polkadot-bulletin" }
bp-polkadot = { path = "../../primitives/chain-polkadot" }
bp-polkadot-bulletin = { path = "../../chains/chain-polkadot-bulletin" }
bp-polkadot = { path = "../../chains/chain-polkadot" }
bp-polkadot-core = { path = "../../primitives/polkadot-core" }
bp-rococo = { path = "../../primitives/chain-rococo" }
bp-rococo = { path = "../../chains/chain-rococo" }
bp-runtime = { path = "../../primitives/runtime" }
bridge-runtime-common = { path = "../../bin/runtime-common" }
pallet-bridge-parachains = { path = "../../modules/parachains" }
Expand Down
4 changes: 2 additions & 2 deletions relays/client-bridge-hub-kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }

# Bridge dependencies

bp-bridge-hub-kusama = { path = "../../primitives/chain-bridge-hub-kusama" }
bp-bridge-hub-kusama = { path = "../../chains/chain-bridge-hub-kusama" }
bp-header-chain = { path = "../../primitives/header-chain" }
bp-messages = { path = "../../primitives/messages" }
bp-parachains = { path = "../../primitives/parachains" }
bp-polkadot = { path = "../../primitives/chain-polkadot" }
bp-polkadot = { path = "../../chains/chain-polkadot" }
bp-polkadot-core = { path = "../../primitives/polkadot-core" }
bridge-runtime-common = { path = "../../bin/runtime-common" }
relay-substrate-client = { path = "../client-substrate" }
Expand Down
6 changes: 3 additions & 3 deletions relays/client-bridge-hub-polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }

# Bridge dependencies

bp-bridge-hub-polkadot = { path = "../../primitives/chain-bridge-hub-polkadot" }
bp-bridge-hub-polkadot = { path = "../../chains/chain-bridge-hub-polkadot" }
bp-header-chain = { path = "../../primitives/header-chain" }
bp-messages = { path = "../../primitives/messages" }
bp-parachains = { path = "../../primitives/parachains" }
bp-polkadot = { path = "../../primitives/chain-polkadot" }
bp-polkadot = { path = "../../chains/chain-polkadot" }
bp-polkadot-core = { path = "../../primitives/polkadot-core" }
bp-kusama = { path = "../../primitives/chain-kusama" }
bp-kusama = { path = "../../chains/chain-kusama" }
bp-runtime = { path = "../../primitives/runtime" }
bridge-runtime-common = { path = "../../bin/runtime-common" }
relay-substrate-client = { path = "../client-substrate" }
Expand Down
2 changes: 1 addition & 1 deletion relays/client-bridge-hub-rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }

# Bridge dependencies

bp-bridge-hub-rococo = { path = "../../primitives/chain-bridge-hub-rococo" }
bp-bridge-hub-rococo = { path = "../../chains/chain-bridge-hub-rococo" }
bp-header-chain = { path = "../../primitives/header-chain" }
bp-messages = { path = "../../primitives/messages" }
bp-parachains = { path = "../../primitives/parachains" }
Expand Down
4 changes: 2 additions & 2 deletions relays/client-bridge-hub-westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }

# Bridge dependencies

bp-bridge-hub-westend = { path = "../../primitives/chain-bridge-hub-westend" }
bp-bridge-hub-westend = { path = "../../chains/chain-bridge-hub-westend" }
bp-header-chain = { path = "../../primitives/header-chain" }
bp-messages = { path = "../../primitives/messages" }
bp-parachains = { path = "../../primitives/parachains" }
bp-polkadot-core = { path = "../../primitives/polkadot-core" }
bp-rococo = { path = "../../primitives/chain-rococo" }
bp-rococo = { path = "../../chains/chain-rococo" }

bridge-runtime-common = { path = "../../bin/runtime-common" }
relay-substrate-client = { path = "../client-substrate" }
Expand Down
2 changes: 1 addition & 1 deletion relays/client-kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }

# Bridge dependencies

bp-kusama = { path = "../../primitives/chain-kusama" }
bp-kusama = { path = "../../chains/chain-kusama" }
bp-polkadot-core = { path = "../../primitives/polkadot-core" }
bp-runtime = { path = "../../primitives/runtime" }

Expand Down
2 changes: 1 addition & 1 deletion relays/client-polkadot-bulletin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }
bp-header-chain = { path = "../../primitives/header-chain" }
bp-messages = { path = "../../primitives/messages" }
bp-polkadot-core = { path = "../../primitives/polkadot-core" }
bp-polkadot-bulletin = { path = "../../primitives/chain-polkadot-bulletin" }
bp-polkadot-bulletin = { path = "../../chains/chain-polkadot-bulletin" }
bp-runtime = { path = "../../primitives/runtime" }
bridge-runtime-common = { path = "../../bin/runtime-common" }
relay-substrate-client = { path = "../client-substrate" }
Expand Down
2 changes: 1 addition & 1 deletion relays/client-polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }

# Bridge dependencies

bp-polkadot = { path = "../../primitives/chain-polkadot" }
bp-polkadot = { path = "../../chains/chain-polkadot" }
bp-polkadot-core = { path = "../../primitives/polkadot-core" }
bp-runtime = { path = "../../primitives/runtime" }

Expand Down
2 changes: 1 addition & 1 deletion relays/client-rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }
# Bridge dependencies

bp-polkadot-core = { path = "../../primitives/polkadot-core" }
bp-rococo = { path = "../../primitives/chain-rococo" }
bp-rococo = { path = "../../chains/chain-rococo" }

relay-substrate-client = { path = "../client-substrate" }
relay-utils = { path = "../utils" }
Expand Down
2 changes: 1 addition & 1 deletion relays/client-westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }

bp-polkadot-core = { path = "../../primitives/polkadot-core" }
bp-runtime = { path = "../../primitives/runtime" }
bp-westend = { path = "../../primitives/chain-westend" }
bp-westend = { path = "../../chains/chain-westend" }

relay-substrate-client = { path = "../client-substrate" }
relay-utils = { path = "../utils" }
Expand Down
2 changes: 1 addition & 1 deletion relays/lib-substrate-relay/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", bra
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }

[dev-dependencies]
bp-rococo = { path = "../../primitives/chain-rococo" }
bp-rococo = { path = "../../chains/chain-rococo" }
pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
relay-bridge-hub-rococo-client = { path = "../client-bridge-hub-rococo" }
relay-bridge-hub-westend-client = { path = "../client-bridge-hub-westend" }
Expand Down