Reorganize relay code to make it easy to add new networks. (paritytec…

…h#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 <[email protected]> Co-authored-by: Hernando Castano <[email protected]>
serban300 · Apr 9, 2024 · a644b85 · a644b85
1 parent f6c59dd
commit a644b85
Show file tree

Hide file tree

Showing 66 changed files with 1,548 additions and 1,283 deletions.
diff --git a/bridges/relays/ethereum-client/Cargo.toml → bridges/relays/clients/ethereum/Cargo.toml b/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 }
diff --git a/bridges/relays/ethereum-client/src/client.rs → ...ges/relays/clients/ethereum/src/client.rs b/bridges/relays/ethereum-client/src/client.rs → ...ges/relays/clients/ethereum/src/client.rs
diff --git a/bridges/relays/ethereum-client/src/error.rs → bridges/relays/clients/ethereum/src/error.rs b/bridges/relays/ethereum-client/src/error.rs → bridges/relays/clients/ethereum/src/error.rs
diff --git a/bridges/relays/ethereum-client/src/lib.rs → bridges/relays/clients/ethereum/src/lib.rs b/bridges/relays/ethereum-client/src/lib.rs → bridges/relays/clients/ethereum/src/lib.rs
diff --git a/bridges/relays/ethereum-client/src/rpc.rs → bridges/relays/clients/ethereum/src/rpc.rs b/bridges/relays/ethereum-client/src/rpc.rs → bridges/relays/clients/ethereum/src/rpc.rs
diff --git a/bridges/relays/ethereum-client/src/sign.rs → bridges/relays/clients/ethereum/src/sign.rs b/bridges/relays/ethereum-client/src/sign.rs → bridges/relays/clients/ethereum/src/sign.rs
diff --git a/bridges/relays/ethereum-client/src/types.rs → bridges/relays/clients/ethereum/src/types.rs b/bridges/relays/ethereum-client/src/types.rs → bridges/relays/clients/ethereum/src/types.rs
diff --git a/bridges/relays/kusama-client/Cargo.toml → bridges/relays/clients/kusama/Cargo.toml b/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
 

diff --git a/bridges/relays/kusama-client/src/lib.rs → bridges/relays/clients/kusama/src/lib.rs b/bridges/relays/kusama-client/src/lib.rs → bridges/relays/clients/kusama/src/lib.rs
diff --git a/bridges/relays/millau-client/Cargo.toml → bridges/relays/clients/millau/Cargo.toml b/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
 

diff --git a/bridges/relays/millau-client/src/lib.rs → bridges/relays/clients/millau/src/lib.rs b/bridges/relays/millau-client/src/lib.rs → bridges/relays/clients/millau/src/lib.rs
diff --git a/bridges/relays/polkadot-client/Cargo.toml → bridges/relays/clients/polkadot/Cargo.toml b/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
 

diff --git a/bridges/relays/polkadot-client/src/lib.rs → bridges/relays/clients/polkadot/src/lib.rs b/bridges/relays/polkadot-client/src/lib.rs → bridges/relays/clients/polkadot/src/lib.rs
diff --git a/bridges/relays/rialto-client/Cargo.toml → bridges/relays/clients/rialto/Cargo.toml b/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
 

diff --git a/bridges/relays/rialto-client/src/lib.rs → bridges/relays/clients/rialto/src/lib.rs b/bridges/relays/rialto-client/src/lib.rs → bridges/relays/clients/rialto/src/lib.rs
diff --git a/bridges/relays/substrate-client/Cargo.toml → bridges/relays/clients/substrate/Cargo.toml b/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
 

