Reorganize relay code to make it easy to add new networks. (#813)

* Nest some crates.

* Alter command execution to make it easier to add new bridges.

* Rename sub-dirs.

* cargo fmt --all

* Address clippy.

* Update relays/substrate/src/rialto_millau/cli.rs

Co-authored-by: Hernando Castano <HCastano@users.noreply.github.com>

Co-authored-by: Hernando Castano <HCastano@users.noreply.github.com>

bridges/relays/ethereum-client/Cargo.toml → bridges/relays/clients/ethereum/Cargo.toml

@@ -6,14 +6,14 @@ edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-bp-eth-poa = { path = "../../primitives/ethereum-poa" }
+bp-eth-poa = { path = "../../../primitives/ethereum-poa" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-headers-relay = { path = "../headers-relay" }
+headers-relay = { path = "../../generic/headers" }
 hex-literal = "0.3"
 jsonrpsee-proc-macros = "0.2.0-alpha"
 jsonrpsee-types = "0.2.0-alpha"
 jsonrpsee-ws-client = "0.2.0-alpha"
 libsecp256k1 = { version = "0.3.4", default-features = false, features = ["hmac"] }
 log = "0.4.11"
-relay-utils = { path = "../utils" }
+relay-utils = { path = "../../generic/utils" }
 web3 = { version = "0.15", git = "https://github.com/tomusdrw/rust-web3", branch ="td-ethabi", default-features = false }

bridges/relays/kusama-client/Cargo.toml → bridges/relays/clients/kusama/Cargo.toml

@@ -7,13 +7,13 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-headers-relay = { path = "../headers-relay" }
-relay-substrate-client = { path = "../substrate-client" }
-relay-utils = { path = "../utils" }
+headers-relay = { path = "../../generic/headers" }
+relay-substrate-client = { path = "../substrate" }
+relay-utils = { path = "../../generic/utils" }
 
 # Bridge dependencies
 
-bp-kusama = { path = "../../primitives/chains/kusama" }
+bp-kusama = { path = "../../../primitives/chains/kusama" }
 
 # Substrate Dependencies
 

bridges/relays/millau-client/Cargo.toml → bridges/relays/clients/millau/Cargo.toml

@@ -7,13 +7,13 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-headers-relay = { path = "../headers-relay" }
-relay-substrate-client = { path = "../substrate-client" }
-relay-utils = { path = "../utils" }
+headers-relay = { path = "../../generic/headers" }
+relay-substrate-client = { path = "../../clients/substrate" }
+relay-utils = { path = "../../generic/utils" }
 
 # Supported Chains
 
-millau-runtime = { path = "../../bin/millau/runtime" }
+millau-runtime = { path = "../../../bin/millau/runtime" }
 
 # Substrate Dependencies
 

bridges/relays/polkadot-client/Cargo.toml → bridges/relays/clients/polkadot/Cargo.toml

@@ -7,13 +7,13 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-headers-relay = { path = "../headers-relay" }
-relay-substrate-client = { path = "../substrate-client" }
-relay-utils = { path = "../utils" }
+headers-relay = { path = "../../generic/headers" }
+relay-substrate-client = { path = "../substrate" }
+relay-utils = { path = "../../generic/utils" }
 
 # Bridge dependencies
 
-bp-polkadot = { path = "../../primitives/chains/polkadot" }
+bp-polkadot = { path = "../../../primitives/chains/polkadot" }
 
 # Substrate Dependencies
 

bridges/relays/rialto-client/Cargo.toml → bridges/relays/clients/rialto/Cargo.toml

@@ -7,13 +7,13 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-headers-relay = { path = "../headers-relay" }
-relay-substrate-client = { path = "../substrate-client" }
-relay-utils = { path = "../utils" }
+headers-relay = { path = "../../generic/headers" }
+relay-substrate-client = { path = "../substrate" }
+relay-utils = { path = "../../generic/utils" }
 
 # Bridge dependencies
 
-rialto-runtime = { path = "../../bin/rialto/runtime" }
+rialto-runtime = { path = "../../../bin/rialto/runtime" }
 
 # Substrate Dependencies
 

bridges/relays/substrate-client/Cargo.toml → bridges/relays/clients/substrate/Cargo.toml

@@ -18,12 +18,12 @@ rand = "0.7"
 
 # Bridge dependencies
 
-bp-header-chain = { path = "../../primitives/header-chain" }
-bp-message-lane = { path = "../../primitives/message-lane" }
-bp-runtime = { path = "../../primitives/runtime" }
-finality-relay = { path = "../finality-relay" }
-headers-relay = { path = "../headers-relay" }
-relay-utils = { path = "../utils" }
+bp-header-chain = { path = "../../../primitives/header-chain" }
+bp-message-lane = { path = "../../../primitives/message-lane" }
+bp-runtime = { path = "../../../primitives/runtime" }
+finality-relay = { path = "../../generic/finality" }
+headers-relay = { path = "../../generic/headers" }
+relay-utils = { path = "../../generic/utils" }
 
 # Substrate Dependencies