pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 18:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CLI] Remove some macros

Browse Source 
Refactor the implementations for the following CLI methods in order to
avoid using macros:
- init_bridge
- relay_headers
- relay_parachains

Signed-off-by: Serban Iorga <serban@parity.io>
This commit is contained in:
Serban Iorga
2022-07-05 16:28:19 +03:00
committed by Bastian Köcher
parent 4929493f83
commit 46c0400f26
5 changed files with 464 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/relays/bin-substrate/src/cli/relay_parachains.rs
+73 -47
View File
@@ -14,18 +14,29 @@
// You should have received a copy of the GNU General Public License
// along with Parity Bridges Common. If not, see <http://www.gnu.org/licenses/>.
use async_trait::async_trait;
use bp_polkadot_core::parachains::ParaId;
use parachains_relay::{parachains_loop::ParachainSyncParams, ParachainsPipeline};
use pallet_bridge_parachains::RelayBlockNumber;
use parachains_relay::{
parachains_loop::{ParachainSyncParams, SourceClient, TargetClient},
ParachainsPipeline,
};
use relay_substrate_client::{Chain, RelayChain};
use relay_utils::metrics::{GlobalMetrics, StandaloneMetric};
use structopt::StructOpt;
use strum::{EnumString, EnumVariantNames, VariantNames};
use substrate_relay_helper::{
parachains::{source::ParachainsSource, target::ParachainsTarget},
parachains::{
source::ParachainsSource, target::ParachainsTarget, ParachainsPipelineAdapter,
SubstrateParachainsPipeline,
},
TransactionParams,
};
use crate::cli::{
PrometheusParams, SourceConnectionParams, TargetConnectionParams, TargetSigningParams,
bridge::{CliBridgeBase, RialtoParachainToMillauCliBridge, WestmintToMillauCliBridge},
CliChain, PrometheusParams, SourceConnectionParams, TargetConnectionParams,
TargetSigningParams,
};
/// Start parachain heads relayer process.
@@ -52,57 +63,72 @@ pub enum RelayParachainsBridge {
WestendToMillau,
}
macro_rules! select_bridge {
($bridge: expr, $generic: tt) => {
match $bridge {
RelayParachainsBridge::RialtoToMillau => {
use crate::chains::rialto_parachains_to_millau::RialtoParachainsToMillau as Pipeline;
#[async_trait]
trait ParachainsRelayer: CliBridgeBase
where
ParachainsSource<Self::Pipeline>: SourceClient<ParachainsPipelineAdapter<Self::Pipeline>>,
ParachainsTarget<Self::Pipeline>: TargetClient<ParachainsPipelineAdapter<Self::Pipeline>>,
{
type SourceRelay: Chain<BlockNumber = RelayBlockNumber> + CliChain + RelayChain;
type Pipeline: SubstrateParachainsPipeline<
SourceParachain = Self::Source,
TargetChain = Self::Target,
SourceRelayChain = Self::SourceRelay,
TransactionSignScheme = Self::Target,
> + ParachainsPipeline<SourceChain = Self::SourceRelay, TargetChain = Self::Target>;
$generic
},
RelayParachainsBridge::WestendToMillau => {
use crate::chains::westend_parachains_to_millau::WestendParachainsToMillau as Pipeline;
async fn relay_headers(data: RelayParachains) -> anyhow::Result<()> {
let source_client = data.source.to_client::<Self::SourceRelay>().await?;
let source_client = ParachainsSource::<Self::Pipeline>::new(source_client, None);
$generic
let target_transaction_params = TransactionParams {
signer: data.target_sign.to_keypair::<Self::Target>()?,
mortality: data.target_sign.target_transactions_mortality,
};
let target_client = data.target.to_client::<Self::Target>().await?;
let target_client = ParachainsTarget::<Self::Pipeline>::new(
target_client.clone(),
target_transaction_params,
);
let metrics_params: relay_utils::metrics::MetricsParams = data.prometheus_params.into();
GlobalMetrics::new()?.register_and_spawn(&metrics_params.registry)?;
parachains_relay::parachains_loop::run(
source_client,
target_client,
ParachainSyncParams {
parachains: vec![ParaId(2000)],
stall_timeout: std::time::Duration::from_secs(60),
strategy: parachains_relay::parachains_loop::ParachainSyncStrategy::Any,
},
}
};
metrics_params,
futures::future::pending(),
)
.await
.map_err(|e| anyhow::format_err!("{}", e))
}
}
impl ParachainsRelayer for RialtoParachainToMillauCliBridge {
type SourceRelay = relay_rialto_client::Rialto;
type Pipeline = crate::chains::rialto_parachains_to_millau::RialtoParachainsToMillau;
}
impl ParachainsRelayer for WestmintToMillauCliBridge {
type SourceRelay = relay_westend_client::Westend;
type Pipeline = crate::chains::westend_parachains_to_millau::WestendParachainsToMillau;
}
impl RelayParachains {
/// Run the command.
pub async fn run(self) -> anyhow::Result<()> {
select_bridge!(self.bridge, {
type SourceChain = <Pipeline as ParachainsPipeline>::SourceChain;
type TargetChain = <Pipeline as ParachainsPipeline>::TargetChain;
let source_client = self.source.to_client::<SourceChain>().await?;
let source_client = ParachainsSource::<Pipeline>::new(source_client, None);
let taret_transaction_params = TransactionParams {
signer: self.target_sign.to_keypair::<TargetChain>()?,
mortality: self.target_sign.target_transactions_mortality,
};
let target_client = self.target.to_client::<TargetChain>().await?;
let target_client =
ParachainsTarget::<Pipeline>::new(target_client.clone(), taret_transaction_params);
let metrics_params: relay_utils::metrics::MetricsParams = self.prometheus_params.into();
GlobalMetrics::new()?.register_and_spawn(&metrics_params.registry)?;
parachains_relay::parachains_loop::run(
source_client,
target_client,
ParachainSyncParams {
parachains: vec![ParaId(2000)],
stall_timeout: std::time::Duration::from_secs(60),
strategy: parachains_relay::parachains_loop::ParachainSyncStrategy::Any,
},
metrics_params,
futures::future::pending(),
)
.await
.map_err(|e| anyhow::format_err!("{}", e))
})
match self.bridge {
RelayParachainsBridge::RialtoToMillau =>
RialtoParachainToMillauCliBridge::relay_headers(self),
RelayParachainsBridge::WestendToMillau =>
WestmintToMillauCliBridge::relay_headers(self),
}
.await
}
}