diff --git a/bridges/relays/substrate-client/src/chain.rs → ...ges/relays/clients/substrate/src/chain.rs b/bridges/relays/substrate-client/src/chain.rs → ...ges/relays/clients/substrate/src/chain.rs
diff --git a/...ges/relays/substrate-client/src/client.rs → ...es/relays/clients/substrate/src/client.rs b/...ges/relays/substrate-client/src/client.rs → ...es/relays/clients/substrate/src/client.rs
diff --git a/bridges/relays/substrate-client/src/error.rs → ...ges/relays/clients/substrate/src/error.rs b/bridges/relays/substrate-client/src/error.rs → ...ges/relays/clients/substrate/src/error.rs
diff --git a/...s/substrate-client/src/finality_source.rs → .../clients/substrate/src/finality_source.rs b/...s/substrate-client/src/finality_source.rs → .../clients/substrate/src/finality_source.rs
diff --git a/bridges/relays/substrate-client/src/guard.rs → ...ges/relays/clients/substrate/src/guard.rs b/bridges/relays/substrate-client/src/guard.rs → ...ges/relays/clients/substrate/src/guard.rs
diff --git a/...ys/substrate-client/src/headers_source.rs → ...s/clients/substrate/src/headers_source.rs b/...ys/substrate-client/src/headers_source.rs → ...s/clients/substrate/src/headers_source.rs
diff --git a/bridges/relays/substrate-client/src/lib.rs → bridges/relays/clients/substrate/src/lib.rs b/bridges/relays/substrate-client/src/lib.rs → bridges/relays/clients/substrate/src/lib.rs
diff --git a/bridges/relays/substrate-client/src/rpc.rs → bridges/relays/clients/substrate/src/rpc.rs b/bridges/relays/substrate-client/src/rpc.rs → bridges/relays/clients/substrate/src/rpc.rs
diff --git a/...elays/substrate-client/src/sync_header.rs → ...lays/clients/substrate/src/sync_header.rs b/...elays/substrate-client/src/sync_header.rs → ...lays/clients/substrate/src/sync_header.rs
diff --git a/bridges/relays/ethereum/Cargo.toml b/bridges/relays/ethereum/Cargo.toml
@@ -29,13 +29,13 @@ time = "0.2"
 
 bp-currency-exchange = { path = "../../primitives/currency-exchange" }
 bp-eth-poa = { path = "../../primitives/ethereum-poa" }
-exchange-relay = { path = "../exchange-relay" }
-headers-relay = { path = "../headers-relay" }
-messages-relay = { path = "../messages-relay" }
-relay-ethereum-client = { path = "../ethereum-client" }
-relay-rialto-client = { path = "../rialto-client" }
-relay-substrate-client = { path = "../substrate-client" }
-relay-utils = { path = "../utils" }
+exchange-relay = { path = "../generic/exchange" }
+headers-relay = { path = "../generic/headers" }
+messages-relay = { path = "../generic/messages" }
+relay-ethereum-client = { path = "../clients/ethereum" }
+relay-rialto-client = { path = "../clients/rialto" }
+relay-substrate-client = { path = "../clients/substrate" }
+relay-utils = { path = "../generic/utils" }
 rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies

diff --git a/bridges/relays/exchange-relay/Cargo.toml → bridges/relays/generic/exchange/Cargo.toml b/bridges/relays/exchange-relay/Cargo.toml → bridges/relays/generic/exchange/Cargo.toml
diff --git a/...ges/relays/exchange-relay/src/exchange.rs → ...s/relays/generic/exchange/src/exchange.rs b/...ges/relays/exchange-relay/src/exchange.rs → ...s/relays/generic/exchange/src/exchange.rs
diff --git a/...elays/exchange-relay/src/exchange_loop.rs → ...ays/generic/exchange/src/exchange_loop.rs b/...elays/exchange-relay/src/exchange_loop.rs → ...ays/generic/exchange/src/exchange_loop.rs
diff --git a/...change-relay/src/exchange_loop_metrics.rs → ...ric/exchange/src/exchange_loop_metrics.rs b/...change-relay/src/exchange_loop_metrics.rs → ...ric/exchange/src/exchange_loop_metrics.rs
diff --git a/bridges/relays/exchange-relay/src/lib.rs → bridges/relays/generic/exchange/src/lib.rs b/bridges/relays/exchange-relay/src/lib.rs → bridges/relays/generic/exchange/src/lib.rs
diff --git a/bridges/relays/finality-relay/Cargo.toml → bridges/relays/generic/finality/Cargo.toml b/bridges/relays/finality-relay/Cargo.toml → bridges/relays/generic/finality/Cargo.toml
@@ -11,7 +11,7 @@ async-std = "1.6.5"
 async-trait = "0.1.40"
 backoff = "0.2"
 futures = "0.3.5"
