Skip to content

Commit a2dcb1b

Browse files
serban300bkchr
serban300
authored and
bkchr
committed
Move bridge definitions
Move bridge definitions to their specific folder. Signed-off-by: Serban Iorga <serban@parity.io>
1 parent e1fd877 commit a2dcb1b

14 files changed

+167
-131
lines changed

‎bridges/relays/bin-substrate/src/chains/millau_headers_to_rialto.rs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
//! Millau-to-Rialto headers sync entrypoint.
1818
19+
use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, RelayToRelayHeadersCliBridge};
1920
use substrate_relay_helper::finality::{
2021
engine::Grandpa as GrandpaFinalityEngine, DirectSubmitGrandpaFinalityProofCallBuilder,
2122
SubstrateFinalitySyncPipeline,
@@ -37,3 +38,21 @@ impl SubstrateFinalitySyncPipeline for MillauFinalityToRialto {
3738
>;
3839
type TransactionSignScheme = relay_rialto_client::Rialto;
3940
}
41+
42+
//// `Millau` to `Rialto` bridge definition.
43+
pub struct MillauToRialtoCliBridge {}
44+
45+
impl CliBridgeBase for MillauToRialtoCliBridge {
46+
type Source = relay_millau_client::Millau;
47+
type Target = relay_rialto_client::Rialto;
48+
}
49+
50+
impl RelayToRelayHeadersCliBridge for MillauToRialtoCliBridge {
51+
type Finality = MillauFinalityToRialto;
52+
}
53+
54+
impl MessagesCliBridge for MillauToRialtoCliBridge {
55+
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
56+
bp_rialto::TO_RIALTO_ESTIMATE_MESSAGE_FEE_METHOD;
57+
type MessagesLane = crate::chains::millau_messages_to_rialto::MillauMessagesToRialto;
58+
}

‎bridges/relays/bin-substrate/src/chains/millau_headers_to_rialto_parachain.rs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
//! Millau-to-RialtoParachain headers sync entrypoint.
3636
37+
use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, RelayToRelayHeadersCliBridge};
3738
use substrate_relay_helper::finality::{
3839
engine::Grandpa as GrandpaFinalityEngine, DirectSubmitGrandpaFinalityProofCallBuilder,
3940
SubstrateFinalitySyncPipeline,
@@ -55,3 +56,22 @@ impl SubstrateFinalitySyncPipeline for MillauFinalityToRialtoParachain {
5556
>;
5657
type TransactionSignScheme = relay_rialto_parachain_client::RialtoParachain;
5758
}
59+
60+
//// `Millau` to `RialtoParachain` bridge definition.
61+
pub struct MillauToRialtoParachainCliBridge {}
62+
63+
impl CliBridgeBase for MillauToRialtoParachainCliBridge {
64+
type Source = relay_millau_client::Millau;
65+
type Target = relay_rialto_parachain_client::RialtoParachain;
66+
}
67+
68+
impl RelayToRelayHeadersCliBridge for MillauToRialtoParachainCliBridge {
69+
type Finality = MillauFinalityToRialtoParachain;
70+
}
71+
72+
impl MessagesCliBridge for MillauToRialtoParachainCliBridge {
73+
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
74+
bp_rialto_parachain::TO_RIALTO_PARACHAIN_ESTIMATE_MESSAGE_FEE_METHOD;
75+
type MessagesLane =
76+
crate::chains::millau_messages_to_rialto_parachain::MillauMessagesToRialtoParachain;
77+
}

‎bridges/relays/bin-substrate/src/chains/rialto_headers_to_millau.rs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
//! Rialto-to-Millau headers sync entrypoint.
1818
19+
use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, RelayToRelayHeadersCliBridge};
1920
use substrate_relay_helper::finality::{
2021
engine::Grandpa as GrandpaFinalityEngine, DirectSubmitGrandpaFinalityProofCallBuilder,
2122
SubstrateFinalitySyncPipeline,
@@ -37,3 +38,21 @@ impl SubstrateFinalitySyncPipeline for RialtoFinalityToMillau {
3738
>;
3839
type TransactionSignScheme = relay_millau_client::Millau;
3940
}
41+
42+
//// `Rialto` to `Millau` bridge definition.
43+
pub struct RialtoToMillauCliBridge {}
44+
45+
impl CliBridgeBase for RialtoToMillauCliBridge {
46+
type Source = relay_rialto_client::Rialto;
47+
type Target = relay_millau_client::Millau;
48+
}
49+
50+
impl RelayToRelayHeadersCliBridge for RialtoToMillauCliBridge {
51+
type Finality = RialtoFinalityToMillau;
52+
}
53+
54+
impl MessagesCliBridge for RialtoToMillauCliBridge {
55+
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
56+
bp_millau::TO_MILLAU_ESTIMATE_MESSAGE_FEE_METHOD;
57+
type MessagesLane = crate::chains::rialto_messages_to_millau::RialtoMessagesToMillau;
58+
}

‎bridges/relays/bin-substrate/src/chains/rialto_parachains_to_millau.rs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
//! Rialto-to-Millau parachains sync entrypoint.
1818
19+
use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge};
1920
use parachains_relay::ParachainsPipeline;
2021
use relay_millau_client::Millau;
2122
use relay_rialto_client::Rialto;
@@ -51,3 +52,24 @@ pub type RialtoParachainsToMillauSubmitParachainHeadsCallBuilder =
5152
millau_runtime::Runtime,
5253
millau_runtime::WithRialtoParachainsInstance,
5354
>;
55+
56+
//// `RialtoParachain` to `Millau` bridge definition.
57+
pub struct RialtoParachainToMillauCliBridge {}
58+
59+
impl CliBridgeBase for RialtoParachainToMillauCliBridge {
60+
type Source = RialtoParachain;
61+
type Target = Millau;
62+
}
63+
64+
impl ParachainToRelayHeadersCliBridge for RialtoParachainToMillauCliBridge {
65+
type SourceRelay = Rialto;
66+
type ParachainFinality = RialtoParachainsToMillau;
67+
type RelayFinality = crate::chains::rialto_headers_to_millau::RialtoFinalityToMillau;
68+
}
69+
70+
impl MessagesCliBridge for RialtoParachainToMillauCliBridge {
71+
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
72+
bp_millau::TO_MILLAU_ESTIMATE_MESSAGE_FEE_METHOD;
73+
type MessagesLane =
74+
crate::chains::rialto_parachain_messages_to_millau::RialtoParachainMessagesToMillau;
75+
}

