Move relay clients to separate folder (paritytech#2893)

serban300 · Mar 25, 2024 · a6bac6b · a6bac6b
1 parent 4bc73d8
commit a6bac6b
Show file tree

Hide file tree

Showing 69 changed files with 94 additions and 94 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,23 +37,23 @@ members = [
 	"primitives/test-utils",
 	"primitives/xcm-bridge-hub",
 	"primitives/xcm-bridge-hub-router",
-	"relays/bin-substrate",
-	"relays/client-bridge-hub-kusama",
-	"relays/client-bridge-hub-polkadot",
-	"relays/client-bridge-hub-rococo",
-	"relays/client-bridge-hub-westend",
-	"relays/client-kusama",
-	"relays/client-polkadot",
-	"relays/client-polkadot-bulletin",
-	"relays/client-rococo",
+	"relay-clients/client-bridge-hub-kusama",
+	"relay-clients/client-bridge-hub-polkadot",
+	"relay-clients/client-bridge-hub-rococo",
+	"relay-clients/client-bridge-hub-westend",
+	"relay-clients/client-kusama",
+	"relay-clients/client-polkadot",
+	"relay-clients/client-polkadot-bulletin",
+	"relay-clients/client-rococo",
+	"relay-clients/client-westend",
 	"relays/client-substrate",
-	"relays/client-westend",
 	"relays/equivocation",
 	"relays/finality",
 	"relays/lib-substrate-relay",
 	"relays/messages",
 	"relays/parachains",
-	"relays/utils"
+	"relays/utils",
+	"substrate-relay",
 ]
 
 # Setup clippy lints as `polkadot-sdk`,

diff --git a/relays/client-bridge-hub-kusama/Cargo.toml → ...ients/client-bridge-hub-kusama/Cargo.toml b/relays/client-bridge-hub-kusama/Cargo.toml → ...ients/client-bridge-hub-kusama/Cargo.toml
@@ -23,7 +23,7 @@ bp-parachains = { path = "../../primitives/parachains" }
 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" }
+relay-substrate-client = { path = "../../relays/client-substrate" }
 
 # Substrate Dependencies
 

diff --git a/...-bridge-hub-kusama/src/codegen_runtime.rs → ...-bridge-hub-kusama/src/codegen_runtime.rs b/...-bridge-hub-kusama/src/codegen_runtime.rs → ...-bridge-hub-kusama/src/codegen_runtime.rs
diff --git a/relays/client-bridge-hub-kusama/src/lib.rs → ...ients/client-bridge-hub-kusama/src/lib.rs b/relays/client-bridge-hub-kusama/src/lib.rs → ...ients/client-bridge-hub-kusama/src/lib.rs
diff --git a/...-bridge-hub-kusama/src/runtime_wrapper.rs → ...-bridge-hub-kusama/src/runtime_wrapper.rs b/...-bridge-hub-kusama/src/runtime_wrapper.rs → ...-bridge-hub-kusama/src/runtime_wrapper.rs
diff --git a/relays/client-bridge-hub-polkadot/Cargo.toml → ...nts/client-bridge-hub-polkadot/Cargo.toml b/relays/client-bridge-hub-polkadot/Cargo.toml → ...nts/client-bridge-hub-polkadot/Cargo.toml
@@ -24,7 +24,7 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-kusama = { path = "../../chains/chain-kusama" }
 bp-runtime = { path = "../../primitives/runtime" }
 bridge-runtime-common = { path = "../../bin/runtime-common" }
-relay-substrate-client = { path = "../client-substrate" }
+relay-substrate-client = { path = "../../relays/client-substrate" }
 
 # Substrate Dependencies
 

diff --git a/...ridge-hub-polkadot/src/codegen_runtime.rs → ...ridge-hub-polkadot/src/codegen_runtime.rs b/...ridge-hub-polkadot/src/codegen_runtime.rs → ...ridge-hub-polkadot/src/codegen_runtime.rs
diff --git a/relays/client-bridge-hub-polkadot/src/lib.rs → ...nts/client-bridge-hub-polkadot/src/lib.rs b/relays/client-bridge-hub-polkadot/src/lib.rs → ...nts/client-bridge-hub-polkadot/src/lib.rs
diff --git a/...ridge-hub-polkadot/src/runtime_wrapper.rs → ...ridge-hub-polkadot/src/runtime_wrapper.rs b/...ridge-hub-polkadot/src/runtime_wrapper.rs → ...ridge-hub-polkadot/src/runtime_wrapper.rs
diff --git a/relays/client-bridge-hub-rococo/Cargo.toml → ...ients/client-bridge-hub-rococo/Cargo.toml b/relays/client-bridge-hub-rococo/Cargo.toml → ...ients/client-bridge-hub-rococo/Cargo.toml
@@ -23,7 +23,7 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-runtime = { path = "../../primitives/runtime" }
 
 bridge-runtime-common = { path = "../../bin/runtime-common" }
-relay-substrate-client = { path = "../client-substrate" }
+relay-substrate-client = { path = "../../relays/client-substrate" }
 
 # Substrate Dependencies
 

diff --git a/...-bridge-hub-rococo/src/codegen_runtime.rs → ...-bridge-hub-rococo/src/codegen_runtime.rs b/...-bridge-hub-rococo/src/codegen_runtime.rs → ...-bridge-hub-rococo/src/codegen_runtime.rs
diff --git a/relays/client-bridge-hub-rococo/src/lib.rs → ...ients/client-bridge-hub-rococo/src/lib.rs b/relays/client-bridge-hub-rococo/src/lib.rs → ...ients/client-bridge-hub-rococo/src/lib.rs
diff --git a/relays/client-bridge-hub-westend/Cargo.toml → ...ents/client-bridge-hub-westend/Cargo.toml b/relays/client-bridge-hub-westend/Cargo.toml → ...ents/client-bridge-hub-westend/Cargo.toml
@@ -23,7 +23,7 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-rococo = { path = "../../chains/chain-rococo" }
 
 bridge-runtime-common = { path = "../../bin/runtime-common" }
-relay-substrate-client = { path = "../client-substrate" }
+relay-substrate-client = { path = "../../relays/client-substrate" }
 
 # Substrate Dependencies
 

diff --git a/...bridge-hub-westend/src/codegen_runtime.rs → ...bridge-hub-westend/src/codegen_runtime.rs b/...bridge-hub-westend/src/codegen_runtime.rs → ...bridge-hub-westend/src/codegen_runtime.rs
diff --git a/relays/client-bridge-hub-westend/src/lib.rs → ...ents/client-bridge-hub-westend/src/lib.rs b/relays/client-bridge-hub-westend/src/lib.rs → ...ents/client-bridge-hub-westend/src/lib.rs
diff --git a/relays/client-kusama/Cargo.toml → relay-clients/client-kusama/Cargo.toml b/relays/client-kusama/Cargo.toml → relay-clients/client-kusama/Cargo.toml
@@ -19,8 +19,8 @@ bp-kusama = { path = "../../chains/chain-kusama" }
 bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-runtime = { path = "../../primitives/runtime" }
 
-relay-substrate-client = { path = "../client-substrate" }
-relay-utils = { path = "../utils" }
+relay-substrate-client = { path = "../../relays/client-substrate" }
+relay-utils = { path = "../../relays/utils" }
 
 # Substrate Dependencies
 

diff --git a/relays/client-kusama/src/codegen_runtime.rs → ...ents/client-kusama/src/codegen_runtime.rs b/relays/client-kusama/src/codegen_runtime.rs → ...ents/client-kusama/src/codegen_runtime.rs
diff --git a/relays/client-kusama/src/lib.rs → relay-clients/client-kusama/src/lib.rs b/relays/client-kusama/src/lib.rs → relay-clients/client-kusama/src/lib.rs
diff --git a/relays/client-polkadot-bulletin/Cargo.toml → ...ients/client-polkadot-bulletin/Cargo.toml b/relays/client-polkadot-bulletin/Cargo.toml → ...ients/client-polkadot-bulletin/Cargo.toml
@@ -21,8 +21,8 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 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" }
-relay-utils = { path = "../utils" }
+relay-substrate-client = { path = "../../relays/client-substrate" }
+relay-utils = { path = "../../relays/utils" }
 
 # Substrate Dependencies
 

diff --git a/...-polkadot-bulletin/src/codegen_runtime.rs → ...-polkadot-bulletin/src/codegen_runtime.rs b/...-polkadot-bulletin/src/codegen_runtime.rs → ...-polkadot-bulletin/src/codegen_runtime.rs
diff --git a/relays/client-polkadot-bulletin/src/lib.rs → ...ients/client-polkadot-bulletin/src/lib.rs b/relays/client-polkadot-bulletin/src/lib.rs → ...ients/client-polkadot-bulletin/src/lib.rs
diff --git a/relays/client-polkadot/Cargo.toml → relay-clients/client-polkadot/Cargo.toml b/relays/client-polkadot/Cargo.toml → relay-clients/client-polkadot/Cargo.toml
@@ -19,8 +19,8 @@ bp-polkadot = { path = "../../chains/chain-polkadot" }
 bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-runtime = { path = "../../primitives/runtime" }
 
-relay-substrate-client = { path = "../client-substrate" }
-relay-utils = { path = "../utils" }
+relay-substrate-client = { path = "../../relays/client-substrate" }
+relay-utils = { path = "../../relays/utils" }
 
 # Substrate Dependencies
 

diff --git a/...ys/client-polkadot/src/codegen_runtime.rs → ...ts/client-polkadot/src/codegen_runtime.rs b/...ys/client-polkadot/src/codegen_runtime.rs → ...ts/client-polkadot/src/codegen_runtime.rs
diff --git a/relays/client-polkadot/src/lib.rs → relay-clients/client-polkadot/src/lib.rs b/relays/client-polkadot/src/lib.rs → relay-clients/client-polkadot/src/lib.rs
diff --git a/relays/client-rococo/Cargo.toml → relay-clients/client-rococo/Cargo.toml b/relays/client-rococo/Cargo.toml → relay-clients/client-rococo/Cargo.toml
@@ -18,8 +18,8 @@ subxt = { version = "0.32.1", default-features = false, features = ["native"] }
 bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-rococo = { path = "../../chains/chain-rococo" }
 
-relay-substrate-client = { path = "../client-substrate" }
-relay-utils = { path = "../utils" }
+relay-substrate-client = { path = "../../relays/client-substrate" }
+relay-utils = { path = "../../relays/utils" }
 
 # Substrate Dependencies
 

diff --git a/relays/client-rococo/src/codegen_runtime.rs → ...ents/client-rococo/src/codegen_runtime.rs b/relays/client-rococo/src/codegen_runtime.rs → ...ents/client-rococo/src/codegen_runtime.rs
diff --git a/relays/client-rococo/src/lib.rs → relay-clients/client-rococo/src/lib.rs b/relays/client-rococo/src/lib.rs → relay-clients/client-rococo/src/lib.rs
diff --git a/relays/client-westend/Cargo.toml → relay-clients/client-westend/Cargo.toml b/relays/client-westend/Cargo.toml → relay-clients/client-westend/Cargo.toml
@@ -19,8 +19,8 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-runtime = { path = "../../primitives/runtime" }
 bp-westend = { path = "../../chains/chain-westend" }
 
-relay-substrate-client = { path = "../client-substrate" }
-relay-utils = { path = "../utils" }
+relay-substrate-client = { path = "../../relays/client-substrate" }
+relay-utils = { path = "../../relays/utils" }
 
 # Substrate Dependencies
 

diff --git a/relays/client-westend/src/codegen_runtime.rs → ...nts/client-westend/src/codegen_runtime.rs b/relays/client-westend/src/codegen_runtime.rs → ...nts/client-westend/src/codegen_runtime.rs
diff --git a/relays/client-westend/src/lib.rs → relay-clients/client-westend/src/lib.rs b/relays/client-westend/src/lib.rs → relay-clients/client-westend/src/lib.rs
diff --git a/relays/bin-substrate/Cargo.toml b/relays/bin-substrate/Cargo.toml
diff --git a/relays/lib-substrate-relay/Cargo.toml b/relays/lib-substrate-relay/Cargo.toml
@@ -58,6 +58,6 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas
 [dev-dependencies]
 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" }
-relay-rococo-client = { path = "../client-rococo" }
+relay-bridge-hub-rococo-client = { path = "../../relay-clients/client-bridge-hub-rococo" }
+relay-bridge-hub-westend-client = { path = "../../relay-clients/client-bridge-hub-westend" }
+relay-rococo-client = { path = "../../relay-clients/client-rococo" }
diff --git a/substrate-relay/Cargo.toml b/substrate-relay/Cargo.toml
@@ -0,0 +1,66 @@
+[package]
+name = "substrate-relay"
+version = "1.2.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow = "1.0"
+async-std = "1.9.0"
+async-trait = "0.1.79"
+codec = { package = "parity-scale-codec", version = "3.1.5" }
+env_logger = "0.11"
+futures = "0.3.30"
+hex = "0.4"
+log = { workspace = true }
+num-format = "0.4"
+num-traits = "0.2"
+rbtag = "0.3"
+structopt = "0.3"
+signal-hook = "0.3.15"
+signal-hook-async-std = "0.2.2"
+strum = { version = "0.26.2", features = ["derive"] }
+
+# Bridge dependencies
+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 = "../chains/chain-polkadot-bulletin" }
+bp-polkadot = { path = "../chains/chain-polkadot" }
+bp-polkadot-core = { path = "../primitives/polkadot-core" }
+bp-rococo = { path = "../chains/chain-rococo" }
+bp-runtime = { path = "../primitives/runtime" }
+bridge-runtime-common = { path = "../bin/runtime-common" }
+pallet-bridge-parachains = { path = "../modules/parachains" }
+parachains-relay = { path = "../relays/parachains" }
+relay-bridge-hub-kusama-client = { path = "../relay-clients/client-bridge-hub-kusama" }
+relay-bridge-hub-polkadot-client = { path = "../relay-clients/client-bridge-hub-polkadot" }
+relay-bridge-hub-rococo-client = { path = "../relay-clients/client-bridge-hub-rococo" }
+relay-bridge-hub-westend-client = { path = "../relay-clients/client-bridge-hub-westend" }
+relay-kusama-client = { path = "../relay-clients/client-kusama" }
+relay-polkadot-client = { path = "../relay-clients/client-polkadot" }
+relay-polkadot-bulletin-client = { path = "../relay-clients/client-polkadot-bulletin" }
+relay-rococo-client = { path = "../relay-clients/client-rococo" }
+relay-substrate-client = { path = "../relays/client-substrate" }
+relay-utils = { path = "../relays/utils" }
+relay-westend-client = { path = "../relay-clients/client-westend" }
+substrate-relay-helper = { path = "../relays/lib-substrate-relay" }
+
+# Substrate Dependencies
+
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
+
+[dev-dependencies]
+bp-test-utils = { path = "../primitives/test-utils" }
+hex-literal = "0.4"
+sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
+tempfile = "3.10"
+finality-grandpa = { version = "0.16.2" }
diff --git a/...kusama_messages_to_bridge_hub_polkadot.rs → ...kusama_messages_to_bridge_hub_polkadot.rs b/...kusama_messages_to_bridge_hub_polkadot.rs → ...kusama_messages_to_bridge_hub_polkadot.rs
diff --git a/...polkadot_messages_to_bridge_hub_kusama.rs → ...polkadot_messages_to_bridge_hub_kusama.rs b/...polkadot_messages_to_bridge_hub_kusama.rs → ...polkadot_messages_to_bridge_hub_kusama.rs
diff --git a/.../kusama_headers_to_bridge_hub_polkadot.rs → .../kusama_headers_to_bridge_hub_polkadot.rs b/.../kusama_headers_to_bridge_hub_polkadot.rs → .../kusama_headers_to_bridge_hub_polkadot.rs
diff --git a/...sama_parachains_to_bridge_hub_polkadot.rs → ...sama_parachains_to_bridge_hub_polkadot.rs b/...sama_parachains_to_bridge_hub_polkadot.rs → ...sama_parachains_to_bridge_hub_polkadot.rs
diff --git a/...strate/src/bridges/kusama_polkadot/mod.rs → ...-relay/src/bridges/kusama_polkadot/mod.rs b/...strate/src/bridges/kusama_polkadot/mod.rs → ...-relay/src/bridges/kusama_polkadot/mod.rs
diff --git a/.../polkadot_headers_to_bridge_hub_kusama.rs → .../polkadot_headers_to_bridge_hub_kusama.rs b/.../polkadot_headers_to_bridge_hub_kusama.rs → .../polkadot_headers_to_bridge_hub_kusama.rs
diff --git a/...lkadot_parachains_to_bridge_hub_kusama.rs → ...lkadot_parachains_to_bridge_hub_kusama.rs b/...lkadot_parachains_to_bridge_hub_kusama.rs → ...lkadot_parachains_to_bridge_hub_kusama.rs
diff --git a/relays/bin-substrate/src/bridges/mod.rs → substrate-relay/src/bridges/mod.rs b/relays/bin-substrate/src/bridges/mod.rs → substrate-relay/src/bridges/mod.rs
diff --git a/...polkadot_messages_to_polkadot_bulletin.rs → ...polkadot_messages_to_polkadot_bulletin.rs b/...polkadot_messages_to_polkadot_bulletin.rs → ...polkadot_messages_to_polkadot_bulletin.rs
diff --git a/...rate/src/bridges/polkadot_bulletin/mod.rs → ...elay/src/bridges/polkadot_bulletin/mod.rs b/...rate/src/bridges/polkadot_bulletin/mod.rs → ...elay/src/bridges/polkadot_bulletin/mod.rs
diff --git a/...ulletin_headers_to_bridge_hub_polkadot.rs → ...ulletin_headers_to_bridge_hub_polkadot.rs b/...ulletin_headers_to_bridge_hub_polkadot.rs → ...ulletin_headers_to_bridge_hub_polkadot.rs
diff --git a/...lletin_messages_to_bridge_hub_polkadot.rs → ...lletin_messages_to_bridge_hub_polkadot.rs b/...lletin_messages_to_bridge_hub_polkadot.rs → ...lletin_messages_to_bridge_hub_polkadot.rs
diff --git a/.../polkadot_headers_to_polkadot_bulletin.rs → .../polkadot_headers_to_polkadot_bulletin.rs b/.../polkadot_headers_to_polkadot_bulletin.rs → .../polkadot_headers_to_polkadot_bulletin.rs
diff --git a/...lkadot_parachains_to_polkadot_bulletin.rs → ...lkadot_parachains_to_polkadot_bulletin.rs b/...lkadot_parachains_to_polkadot_bulletin.rs → ...lkadot_parachains_to_polkadot_bulletin.rs
diff --git a/...hub_rococo_messages_to_rococo_bulletin.rs → ...hub_rococo_messages_to_rococo_bulletin.rs b/...hub_rococo_messages_to_rococo_bulletin.rs → ...hub_rococo_messages_to_rococo_bulletin.rs
diff --git a/...strate/src/bridges/rococo_bulletin/mod.rs → ...-relay/src/bridges/rococo_bulletin/mod.rs b/...strate/src/bridges/rococo_bulletin/mod.rs → ...-relay/src/bridges/rococo_bulletin/mod.rs
diff --git a/..._bulletin_headers_to_bridge_hub_rococo.rs → ..._bulletin_headers_to_bridge_hub_rococo.rs b/..._bulletin_headers_to_bridge_hub_rococo.rs → ..._bulletin_headers_to_bridge_hub_rococo.rs
diff --git a/...bulletin_messages_to_bridge_hub_rococo.rs → ...bulletin_messages_to_bridge_hub_rococo.rs b/...bulletin_messages_to_bridge_hub_rococo.rs → ...bulletin_messages_to_bridge_hub_rococo.rs
diff --git a/...etin/rococo_headers_to_rococo_bulletin.rs → ...etin/rococo_headers_to_rococo_bulletin.rs b/...etin/rococo_headers_to_rococo_bulletin.rs → ...etin/rococo_headers_to_rococo_bulletin.rs
diff --git a/...n/rococo_parachains_to_rococo_bulletin.rs → ...n/rococo_parachains_to_rococo_bulletin.rs b/...n/rococo_parachains_to_rococo_bulletin.rs → ...n/rococo_parachains_to_rococo_bulletin.rs
diff --git a/..._rococo_messages_to_bridge_hub_westend.rs → ..._rococo_messages_to_bridge_hub_westend.rs b/..._rococo_messages_to_bridge_hub_westend.rs → ..._rococo_messages_to_bridge_hub_westend.rs
diff --git a/..._westend_messages_to_bridge_hub_rococo.rs → ..._westend_messages_to_bridge_hub_rococo.rs b/..._westend_messages_to_bridge_hub_rococo.rs → ..._westend_messages_to_bridge_hub_rococo.rs
diff --git a/...bstrate/src/bridges/rococo_westend/mod.rs → ...e-relay/src/bridges/rococo_westend/mod.rs b/...bstrate/src/bridges/rococo_westend/mod.rs → ...e-relay/src/bridges/rococo_westend/mod.rs
diff --git a/...d/rococo_headers_to_bridge_hub_westend.rs → ...d/rococo_headers_to_bridge_hub_westend.rs b/...d/rococo_headers_to_bridge_hub_westend.rs → ...d/rococo_headers_to_bridge_hub_westend.rs
diff --git a/...ococo_parachains_to_bridge_hub_westend.rs → ...ococo_parachains_to_bridge_hub_westend.rs b/...ococo_parachains_to_bridge_hub_westend.rs → ...ococo_parachains_to_bridge_hub_westend.rs
diff --git a/...d/westend_headers_to_bridge_hub_rococo.rs → ...d/westend_headers_to_bridge_hub_rococo.rs b/...d/westend_headers_to_bridge_hub_rococo.rs → ...d/westend_headers_to_bridge_hub_rococo.rs
diff --git a/...estend_parachains_to_bridge_hub_rococo.rs → ...estend_parachains_to_bridge_hub_rococo.rs b/...estend_parachains_to_bridge_hub_rococo.rs → ...estend_parachains_to_bridge_hub_rococo.rs
diff --git a/relays/bin-substrate/src/cli/chain_schema.rs → substrate-relay/src/cli/chain_schema.rs b/relays/bin-substrate/src/cli/chain_schema.rs → substrate-relay/src/cli/chain_schema.rs
diff --git a/...substrate/src/cli/detect_equivocations.rs → ...ate-relay/src/cli/detect_equivocations.rs b/...substrate/src/cli/detect_equivocations.rs → ...ate-relay/src/cli/detect_equivocations.rs
diff --git a/relays/bin-substrate/src/cli/init_bridge.rs → substrate-relay/src/cli/init_bridge.rs b/relays/bin-substrate/src/cli/init_bridge.rs → substrate-relay/src/cli/init_bridge.rs
diff --git a/relays/bin-substrate/src/cli/mod.rs → substrate-relay/src/cli/mod.rs b/relays/bin-substrate/src/cli/mod.rs → substrate-relay/src/cli/mod.rs
diff --git a/...ys/bin-substrate/src/cli/relay_headers.rs → substrate-relay/src/cli/relay_headers.rs b/...ys/bin-substrate/src/cli/relay_headers.rs → substrate-relay/src/cli/relay_headers.rs
diff --git a/...ate/src/cli/relay_headers_and_messages.rs → ...lay/src/cli/relay_headers_and_messages.rs b/...ate/src/cli/relay_headers_and_messages.rs → ...lay/src/cli/relay_headers_and_messages.rs
diff --git a/...s/bin-substrate/src/cli/relay_messages.rs → substrate-relay/src/cli/relay_messages.rs b/...s/bin-substrate/src/cli/relay_messages.rs → substrate-relay/src/cli/relay_messages.rs
diff --git a/...bin-substrate/src/cli/relay_parachains.rs → substrate-relay/src/cli/relay_parachains.rs b/...bin-substrate/src/cli/relay_parachains.rs → substrate-relay/src/cli/relay_parachains.rs
diff --git a/relays/bin-substrate/src/main.rs → substrate-relay/src/main.rs b/relays/bin-substrate/src/main.rs → substrate-relay/src/main.rs