-headers-relay = { path = "../headers-relay" }
+headers-relay = { path = "../headers" }
 log = "0.4.11"
 num-traits = "0.2"
 relay-utils = { path = "../utils" }

diff --git a/...elays/finality-relay/src/finality_loop.rs → ...ays/generic/finality/src/finality_loop.rs b/...elays/finality-relay/src/finality_loop.rs → ...ays/generic/finality/src/finality_loop.rs
diff --git a/...finality-relay/src/finality_loop_tests.rs → ...neric/finality/src/finality_loop_tests.rs b/...finality-relay/src/finality_loop_tests.rs → ...neric/finality/src/finality_loop_tests.rs
diff --git a/bridges/relays/finality-relay/src/lib.rs → bridges/relays/generic/finality/src/lib.rs b/bridges/relays/finality-relay/src/lib.rs → bridges/relays/generic/finality/src/lib.rs
diff --git a/bridges/relays/headers-relay/Cargo.toml → bridges/relays/generic/headers/Cargo.toml b/bridges/relays/headers-relay/Cargo.toml → bridges/relays/generic/headers/Cargo.toml
diff --git a/bridges/relays/headers-relay/src/headers.rs → ...ges/relays/generic/headers/src/headers.rs b/bridges/relays/headers-relay/src/headers.rs → ...ges/relays/generic/headers/src/headers.rs
diff --git a/bridges/relays/headers-relay/src/lib.rs → bridges/relays/generic/headers/src/lib.rs b/bridges/relays/headers-relay/src/lib.rs → bridges/relays/generic/headers/src/lib.rs
diff --git a/bridges/relays/headers-relay/src/sync.rs → bridges/relays/generic/headers/src/sync.rs b/bridges/relays/headers-relay/src/sync.rs → bridges/relays/generic/headers/src/sync.rs
diff --git a/...ges/relays/headers-relay/src/sync_loop.rs → ...s/relays/generic/headers/src/sync_loop.rs b/...ges/relays/headers-relay/src/sync_loop.rs → ...s/relays/generic/headers/src/sync_loop.rs
diff --git a/...ys/headers-relay/src/sync_loop_metrics.rs → .../generic/headers/src/sync_loop_metrics.rs b/...ys/headers-relay/src/sync_loop_metrics.rs → .../generic/headers/src/sync_loop_metrics.rs
diff --git a/...lays/headers-relay/src/sync_loop_tests.rs → ...ys/generic/headers/src/sync_loop_tests.rs b/...lays/headers-relay/src/sync_loop_tests.rs → ...ys/generic/headers/src/sync_loop_tests.rs
diff --git a/...es/relays/headers-relay/src/sync_types.rs → .../relays/generic/headers/src/sync_types.rs b/...es/relays/headers-relay/src/sync_types.rs → .../relays/generic/headers/src/sync_types.rs
diff --git a/bridges/relays/messages-relay/Cargo.toml → bridges/relays/generic/messages/Cargo.toml b/bridges/relays/messages-relay/Cargo.toml → bridges/relays/generic/messages/Cargo.toml
@@ -15,5 +15,5 @@ parking_lot = "0.11.0"
 
 # Bridge Dependencies
 
-bp-message-lane = { path = "../../primitives/message-lane" }
+bp-message-lane = { path = "../../../primitives/message-lane" }
 relay-utils = { path = "../utils" }