‎bridges/relays/bin-substrate/src/chains/westend_headers_to_millau.rs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
//! Westend-to-Millau headers sync entrypoint.
1818
19+
use crate::cli::bridge::{CliBridgeBase, RelayToRelayHeadersCliBridge};
1920
use substrate_relay_helper::finality::{
2021
engine::Grandpa as GrandpaFinalityEngine, DirectSubmitGrandpaFinalityProofCallBuilder,
2122
SubstrateFinalitySyncPipeline,
@@ -37,3 +38,15 @@ impl SubstrateFinalitySyncPipeline for WestendFinalityToMillau {
3738
>;
3839
type TransactionSignScheme = relay_millau_client::Millau;
3940
}
41+
42+
//// `Westend` to `Millau` bridge definition.
43+
pub struct WestendToMillauCliBridge {}
44+
45+
impl CliBridgeBase for WestendToMillauCliBridge {
46+
type Source = relay_westend_client::Westend;
47+
type Target = relay_millau_client::Millau;
48+
}
49+
50+
impl RelayToRelayHeadersCliBridge for WestendToMillauCliBridge {
51+
type Finality = WestendFinalityToMillau;
52+
}

‎bridges/relays/bin-substrate/src/chains/westend_parachains_to_millau.rs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
//! Westend-to-Millau parachains sync entrypoint.
1818
19+
use crate::cli::bridge::{CliBridgeBase, ParachainToRelayHeadersCliBridge};
1920
use parachains_relay::ParachainsPipeline;
2021
use relay_millau_client::Millau;
2122
use relay_westend_client::{Westend, Westmint};
@@ -50,3 +51,17 @@ pub type WestendParachainsToMillauSubmitParachainHeadsCallBuilder =
5051
millau_runtime::Runtime,
5152
millau_runtime::WithWestendParachainsInstance,
5253
>;
54+
55+
//// `WestendParachain` to `Millau` bridge definition.
56+
pub struct WestmintToMillauCliBridge {}
57+
58+
impl ParachainToRelayHeadersCliBridge for WestmintToMillauCliBridge {
59+
type SourceRelay = Westend;
60+
type ParachainFinality = WestendParachainsToMillau;
61+
type RelayFinality = crate::chains::westend_headers_to_millau::WestendFinalityToMillau;
62+
}
63+
64+
impl CliBridgeBase for WestmintToMillauCliBridge {
65+
type Source = Westmint;
66+
type Target = Millau;
67+
}

‎bridges/relays/bin-substrate/src/cli/bridge.rs‎

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -111,106 +111,3 @@ pub trait MessagesCliBridge: CliBridgeBase {
111111
RelayStrategy = MixStrategy,
112112
>;
113113
}
114-
115-
//// `Millau` to `Rialto` bridge definition.
116-
pub struct MillauToRialtoCliBridge {}
117-
118-
impl CliBridgeBase for MillauToRialtoCliBridge {
119-
type Source = relay_millau_client::Millau;
120-
type Target = relay_rialto_client::Rialto;
121-
}
122-
123-
impl RelayToRelayHeadersCliBridge for MillauToRialtoCliBridge {
124-
type Finality = crate::chains::millau_headers_to_rialto::MillauFinalityToRialto;
125-
}
126-
127-
impl MessagesCliBridge for MillauToRialtoCliBridge {
128-
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
129-
bp_rialto::TO_RIALTO_ESTIMATE_MESSAGE_FEE_METHOD;
130-
type MessagesLane = crate::chains::millau_messages_to_rialto::MillauMessagesToRialto;
131-
}
132-
133-
//// `Rialto` to `Millau` bridge definition.
134-
pub struct RialtoToMillauCliBridge {}
135-
136-
impl CliBridgeBase for RialtoToMillauCliBridge {
137-
type Source = relay_rialto_client::Rialto;
138-
type Target = relay_millau_client::Millau;
139-
}
140-
141-
impl RelayToRelayHeadersCliBridge for RialtoToMillauCliBridge {
142-
type Finality = crate::chains::rialto_headers_to_millau::RialtoFinalityToMillau;
143-
}
144-
145-
impl MessagesCliBridge for RialtoToMillauCliBridge {
146-
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
147-
bp_millau::TO_MILLAU_ESTIMATE_MESSAGE_FEE_METHOD;
148-
type MessagesLane = crate::chains::rialto_messages_to_millau::RialtoMessagesToMillau;
149-
}
150-
151-
//// `Westend` to `Millau` bridge definition.
152-
pub struct WestendToMillauCliBridge {}
153-
154-
impl CliBridgeBase for WestendToMillauCliBridge {
155-
type Source = relay_westend_client::Westend;
156-
type Target = relay_millau_client::Millau;
157-
}
158-
159-
impl RelayToRelayHeadersCliBridge for WestendToMillauCliBridge {
160-
type Finality = crate::chains::westend_headers_to_millau::WestendFinalityToMillau;
161-
}
162-
163-
//// `Millau` to `RialtoParachain` bridge definition.
164-
pub struct MillauToRialtoParachainCliBridge {}
165-
166-
impl CliBridgeBase for MillauToRialtoParachainCliBridge {
167-
type Source = relay_millau_client::Millau;
168-
type Target = relay_rialto_parachain_client::RialtoParachain;
169-
}
170-
171-
impl RelayToRelayHeadersCliBridge for MillauToRialtoParachainCliBridge {
172-
type Finality =
173-
crate::chains::millau_headers_to_rialto_parachain::MillauFinalityToRialtoParachain;
174-
}
175-
176-
impl MessagesCliBridge for MillauToRialtoParachainCliBridge {
177-
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
178-
bp_rialto_parachain::TO_RIALTO_PARACHAIN_ESTIMATE_MESSAGE_FEE_METHOD;
179-
type MessagesLane =
180-
crate::chains::millau_messages_to_rialto_parachain::MillauMessagesToRialtoParachain;
181-
}
182-
183-
//// `RialtoParachain` to `Millau` bridge definition.
184-
pub struct RialtoParachainToMillauCliBridge {}
185-
186-
impl CliBridgeBase for RialtoParachainToMillauCliBridge {
187-
type Source = relay_rialto_parachain_client::RialtoParachain;
188-
type Target = relay_millau_client::Millau;
189-
}
190-
191-
impl ParachainToRelayHeadersCliBridge for RialtoParachainToMillauCliBridge {
192-
type SourceRelay = relay_rialto_client::Rialto;
193-
type ParachainFinality = crate::chains::rialto_parachains_to_millau::RialtoParachainsToMillau;
194-
type RelayFinality = crate::chains::rialto_headers_to_millau::RialtoFinalityToMillau;
195-
}
196-
197-
impl MessagesCliBridge for RialtoParachainToMillauCliBridge {
198-
const ESTIMATE_MESSAGE_FEE_METHOD: &'static str =
199-
bp_millau::TO_MILLAU_ESTIMATE_MESSAGE_FEE_METHOD;
200-
type MessagesLane =
201-
crate::chains::rialto_parachain_messages_to_millau::RialtoParachainMessagesToMillau;
202-
}
203-
204-
//// `WestendParachain` to `Millau` bridge definition.
205-
pub struct WestmintToMillauCliBridge {}
206-
207-
impl ParachainToRelayHeadersCliBridge for WestmintToMillauCliBridge {
208-
type SourceRelay = relay_westend_client::Westend;
209-
type ParachainFinality = crate::chains::westend_parachains_to_millau::WestendParachainsToMillau;
210-
type RelayFinality = crate::chains::westend_headers_to_millau::WestendFinalityToMillau;
211-
}
212-
213-
impl CliBridgeBase for WestmintToMillauCliBridge {
214-
type Source = relay_westend_client::Westmint;
215-
type Target = relay_millau_client::Millau;
216-
}

‎bridges/relays/bin-substrate/src/cli/estimate_fee.rs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,19 @@
1414
// You should have received a copy of the GNU General Public License
1515
// along with Parity Bridges Common. If not, see <http://www.gnu.org/licenses/>.
1616

17-
use crate::cli::{
18-
bridge::{FullBridge, MessagesCliBridge, *},
19-
chain_schema::*,
20-
relay_headers_and_messages::CONVERSION_RATE_ALLOWED_DIFFERENCE_RATIO,
21-
Balance, HexBytes, HexLaneId,
17+
use crate::{
18+
chains::{
19+
millau_headers_to_rialto::MillauToRialtoCliBridge,
20+
millau_headers_to_rialto_parachain::MillauToRialtoParachainCliBridge,
21+
rialto_headers_to_millau::RialtoToMillauCliBridge,
22+
rialto_parachains_to_millau::RialtoParachainToMillauCliBridge,
23+
},
24+
cli::{
25+
bridge::{FullBridge, MessagesCliBridge},
26+
chain_schema::*,
27+
relay_headers_and_messages::CONVERSION_RATE_ALLOWED_DIFFERENCE_RATIO,
28+
Balance, HexBytes, HexLaneId,
29+
},
2230
};
2331
use async_trait::async_trait;
2432
use bp_runtime::BalanceOf;

‎bridges/relays/bin-substrate/src/cli/init_bridge.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

1717
use async_trait::async_trait;
1818

19-
use crate::cli::{
20-
bridge::{
21-
CliBridgeBase, MillauToRialtoCliBridge, MillauToRialtoParachainCliBridge,
22-
RialtoToMillauCliBridge, WestendToMillauCliBridge,
19+
use crate::{
20+
chains::{
21+
millau_headers_to_rialto::MillauToRialtoCliBridge,
22+
millau_headers_to_rialto_parachain::MillauToRialtoParachainCliBridge,
23+
rialto_headers_to_millau::RialtoToMillauCliBridge,
24+
westend_headers_to_millau::WestendToMillauCliBridge,
2325
},
24-
chain_schema::*,
26+
cli::{bridge::CliBridgeBase, chain_schema::*},
2527
};
2628
use bp_runtime::Chain as ChainBase;
2729
use codec::Encode;

‎bridges/relays/bin-substrate/src/cli/relay_headers.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ use sp_core::Pair;
2020
use structopt::StructOpt;
2121
use strum::{EnumString, EnumVariantNames, VariantNames};
2222

23+
use crate::chains::{
24+
millau_headers_to_rialto::MillauToRialtoCliBridge,
25+
millau_headers_to_rialto_parachain::MillauToRialtoParachainCliBridge,
26+
rialto_headers_to_millau::RialtoToMillauCliBridge,
27+
westend_headers_to_millau::WestendToMillauCliBridge,
28+
};
2329
use relay_utils::metrics::{GlobalMetrics, StandaloneMetric};
2430
use substrate_relay_helper::finality::SubstrateFinalitySyncPipeline;
2531

0 commit comments

Comments
 (0)