From aab42d4d9cb2c461f4645bd7edd1e04b5b28f450 Mon Sep 17 00:00:00 2001 From: Serban Iorga Date: Mon, 25 Mar 2024 13:11:30 +0100 Subject: [PATCH 1/2] [Bridges] Move chain definitions to separate folder (#3822) Related to https://github.com/paritytech/parity-bridges-common/issues/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 0711729d251efebf3486db602119ecfa67d98366) --- {primitives => chains}/chain-asset-hub-rococo/Cargo.toml | 2 +- {primitives => chains}/chain-asset-hub-rococo/src/lib.rs | 0 {primitives => chains}/chain-asset-hub-westend/Cargo.toml | 2 +- {primitives => chains}/chain-asset-hub-westend/src/lib.rs | 0 .../chain-bridge-hub-cumulus/Cargo.toml | 0 .../chain-bridge-hub-cumulus/src/lib.rs | 0 {primitives => chains}/chain-bridge-hub-kusama/Cargo.toml | 0 {primitives => chains}/chain-bridge-hub-kusama/src/lib.rs | 0 .../chain-bridge-hub-polkadot/Cargo.toml | 0 .../chain-bridge-hub-polkadot/src/lib.rs | 0 {primitives => chains}/chain-bridge-hub-rococo/Cargo.toml | 0 {primitives => chains}/chain-bridge-hub-rococo/src/lib.rs | 0 .../chain-bridge-hub-westend/Cargo.toml | 0 .../chain-bridge-hub-westend/src/lib.rs | 0 {primitives => chains}/chain-kusama/Cargo.toml | 6 +++--- {primitives => chains}/chain-kusama/src/lib.rs | 0 {primitives => chains}/chain-polkadot-bulletin/Cargo.toml | 8 ++++---- {primitives => chains}/chain-polkadot-bulletin/src/lib.rs | 0 {primitives => chains}/chain-polkadot/Cargo.toml | 6 +++--- {primitives => chains}/chain-polkadot/src/lib.rs | 0 {primitives => chains}/chain-rococo/Cargo.toml | 6 +++--- {primitives => chains}/chain-rococo/src/lib.rs | 0 {primitives => chains}/chain-westend/Cargo.toml | 6 +++--- {primitives => chains}/chain-westend/src/lib.rs | 0 24 files changed, 18 insertions(+), 18 deletions(-) rename {primitives => chains}/chain-asset-hub-rococo/Cargo.toml (87%) rename {primitives => chains}/chain-asset-hub-rococo/src/lib.rs (100%) rename {primitives => chains}/chain-asset-hub-westend/Cargo.toml (87%) rename {primitives => chains}/chain-asset-hub-westend/src/lib.rs (100%) rename {primitives => chains}/chain-bridge-hub-cumulus/Cargo.toml (100%) rename {primitives => chains}/chain-bridge-hub-cumulus/src/lib.rs (100%) rename {primitives => chains}/chain-bridge-hub-kusama/Cargo.toml (100%) rename {primitives => chains}/chain-bridge-hub-kusama/src/lib.rs (100%) rename {primitives => chains}/chain-bridge-hub-polkadot/Cargo.toml (100%) rename {primitives => chains}/chain-bridge-hub-polkadot/src/lib.rs (100%) rename {primitives => chains}/chain-bridge-hub-rococo/Cargo.toml (100%) rename {primitives => chains}/chain-bridge-hub-rococo/src/lib.rs (100%) rename {primitives => chains}/chain-bridge-hub-westend/Cargo.toml (100%) rename {primitives => chains}/chain-bridge-hub-westend/src/lib.rs (100%) rename {primitives => chains}/chain-kusama/Cargo.toml (75%) rename {primitives => chains}/chain-kusama/src/lib.rs (100%) rename {primitives => chains}/chain-polkadot-bulletin/Cargo.toml (80%) rename {primitives => chains}/chain-polkadot-bulletin/src/lib.rs (100%) rename {primitives => chains}/chain-polkadot/Cargo.toml (75%) rename {primitives => chains}/chain-polkadot/src/lib.rs (100%) rename {primitives => chains}/chain-rococo/Cargo.toml (75%) rename {primitives => chains}/chain-rococo/src/lib.rs (100%) rename {primitives => chains}/chain-westend/Cargo.toml (75%) rename {primitives => chains}/chain-westend/src/lib.rs (100%) diff --git a/primitives/chain-asset-hub-rococo/Cargo.toml b/chains/chain-asset-hub-rococo/Cargo.toml similarity index 87% rename from primitives/chain-asset-hub-rococo/Cargo.toml rename to chains/chain-asset-hub-rococo/Cargo.toml index 08be719bfd9..336e2b4d402 100644 --- a/primitives/chain-asset-hub-rococo/Cargo.toml +++ b/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 b/chains/chain-asset-hub-rococo/src/lib.rs similarity index 100% rename from primitives/chain-asset-hub-rococo/src/lib.rs rename to chains/chain-asset-hub-rococo/src/lib.rs diff --git a/primitives/chain-asset-hub-westend/Cargo.toml b/chains/chain-asset-hub-westend/Cargo.toml similarity index 87% rename from primitives/chain-asset-hub-westend/Cargo.toml rename to chains/chain-asset-hub-westend/Cargo.toml index d8245c7a895..99b6c26e263 100644 --- a/primitives/chain-asset-hub-westend/Cargo.toml +++ b/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/primitives/chain-asset-hub-westend/src/lib.rs b/chains/chain-asset-hub-westend/src/lib.rs similarity index 100% rename from primitives/chain-asset-hub-westend/src/lib.rs rename to chains/chain-asset-hub-westend/src/lib.rs diff --git a/primitives/chain-bridge-hub-cumulus/Cargo.toml b/chains/chain-bridge-hub-cumulus/Cargo.toml similarity index 100% rename from primitives/chain-bridge-hub-cumulus/Cargo.toml rename to chains/chain-bridge-hub-cumulus/Cargo.toml diff --git a/primitives/chain-bridge-hub-cumulus/src/lib.rs b/chains/chain-bridge-hub-cumulus/src/lib.rs similarity index 100% rename from primitives/chain-bridge-hub-cumulus/src/lib.rs rename to chains/chain-bridge-hub-cumulus/src/lib.rs diff --git a/primitives/chain-bridge-hub-kusama/Cargo.toml b/chains/chain-bridge-hub-kusama/Cargo.toml similarity index 100% rename from primitives/chain-bridge-hub-kusama/Cargo.toml rename to chains/chain-bridge-hub-kusama/Cargo.toml diff --git a/primitives/chain-bridge-hub-kusama/src/lib.rs b/chains/chain-bridge-hub-kusama/src/lib.rs similarity index 100% rename from primitives/chain-bridge-hub-kusama/src/lib.rs rename to chains/chain-bridge-hub-kusama/src/lib.rs diff --git a/primitives/chain-bridge-hub-polkadot/Cargo.toml b/chains/chain-bridge-hub-polkadot/Cargo.toml similarity index 100% rename from primitives/chain-bridge-hub-polkadot/Cargo.toml rename to chains/chain-bridge-hub-polkadot/Cargo.toml diff --git a/primitives/chain-bridge-hub-polkadot/src/lib.rs b/chains/chain-bridge-hub-polkadot/src/lib.rs similarity index 100% rename from primitives/chain-bridge-hub-polkadot/src/lib.rs rename to chains/chain-bridge-hub-polkadot/src/lib.rs diff --git a/primitives/chain-bridge-hub-rococo/Cargo.toml b/chains/chain-bridge-hub-rococo/Cargo.toml similarity index 100% rename from primitives/chain-bridge-hub-rococo/Cargo.toml rename to chains/chain-bridge-hub-rococo/Cargo.toml diff --git a/primitives/chain-bridge-hub-rococo/src/lib.rs b/chains/chain-bridge-hub-rococo/src/lib.rs similarity index 100% rename from primitives/chain-bridge-hub-rococo/src/lib.rs rename to chains/chain-bridge-hub-rococo/src/lib.rs diff --git a/primitives/chain-bridge-hub-westend/Cargo.toml b/chains/chain-bridge-hub-westend/Cargo.toml similarity index 100% rename from primitives/chain-bridge-hub-westend/Cargo.toml rename to chains/chain-bridge-hub-westend/Cargo.toml diff --git a/primitives/chain-bridge-hub-westend/src/lib.rs b/chains/chain-bridge-hub-westend/src/lib.rs similarity index 100% rename from primitives/chain-bridge-hub-westend/src/lib.rs rename to chains/chain-bridge-hub-westend/src/lib.rs diff --git a/primitives/chain-kusama/Cargo.toml b/chains/chain-kusama/Cargo.toml similarity index 75% rename from primitives/chain-kusama/Cargo.toml rename to chains/chain-kusama/Cargo.toml index 465acf121d4..56a4386afb8 100644 --- a/primitives/chain-kusama/Cargo.toml +++ b/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 b/chains/chain-kusama/src/lib.rs similarity index 100% rename from primitives/chain-kusama/src/lib.rs rename to chains/chain-kusama/src/lib.rs diff --git a/primitives/chain-polkadot-bulletin/Cargo.toml b/chains/chain-polkadot-bulletin/Cargo.toml similarity index 80% rename from primitives/chain-polkadot-bulletin/Cargo.toml rename to chains/chain-polkadot-bulletin/Cargo.toml index 797a893b21c..1e2bbaf6b8a 100644 --- a/primitives/chain-polkadot-bulletin/Cargo.toml +++ b/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/primitives/chain-polkadot-bulletin/src/lib.rs b/chains/chain-polkadot-bulletin/src/lib.rs similarity index 100% rename from primitives/chain-polkadot-bulletin/src/lib.rs rename to chains/chain-polkadot-bulletin/src/lib.rs diff --git a/primitives/chain-polkadot/Cargo.toml b/chains/chain-polkadot/Cargo.toml similarity index 75% rename from primitives/chain-polkadot/Cargo.toml rename to chains/chain-polkadot/Cargo.toml index 20080a7901b..5faee3bd34a 100644 --- a/primitives/chain-polkadot/Cargo.toml +++ b/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 b/chains/chain-polkadot/src/lib.rs similarity index 100% rename from primitives/chain-polkadot/src/lib.rs rename to chains/chain-polkadot/src/lib.rs diff --git a/primitives/chain-rococo/Cargo.toml b/chains/chain-rococo/Cargo.toml similarity index 75% rename from primitives/chain-rococo/Cargo.toml rename to chains/chain-rococo/Cargo.toml index 459ee6f9f05..401611bebbe 100644 --- a/primitives/chain-rococo/Cargo.toml +++ b/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 b/chains/chain-rococo/src/lib.rs similarity index 100% rename from primitives/chain-rococo/src/lib.rs rename to chains/chain-rococo/src/lib.rs diff --git a/primitives/chain-westend/Cargo.toml b/chains/chain-westend/Cargo.toml similarity index 75% rename from primitives/chain-westend/Cargo.toml rename to chains/chain-westend/Cargo.toml index 4710da7bb33..d697e2b36c4 100644 --- a/primitives/chain-westend/Cargo.toml +++ b/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 b/chains/chain-westend/src/lib.rs similarity index 100% rename from primitives/chain-westend/src/lib.rs rename to chains/chain-westend/src/lib.rs From 8d62789674b3a5f3cd32372648d90299775590b1 Mon Sep 17 00:00:00 2001 From: Serban Iorga Date: Mon, 25 Mar 2024 13:46:55 +0100 Subject: [PATCH 2/2] diener workspacify --- Cargo.toml | 26 ++++++++++---------- relays/bin-substrate/Cargo.toml | 10 ++++---- relays/client-bridge-hub-kusama/Cargo.toml | 4 +-- relays/client-bridge-hub-polkadot/Cargo.toml | 6 ++--- relays/client-bridge-hub-rococo/Cargo.toml | 2 +- relays/client-bridge-hub-westend/Cargo.toml | 4 +-- relays/client-kusama/Cargo.toml | 2 +- relays/client-polkadot-bulletin/Cargo.toml | 2 +- relays/client-polkadot/Cargo.toml | 2 +- relays/client-rococo/Cargo.toml | 2 +- relays/client-westend/Cargo.toml | 2 +- relays/lib-substrate-relay/Cargo.toml | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b7119995932..a6edce3eabf 100644 --- 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,18 +28,6 @@ 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", @@ -36,6 +35,7 @@ members = [ "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/relays/bin-substrate/Cargo.toml b/relays/bin-substrate/Cargo.toml index 032fc8ce741..6c0ac1da6fc 100644 --- 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 index 6e41bb3fcee..a02dc26a0a8 100644 --- 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 index f5fc69d02be..abfd5bae4f0 100644 --- 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 index efccfa5fb60..70d65ac1945 100644 --- 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 index 188839e2dba..c65c7ec0014 100644 --- 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 index 6d3a71b3855..c459f347af1 100644 --- 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 index 2160a35fb8f..842b53c48ef 100644 --- 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 index daa3423bbd4..19cf9f9335b 100644 --- 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 index 7a6b7d3bae2..5e847600f46 100644 --- 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 index 2c9aacc16e6..8b56e51d084 100644 --- 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 index db4f37417be..db4c3a7f887 100644 --- 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" }