[Backport from polkadot-sdk] Move chain definitions to separate fol…

…der (paritytech#2892) * [Bridges] Move chain definitions to separate folder (paritytech#3822) 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`. (cherry picked from commit 0711729) * diener workspacify
serban300 · Mar 25, 2024 · 4bc73d8 · 4bc73d8
1 parent 8e58eb9
commit 4bc73d8
Show file tree

Hide file tree

Showing 36 changed files with 50 additions and 50 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -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",
@@ -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",

diff --git a/primitives/chain-asset-hub-rococo/Cargo.toml → chains/chain-asset-hub-rococo/Cargo.toml b/primitives/chain-asset-hub-rococo/Cargo.toml → chains/chain-asset-hub-rococo/Cargo.toml
@@ -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"]

diff --git a/primitives/chain-asset-hub-rococo/src/lib.rs → chains/chain-asset-hub-rococo/src/lib.rs b/primitives/chain-asset-hub-rococo/src/lib.rs → chains/chain-asset-hub-rococo/src/lib.rs
diff --git a/...itives/chain-asset-hub-westend/Cargo.toml → chains/chain-asset-hub-westend/Cargo.toml b/...itives/chain-asset-hub-westend/Cargo.toml → chains/chain-asset-hub-westend/Cargo.toml
@@ -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"]

diff --git a/...itives/chain-asset-hub-westend/src/lib.rs → chains/chain-asset-hub-westend/src/lib.rs b/...itives/chain-asset-hub-westend/src/lib.rs → chains/chain-asset-hub-westend/src/lib.rs
diff --git a/...tives/chain-bridge-hub-cumulus/Cargo.toml → chains/chain-bridge-hub-cumulus/Cargo.toml b/...tives/chain-bridge-hub-cumulus/Cargo.toml → chains/chain-bridge-hub-cumulus/Cargo.toml
diff --git a/...tives/chain-bridge-hub-cumulus/src/lib.rs → chains/chain-bridge-hub-cumulus/src/lib.rs b/...tives/chain-bridge-hub-cumulus/src/lib.rs → chains/chain-bridge-hub-cumulus/src/lib.rs
diff --git a/...itives/chain-bridge-hub-kusama/Cargo.toml → chains/chain-bridge-hub-kusama/Cargo.toml b/...itives/chain-bridge-hub-kusama/Cargo.toml → chains/chain-bridge-hub-kusama/Cargo.toml
diff --git a/...itives/chain-bridge-hub-kusama/src/lib.rs → chains/chain-bridge-hub-kusama/src/lib.rs b/...itives/chain-bridge-hub-kusama/src/lib.rs → chains/chain-bridge-hub-kusama/src/lib.rs
diff --git a/...ives/chain-bridge-hub-polkadot/Cargo.toml → chains/chain-bridge-hub-polkadot/Cargo.toml b/...ives/chain-bridge-hub-polkadot/Cargo.toml → chains/chain-bridge-hub-polkadot/Cargo.toml
diff --git a/...ives/chain-bridge-hub-polkadot/src/lib.rs → chains/chain-bridge-hub-polkadot/src/lib.rs b/...ives/chain-bridge-hub-polkadot/src/lib.rs → chains/chain-bridge-hub-polkadot/src/lib.rs
diff --git a/...itives/chain-bridge-hub-rococo/Cargo.toml → chains/chain-bridge-hub-rococo/Cargo.toml b/...itives/chain-bridge-hub-rococo/Cargo.toml → chains/chain-bridge-hub-rococo/Cargo.toml
diff --git a/...itives/chain-bridge-hub-rococo/src/lib.rs → chains/chain-bridge-hub-rococo/src/lib.rs b/...itives/chain-bridge-hub-rococo/src/lib.rs → chains/chain-bridge-hub-rococo/src/lib.rs
diff --git a/...tives/chain-bridge-hub-westend/Cargo.toml → chains/chain-bridge-hub-westend/Cargo.toml b/...tives/chain-bridge-hub-westend/Cargo.toml → chains/chain-bridge-hub-westend/Cargo.toml
diff --git a/...tives/chain-bridge-hub-westend/src/lib.rs → chains/chain-bridge-hub-westend/src/lib.rs b/...tives/chain-bridge-hub-westend/src/lib.rs → chains/chain-bridge-hub-westend/src/lib.rs
diff --git a/primitives/chain-kusama/Cargo.toml → chains/chain-kusama/Cargo.toml b/primitives/chain-kusama/Cargo.toml → chains/chain-kusama/Cargo.toml
@@ -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
 

diff --git a/primitives/chain-kusama/src/lib.rs → chains/chain-kusama/src/lib.rs b/primitives/chain-kusama/src/lib.rs → chains/chain-kusama/src/lib.rs
diff --git a/...itives/chain-polkadot-bulletin/Cargo.toml → chains/chain-polkadot-bulletin/Cargo.toml b/...itives/chain-polkadot-bulletin/Cargo.toml → chains/chain-polkadot-bulletin/Cargo.toml
@@ -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
 

diff --git a/...itives/chain-polkadot-bulletin/src/lib.rs → chains/chain-polkadot-bulletin/src/lib.rs b/...itives/chain-polkadot-bulletin/src/lib.rs → chains/chain-polkadot-bulletin/src/lib.rs
diff --git a/primitives/chain-polkadot/Cargo.toml → chains/chain-polkadot/Cargo.toml b/primitives/chain-polkadot/Cargo.toml → chains/chain-polkadot/Cargo.toml
@@ -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
 

diff --git a/primitives/chain-polkadot/src/lib.rs → chains/chain-polkadot/src/lib.rs b/primitives/chain-polkadot/src/lib.rs → chains/chain-polkadot/src/lib.rs
diff --git a/primitives/chain-rococo/Cargo.toml → chains/chain-rococo/Cargo.toml b/primitives/chain-rococo/Cargo.toml → chains/chain-rococo/Cargo.toml
@@ -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
 

diff --git a/primitives/chain-rococo/src/lib.rs → chains/chain-rococo/src/lib.rs b/primitives/chain-rococo/src/lib.rs → chains/chain-rococo/src/lib.rs
diff --git a/primitives/chain-westend/Cargo.toml → chains/chain-westend/Cargo.toml b/primitives/chain-westend/Cargo.toml → chains/chain-westend/Cargo.toml
@@ -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
 

diff --git a/primitives/chain-westend/src/lib.rs → chains/chain-westend/src/lib.rs b/primitives/chain-westend/src/lib.rs → chains/chain-westend/src/lib.rs
diff --git a/relays/bin-substrate/Cargo.toml b/relays/bin-substrate/Cargo.toml
@@ -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" }

diff --git a/relays/client-bridge-hub-kusama/Cargo.toml b/relays/client-bridge-hub-kusama/Cargo.toml
@@ -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" }

diff --git a/relays/client-bridge-hub-polkadot/Cargo.toml b/relays/client-bridge-hub-polkadot/Cargo.toml
@@ -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" }

diff --git a/relays/client-bridge-hub-rococo/Cargo.toml b/relays/client-bridge-hub-rococo/Cargo.toml
@@ -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" }

diff --git a/relays/client-bridge-hub-westend/Cargo.toml b/relays/client-bridge-hub-westend/Cargo.toml
@@ -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" }

diff --git a/relays/client-kusama/Cargo.toml b/relays/client-kusama/Cargo.toml
@@ -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" }
 

diff --git a/relays/client-polkadot-bulletin/Cargo.toml b/relays/client-polkadot-bulletin/Cargo.toml
@@ -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" }

diff --git a/relays/client-polkadot/Cargo.toml b/relays/client-polkadot/Cargo.toml
@@ -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" }
 

diff --git a/relays/client-rococo/Cargo.toml b/relays/client-rococo/Cargo.toml
@@ -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" }

diff --git a/relays/client-westend/Cargo.toml b/relays/client-westend/Cargo.toml
@@ -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" }

diff --git a/relays/lib-substrate-relay/Cargo.toml b/relays/lib-substrate-relay/Cargo.toml
@@ -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" }