diff --git a/bridges/relays/messages-relay/src/lib.rs → bridges/relays/generic/messages/src/lib.rs b/bridges/relays/messages-relay/src/lib.rs → bridges/relays/generic/messages/src/lib.rs
diff --git a/...relays/messages-relay/src/message_lane.rs → ...lays/generic/messages/src/message_lane.rs b/...relays/messages-relay/src/message_lane.rs → ...lays/generic/messages/src/message_lane.rs
diff --git a/...s/messages-relay/src/message_lane_loop.rs → ...generic/messages/src/message_lane_loop.rs b/...s/messages-relay/src/message_lane_loop.rs → ...generic/messages/src/message_lane_loop.rs
diff --git a/...ssages-relay/src/message_race_delivery.rs → ...ric/messages/src/message_race_delivery.rs b/...ssages-relay/src/message_race_delivery.rs → ...ric/messages/src/message_race_delivery.rs
diff --git a/...s/messages-relay/src/message_race_loop.rs → ...generic/messages/src/message_race_loop.rs b/...s/messages-relay/src/message_race_loop.rs → ...generic/messages/src/message_race_loop.rs
diff --git a/...sages-relay/src/message_race_receiving.rs → ...ic/messages/src/message_race_receiving.rs b/...sages-relay/src/message_race_receiving.rs → ...ic/messages/src/message_race_receiving.rs
diff --git a/...ssages-relay/src/message_race_strategy.rs → ...ric/messages/src/message_race_strategy.rs b/...ssages-relay/src/message_race_strategy.rs → ...ric/messages/src/message_race_strategy.rs
diff --git a/bridges/relays/messages-relay/src/metrics.rs → ...es/relays/generic/messages/src/metrics.rs b/bridges/relays/messages-relay/src/metrics.rs → ...es/relays/generic/messages/src/metrics.rs
diff --git a/bridges/relays/utils/Cargo.toml → bridges/relays/generic/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml → bridges/relays/generic/utils/Cargo.toml
diff --git a/bridges/relays/utils/src/initialize.rs → ...es/relays/generic/utils/src/initialize.rs b/bridges/relays/utils/src/initialize.rs → ...es/relays/generic/utils/src/initialize.rs
diff --git a/bridges/relays/utils/src/lib.rs → bridges/relays/generic/utils/src/lib.rs b/bridges/relays/utils/src/lib.rs → bridges/relays/generic/utils/src/lib.rs
diff --git a/bridges/relays/utils/src/metrics.rs → bridges/relays/generic/utils/src/metrics.rs b/bridges/relays/utils/src/metrics.rs → bridges/relays/generic/utils/src/metrics.rs
diff --git a/bridges/relays/utils/src/relay_loop.rs → ...es/relays/generic/utils/src/relay_loop.rs b/bridges/relays/utils/src/relay_loop.rs → ...es/relays/generic/utils/src/relay_loop.rs
diff --git a/bridges/relays/substrate/Cargo.toml b/bridges/relays/substrate/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
+anyhow = "1.0"
 async-std = "1.9.0"
 async-trait = "0.1.42"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
@@ -26,19 +27,19 @@ bp-polkadot = { path = "../../primitives/chains/polkadot" }
 bp-runtime = { path = "../../primitives/runtime" }
 bp-rialto = { path = "../../primitives/chains/rialto" }
 bridge-runtime-common = { path = "../../bin/runtime-common" }
-finality-relay = { path = "../finality-relay" }
-headers-relay = { path = "../headers-relay" }
-messages-relay = { path = "../messages-relay" }
+finality-relay = { path = "../generic/finality" }
+headers-relay = { path = "../generic/headers" }
+messages-relay = { path = "../generic/messages" }
 millau-runtime = { path = "../../bin/millau/runtime" }
 pallet-bridge-call-dispatch = { path = "../../modules/call-dispatch" }
 pallet-finality-verifier = { path = "../../modules/finality-verifier" }
 pallet-message-lane = { path = "../../modules/message-lane" }
-relay-kusama-client = { path = "../kusama-client" }
-relay-millau-client = { path = "../millau-client" }
-relay-polkadot-client = { path = "../polkadot-client" }
-relay-rialto-client = { path = "../rialto-client" }
-relay-substrate-client = { path = "../substrate-client" }
-relay-utils = { path = "../utils" }
+relay-kusama-client = { path = "../clients/kusama" }
+relay-millau-client = { path = "../clients/millau" }
+relay-polkadot-client = { path = "../clients/polkadot" }
+relay-rialto-client = { path = "../clients/rialto" }
+relay-substrate-client = { path = "../clients/substrate" }
+relay-utils = { path = "../generic/utils" }
 rialto-runtime = { path = "../../bin/rialto/runtime" }
 
 # Substrate Dependencies