mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-21 13:15:41 +00:00
fix clippy things (#1200)
This commit is contained in:
committed by
Bastian Köcher
parent
48121604cd
commit
c2b38ba530
@@ -113,7 +113,7 @@ where
|
|||||||
|
|
||||||
/// Obtain a prepared `OverseerBuilder`, that is initialized
|
/// Obtain a prepared `OverseerBuilder`, that is initialized
|
||||||
/// with all default values.
|
/// with all default values.
|
||||||
pub fn prepared_overseer_builder<'a, Spawner, RuntimeClient>(
|
pub fn prepared_overseer_builder<Spawner, RuntimeClient>(
|
||||||
OverseerGenArgs {
|
OverseerGenArgs {
|
||||||
leaves,
|
leaves,
|
||||||
keystore,
|
keystore,
|
||||||
@@ -134,7 +134,7 @@ pub fn prepared_overseer_builder<'a, Spawner, RuntimeClient>(
|
|||||||
candidate_validation_config,
|
candidate_validation_config,
|
||||||
chain_selection_config,
|
chain_selection_config,
|
||||||
dispute_coordinator_config,
|
dispute_coordinator_config,
|
||||||
}: OverseerGenArgs<'a, Spawner, RuntimeClient>,
|
}: OverseerGenArgs<'_, Spawner, RuntimeClient>,
|
||||||
) -> Result<
|
) -> Result<
|
||||||
OverseerBuilder<
|
OverseerBuilder<
|
||||||
Spawner,
|
Spawner,
|
||||||
@@ -236,7 +236,7 @@ where
|
|||||||
approval_voting_config,
|
approval_voting_config,
|
||||||
parachains_db.clone(),
|
parachains_db.clone(),
|
||||||
keystore.clone(),
|
keystore.clone(),
|
||||||
Box::new(network_service.clone()),
|
Box::new(network_service),
|
||||||
Metrics::register(registry)?,
|
Metrics::register(registry)?,
|
||||||
))
|
))
|
||||||
.gossip_support(GossipSupportSubsystem::new(
|
.gossip_support(GossipSupportSubsystem::new(
|
||||||
@@ -251,9 +251,9 @@ where
|
|||||||
))
|
))
|
||||||
.dispute_participation(DisputeParticipationSubsystem::new())
|
.dispute_participation(DisputeParticipationSubsystem::new())
|
||||||
.dispute_distribution(DisputeDistributionSubsystem::new(
|
.dispute_distribution(DisputeDistributionSubsystem::new(
|
||||||
keystore.clone(),
|
keystore,
|
||||||
dispute_req_receiver,
|
dispute_req_receiver,
|
||||||
authority_discovery_service.clone(),
|
authority_discovery_service,
|
||||||
Metrics::register(registry)?,
|
Metrics::register(registry)?,
|
||||||
))
|
))
|
||||||
.chain_selection(ChainSelectionSubsystem::new(chain_selection_config, parachains_db))
|
.chain_selection(ChainSelectionSubsystem::new(chain_selection_config, parachains_db))
|
||||||
@@ -278,10 +278,10 @@ where
|
|||||||
/// would do.
|
/// would do.
|
||||||
pub trait OverseerGen {
|
pub trait OverseerGen {
|
||||||
/// Overwrite the full generation of the overseer, including the subsystems.
|
/// Overwrite the full generation of the overseer, including the subsystems.
|
||||||
fn generate<'a, Spawner, RuntimeClient>(
|
fn generate<Spawner, RuntimeClient>(
|
||||||
&self,
|
&self,
|
||||||
connector: OverseerConnector,
|
connector: OverseerConnector,
|
||||||
args: OverseerGenArgs<'a, Spawner, RuntimeClient>,
|
args: OverseerGenArgs<'_, Spawner, RuntimeClient>,
|
||||||
) -> Result<(Overseer<Spawner, Arc<RuntimeClient>>, OverseerHandle), Error>
|
) -> Result<(Overseer<Spawner, Arc<RuntimeClient>>, OverseerHandle), Error>
|
||||||
where
|
where
|
||||||
RuntimeClient: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore,
|
RuntimeClient: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore,
|
||||||
@@ -302,10 +302,10 @@ use polkadot_overseer::KNOWN_LEAVES_CACHE_SIZE;
|
|||||||
pub struct RealOverseerGen;
|
pub struct RealOverseerGen;
|
||||||
|
|
||||||
impl OverseerGen for RealOverseerGen {
|
impl OverseerGen for RealOverseerGen {
|
||||||
fn generate<'a, Spawner, RuntimeClient>(
|
fn generate<Spawner, RuntimeClient>(
|
||||||
&self,
|
&self,
|
||||||
connector: OverseerConnector,
|
connector: OverseerConnector,
|
||||||
args: OverseerGenArgs<'a, Spawner, RuntimeClient>,
|
args: OverseerGenArgs<'_, Spawner, RuntimeClient>,
|
||||||
) -> Result<(Overseer<Spawner, Arc<RuntimeClient>>, OverseerHandle), Error>
|
) -> Result<(Overseer<Spawner, Arc<RuntimeClient>>, OverseerHandle), Error>
|
||||||
where
|
where
|
||||||
RuntimeClient: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore,
|
RuntimeClient: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore,
|
||||||
|
|||||||
@@ -613,7 +613,7 @@ where
|
|||||||
statement_req_receiver,
|
statement_req_receiver,
|
||||||
},
|
},
|
||||||
)?;
|
)?;
|
||||||
let handle = Handle::new(overseer_handle.clone());
|
let handle = Handle::new(overseer_handle);
|
||||||
|
|
||||||
{
|
{
|
||||||
let handle = handle.clone();
|
let handle = handle.clone();
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ async fn prepare_initial_header(
|
|||||||
let initial_header = sub_client.header_by_number(Zero::zero()).await;
|
let initial_header = sub_client.header_by_number(Zero::zero()).await;
|
||||||
initial_header
|
initial_header
|
||||||
.map(|header| (HeaderId(Zero::zero(), header.hash()), header.encode()))
|
.map(|header| (HeaderId(Zero::zero(), header.hash()), header.encode()))
|
||||||
.map_err(|error| Error::ReadGenesisHeader(error))
|
.map_err(Error::ReadGenesisHeader)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -134,7 +134,7 @@ async fn prepare_initial_authorities_set(
|
|||||||
None => sub_client.grandpa_authorities_set(sub_initial_header_hash).await,
|
None => sub_client.grandpa_authorities_set(sub_initial_header_hash).await,
|
||||||
};
|
};
|
||||||
|
|
||||||
initial_authorities_set.map_err(|error| Error::ReadAuthorities(error))
|
initial_authorities_set.map_err(Error::ReadAuthorities)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Deploy bridge contract to Ethereum chain.
|
/// Deploy bridge contract to Ethereum chain.
|
||||||
@@ -160,5 +160,5 @@ async fn deploy_bridge_contract(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.map_err(|error| Error::DeployContract(error))
|
.map_err(Error::DeployContract)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -512,10 +512,10 @@ impl RelayHeadersAndMessages {
|
|||||||
let left_to_right_messages = left_to_right_messages(MessagesRelayParams {
|
let left_to_right_messages = left_to_right_messages(MessagesRelayParams {
|
||||||
source_client: left_client.clone(),
|
source_client: left_client.clone(),
|
||||||
source_sign: left_sign.clone(),
|
source_sign: left_sign.clone(),
|
||||||
source_transactions_mortality: left_transactions_mortality.clone(),
|
source_transactions_mortality: left_transactions_mortality,
|
||||||
target_client: right_client.clone(),
|
target_client: right_client.clone(),
|
||||||
target_sign: right_sign.clone(),
|
target_sign: right_sign.clone(),
|
||||||
target_transactions_mortality: right_transactions_mortality.clone(),
|
target_transactions_mortality: right_transactions_mortality,
|
||||||
source_to_target_headers_relay: Some(left_to_right_on_demand_headers.clone()),
|
source_to_target_headers_relay: Some(left_to_right_on_demand_headers.clone()),
|
||||||
target_to_source_headers_relay: Some(right_to_left_on_demand_headers.clone()),
|
target_to_source_headers_relay: Some(right_to_left_on_demand_headers.clone()),
|
||||||
lane_id: lane,
|
lane_id: lane,
|
||||||
@@ -531,10 +531,10 @@ impl RelayHeadersAndMessages {
|
|||||||
let right_to_left_messages = right_to_left_messages(MessagesRelayParams {
|
let right_to_left_messages = right_to_left_messages(MessagesRelayParams {
|
||||||
source_client: right_client.clone(),
|
source_client: right_client.clone(),
|
||||||
source_sign: right_sign.clone(),
|
source_sign: right_sign.clone(),
|
||||||
source_transactions_mortality: right_transactions_mortality.clone(),
|
source_transactions_mortality: right_transactions_mortality,
|
||||||
target_client: left_client.clone(),
|
target_client: left_client.clone(),
|
||||||
target_sign: left_sign.clone(),
|
target_sign: left_sign.clone(),
|
||||||
target_transactions_mortality: left_transactions_mortality.clone(),
|
target_transactions_mortality: left_transactions_mortality,
|
||||||
source_to_target_headers_relay: Some(right_to_left_on_demand_headers.clone()),
|
source_to_target_headers_relay: Some(right_to_left_on_demand_headers.clone()),
|
||||||
target_to_source_headers_relay: Some(left_to_right_on_demand_headers.clone()),
|
target_to_source_headers_relay: Some(left_to_right_on_demand_headers.clone()),
|
||||||
lane_id: lane,
|
lane_id: lane,
|
||||||
|
|||||||
@@ -552,7 +552,7 @@ mod tests {
|
|||||||
// when we resubmit tx for the second time, 1/9 of queue is skipped
|
// when we resubmit tx for the second time, 1/9 of queue is skipped
|
||||||
context = context.notice_resubmitted_transaction(Hash::from([3; 32]));
|
context = context.notice_resubmitted_transaction(Hash::from([3; 32]));
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
select_transaction_from_queue(queued_transactions.clone(), &context),
|
select_transaction_from_queue(queued_transactions, &context),
|
||||||
Some(Bytes(vec![1])),
|
Some(Bytes(vec![1])),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,8 +99,8 @@ pub async fn run<P: TransactionProofPipeline>(
|
|||||||
|
|
||||||
relay_utils::relay_loop(source_client, target_client)
|
relay_utils::relay_loop(source_client, target_client)
|
||||||
.with_metrics(Some(metrics_prefix::<P>()), metrics_params)
|
.with_metrics(Some(metrics_prefix::<P>()), metrics_params)
|
||||||
.loop_metric(|registry, prefix| ExchangeLoopMetrics::new(registry, prefix))?
|
.loop_metric(ExchangeLoopMetrics::new)?
|
||||||
.standalone_metric(|registry, prefix| GlobalMetrics::new(registry, prefix))?
|
.standalone_metric(GlobalMetrics::new)?
|
||||||
.expose()
|
.expose()
|
||||||
.await?
|
.await?
|
||||||
.run(metrics_prefix::<P>(), move |source_client, target_client, metrics| {
|
.run(metrics_prefix::<P>(), move |source_client, target_client, metrics| {
|
||||||
|
|||||||
@@ -114,8 +114,8 @@ pub async fn run<P: FinalitySyncPipeline>(
|
|||||||
let exit_signal = exit_signal.shared();
|
let exit_signal = exit_signal.shared();
|
||||||
relay_utils::relay_loop(source_client, target_client)
|
relay_utils::relay_loop(source_client, target_client)
|
||||||
.with_metrics(Some(metrics_prefix::<P>()), metrics_params)
|
.with_metrics(Some(metrics_prefix::<P>()), metrics_params)
|
||||||
.loop_metric(|registry, prefix| SyncLoopMetrics::new(registry, prefix))?
|
.loop_metric(SyncLoopMetrics::new)?
|
||||||
.standalone_metric(|registry, prefix| GlobalMetrics::new(registry, prefix))?
|
.standalone_metric(GlobalMetrics::new)?
|
||||||
.expose()
|
.expose()
|
||||||
.await?
|
.await?
|
||||||
.run(metrics_prefix::<P>(), move |source_client, target_client, metrics| {
|
.run(metrics_prefix::<P>(), move |source_client, target_client, metrics| {
|
||||||
|
|||||||
@@ -147,8 +147,8 @@ pub async fn run<P: HeadersSyncPipeline, TC: TargetClient<P>>(
|
|||||||
let exit_signal = exit_signal.shared();
|
let exit_signal = exit_signal.shared();
|
||||||
relay_utils::relay_loop(source_client, target_client)
|
relay_utils::relay_loop(source_client, target_client)
|
||||||
.with_metrics(Some(metrics_prefix::<P>()), metrics_params)
|
.with_metrics(Some(metrics_prefix::<P>()), metrics_params)
|
||||||
.loop_metric(|registry, prefix| SyncLoopMetrics::new(registry, prefix))?
|
.loop_metric(SyncLoopMetrics::new)?
|
||||||
.standalone_metric(|registry, prefix| GlobalMetrics::new(registry, prefix))?
|
.standalone_metric(GlobalMetrics::new)?
|
||||||
.expose()
|
.expose()
|
||||||
.await?
|
.await?
|
||||||
.run(metrics_prefix::<P>(), move |source_client, target_client, metrics| {
|
.run(metrics_prefix::<P>(), move |source_client, target_client, metrics| {
|
||||||
|
|||||||
@@ -268,8 +268,8 @@ pub async fn run<P: MessageLane>(
|
|||||||
relay_utils::relay_loop(source_client, target_client)
|
relay_utils::relay_loop(source_client, target_client)
|
||||||
.reconnect_delay(params.reconnect_delay)
|
.reconnect_delay(params.reconnect_delay)
|
||||||
.with_metrics(Some(metrics_prefix::<P>(¶ms.lane)), metrics_params)
|
.with_metrics(Some(metrics_prefix::<P>(¶ms.lane)), metrics_params)
|
||||||
.loop_metric(|registry, prefix| MessageLaneLoopMetrics::new(registry, prefix))?
|
.loop_metric(MessageLaneLoopMetrics::new)?
|
||||||
.standalone_metric(|registry, prefix| GlobalMetrics::new(registry, prefix))?
|
.standalone_metric(GlobalMetrics::new)?
|
||||||
.expose()
|
.expose()
|
||||||
.await?
|
.await?
|
||||||
.run(metrics_prefix::<P>(¶ms.lane), move |source_client, target_client, metrics| {
|
.run(metrics_prefix::<P>(¶ms.lane), move |source_client, target_client, metrics| {
|
||||||
|
|||||||
Reference in New Issue
Block a user