diff --git a/relays/bin-substrate/src/cli/bridge.rs b/relays/bin-substrate/src/cli/bridge.rs index 6073d9e3155bb..9457dfa5c0680 100644 --- a/relays/bin-substrate/src/cli/bridge.rs +++ b/relays/bin-substrate/src/cli/bridge.rs @@ -17,7 +17,7 @@ use crate::cli::CliChain; use pallet_bridge_parachains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber}; use relay_substrate_client::{Chain, ChainWithTransactions, Parachain, RelayChain}; -use strum::{EnumString, EnumVariantNames}; +use strum::{EnumString, VariantNames}; use substrate_relay_helper::{ equivocation::SubstrateEquivocationDetectionPipeline, finality::SubstrateFinalitySyncPipeline, @@ -25,7 +25,7 @@ use substrate_relay_helper::{ parachains::SubstrateParachainsPipeline, }; -#[derive(Debug, PartialEq, Eq, EnumString, EnumVariantNames)] +#[derive(Debug, PartialEq, Eq, EnumString, VariantNames)] #[strum(serialize_all = "kebab_case")] /// Supported full bridges (headers + messages). pub enum FullBridge { diff --git a/relays/bin-substrate/src/cli/chain_schema.rs b/relays/bin-substrate/src/cli/chain_schema.rs index 5c2161acdbd70..7c647dfbfd1df 100644 --- a/relays/bin-substrate/src/cli/chain_schema.rs +++ b/relays/bin-substrate/src/cli/chain_schema.rs @@ -17,14 +17,14 @@ use relay_substrate_client::{AccountKeyPairOf, ChainWithTransactions}; use structopt::StructOpt; -use strum::{EnumString, EnumVariantNames}; +use strum::{EnumString, VariantNames}; use crate::cli::CliChain; pub use relay_substrate_client::{ChainRuntimeVersion, SimpleRuntimeVersion}; use substrate_relay_helper::TransactionParams; #[doc = "Runtime version params."] -#[derive(StructOpt, Debug, PartialEq, Eq, Clone, Copy, EnumString, EnumVariantNames)] +#[derive(StructOpt, Debug, PartialEq, Eq, Clone, Copy, EnumString, VariantNames)] pub enum RuntimeVersionType { /// Auto query version from chain Auto, diff --git a/relays/bin-substrate/src/cli/detect_equivocations.rs b/relays/bin-substrate/src/cli/detect_equivocations.rs index 970089453bd5a..a8f1ed35f3afb 100644 --- a/relays/bin-substrate/src/cli/detect_equivocations.rs +++ b/relays/bin-substrate/src/cli/detect_equivocations.rs @@ -31,7 +31,7 @@ use crate::{ use async_trait::async_trait; use relay_substrate_client::ChainWithTransactions; use structopt::StructOpt; -use strum::{EnumString, EnumVariantNames, VariantNames}; +use strum::{EnumString, VariantNames}; use substrate_relay_helper::{equivocation, equivocation::SubstrateEquivocationDetectionPipeline}; /// Start equivocation detection loop. @@ -49,7 +49,7 @@ pub struct DetectEquivocations { prometheus_params: PrometheusParams, } -#[derive(Debug, EnumString, EnumVariantNames)] +#[derive(Debug, EnumString, VariantNames)] #[strum(serialize_all = "kebab_case")] /// Equivocations detection bridge. pub enum DetectEquivocationsBridge { diff --git a/relays/bin-substrate/src/cli/init_bridge.rs b/relays/bin-substrate/src/cli/init_bridge.rs index 8be74e5f9b535..027dd4c482f87 100644 --- a/relays/bin-substrate/src/cli/init_bridge.rs +++ b/relays/bin-substrate/src/cli/init_bridge.rs @@ -42,7 +42,7 @@ use bp_runtime::Chain as ChainBase; use relay_substrate_client::{AccountKeyPairOf, Chain, UnsignedTransaction}; use sp_core::Pair; use structopt::StructOpt; -use strum::{EnumString, EnumVariantNames, VariantNames}; +use strum::{EnumString, VariantNames}; use substrate_relay_helper::finality_base::engine::{Engine, Grandpa as GrandpaFinalityEngine}; /// Initialize bridge pallet. @@ -62,7 +62,7 @@ pub struct InitBridge { dry_run: bool, } -#[derive(Debug, EnumString, EnumVariantNames)] +#[derive(Debug, EnumString, VariantNames)] #[strum(serialize_all = "kebab_case")] /// Bridge to initialize. pub enum InitBridgeName { diff --git a/relays/bin-substrate/src/cli/mod.rs b/relays/bin-substrate/src/cli/mod.rs index 580463ef9f9ed..6d799023cdbc0 100644 --- a/relays/bin-substrate/src/cli/mod.rs +++ b/relays/bin-substrate/src/cli/mod.rs @@ -23,7 +23,7 @@ use rbtag::BuildInfo; use signal_hook::consts::*; use signal_hook_async_std::Signals; use structopt::{clap::arg_enum, StructOpt}; -use strum::{EnumString, EnumVariantNames}; +use strum::{EnumString, VariantNames}; use bp_messages::LaneId; use relay_substrate_client::SimpleRuntimeVersion; @@ -288,7 +288,7 @@ where } #[doc = "Runtime version params."] -#[derive(StructOpt, Debug, PartialEq, Eq, Clone, Copy, EnumString, EnumVariantNames)] +#[derive(StructOpt, Debug, PartialEq, Eq, Clone, Copy, EnumString, VariantNames)] pub enum RuntimeVersionType { /// Auto query version from chain Auto, diff --git a/relays/bin-substrate/src/cli/relay_headers.rs b/relays/bin-substrate/src/cli/relay_headers.rs index 5e43c98770072..a3b5c4c9f82dd 100644 --- a/relays/bin-substrate/src/cli/relay_headers.rs +++ b/relays/bin-substrate/src/cli/relay_headers.rs @@ -16,7 +16,7 @@ use async_trait::async_trait; use structopt::StructOpt; -use strum::{EnumString, EnumVariantNames, VariantNames}; +use strum::{EnumString, VariantNames}; use crate::bridges::{ kusama_polkadot::{ @@ -57,7 +57,7 @@ pub struct RelayHeaders { prometheus_params: PrometheusParams, } -#[derive(Debug, EnumString, EnumVariantNames)] +#[derive(Debug, EnumString, VariantNames)] #[strum(serialize_all = "kebab_case")] /// Headers relay bridge. pub enum RelayHeadersBridge { diff --git a/relays/bin-substrate/src/cli/relay_parachains.rs b/relays/bin-substrate/src/cli/relay_parachains.rs index 1456dddf11e23..dc1c5ad362f42 100644 --- a/relays/bin-substrate/src/cli/relay_parachains.rs +++ b/relays/bin-substrate/src/cli/relay_parachains.rs @@ -33,7 +33,7 @@ use relay_substrate_client::Parachain; use relay_utils::metrics::{GlobalMetrics, StandaloneMetric}; use std::sync::Arc; use structopt::StructOpt; -use strum::{EnumString, EnumVariantNames, VariantNames}; +use strum::{EnumString, VariantNames}; use substrate_relay_helper::{ parachains::{source::ParachainsSource, target::ParachainsTarget, ParachainsPipelineAdapter}, TransactionParams, @@ -62,7 +62,7 @@ pub struct RelayParachains { } /// Parachain heads relay bridge. -#[derive(Debug, EnumString, EnumVariantNames)] +#[derive(Debug, EnumString, VariantNames)] #[strum(serialize_all = "kebab_case")] pub enum RelayParachainsBridge { KusamaToBridgeHubPolkadot,