Skip to content

Commit c2b38ba

Browse files
svyatonikbkchr
authored andcommitted
fix clippy things (#1200)
1 parent 4812160 commit c2b38ba

File tree

9 files changed

+26
-26
lines changed

9 files changed

+26
-26
lines changed

bridges/bin/rialto/node/src/overseer.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ where
113113

114114
/// Obtain a prepared `OverseerBuilder`, that is initialized
115115
/// with all default values.
116-
pub fn prepared_overseer_builder<'a, Spawner, RuntimeClient>(
116+
pub fn prepared_overseer_builder<Spawner, RuntimeClient>(
117117
OverseerGenArgs {
118118
leaves,
119119
keystore,
@@ -134,7 +134,7 @@ pub fn prepared_overseer_builder<'a, Spawner, RuntimeClient>(
134134
candidate_validation_config,
135135
chain_selection_config,
136136
dispute_coordinator_config,
137-
}: OverseerGenArgs<'a, Spawner, RuntimeClient>,
137+
}: OverseerGenArgs<'_, Spawner, RuntimeClient>,
138138
) -> Result<
139139
OverseerBuilder<
140140
Spawner,
@@ -236,7 +236,7 @@ where
236236
approval_voting_config,
237237
parachains_db.clone(),
238238
keystore.clone(),
239-
Box::new(network_service.clone()),
239+
Box::new(network_service),
240240
Metrics::register(registry)?,
241241
))
242242
.gossip_support(GossipSupportSubsystem::new(
@@ -251,9 +251,9 @@ where
251251
))
252252
.dispute_participation(DisputeParticipationSubsystem::new())
253253
.dispute_distribution(DisputeDistributionSubsystem::new(
254-
keystore.clone(),
254+
keystore,
255255
dispute_req_receiver,
256-
authority_discovery_service.clone(),
256+
authority_discovery_service,
257257
Metrics::register(registry)?,
258258
))
259259
.chain_selection(ChainSelectionSubsystem::new(chain_selection_config, parachains_db))
@@ -278,10 +278,10 @@ where
278278
/// would do.
279279
pub trait OverseerGen {
280280
/// Overwrite the full generation of the overseer, including the subsystems.
281-
fn generate<'a, Spawner, RuntimeClient>(
281+
fn generate<Spawner, RuntimeClient>(
282282
&self,
283283
connector: OverseerConnector,
284-
args: OverseerGenArgs<'a, Spawner, RuntimeClient>,
284+
args: OverseerGenArgs<'_, Spawner, RuntimeClient>,
285285
) -> Result<(Overseer<Spawner, Arc<RuntimeClient>>, OverseerHandle), Error>
286286
where
287287
RuntimeClient: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore,
@@ -302,10 +302,10 @@ use polkadot_overseer::KNOWN_LEAVES_CACHE_SIZE;
302302
pub struct RealOverseerGen;
303303

304304
impl OverseerGen for RealOverseerGen {
305-
fn generate<'a, Spawner, RuntimeClient>(
305+
fn generate<Spawner, RuntimeClient>(
306306
&self,
307307
connector: OverseerConnector,
308-
args: OverseerGenArgs<'a, Spawner, RuntimeClient>,
308+
args: OverseerGenArgs<'_, Spawner, RuntimeClient>,
309309
) -> Result<(Overseer<Spawner, Arc<RuntimeClient>>, OverseerHandle), Error>
310310
where
311311
RuntimeClient: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block> + AuxStore,

bridges/bin/rialto/node/src/service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ where
613613
statement_req_receiver,
614614
},
615615
)?;
616-
let handle = Handle::new(overseer_handle.clone());
616+
let handle = Handle::new(overseer_handle);
617617

618618
{
619619
let handle = handle.clone();

bridges/relays/bin-ethereum/src/ethereum_deploy_contract.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ async fn prepare_initial_header(
118118
let initial_header = sub_client.header_by_number(Zero::zero()).await;
119119
initial_header
120120
.map(|header| (HeaderId(Zero::zero(), header.hash()), header.encode()))
121-
.map_err(|error| Error::ReadGenesisHeader(error))
121+
.map_err(Error::ReadGenesisHeader)
122122
},
123123
}
124124
}
@@ -134,7 +134,7 @@ async fn prepare_initial_authorities_set(
134134
None => sub_client.grandpa_authorities_set(sub_initial_header_hash).await,
135135
};
136136

137-
initial_authorities_set.map_err(|error| Error::ReadAuthorities(error))
137+
initial_authorities_set.map_err(Error::ReadAuthorities)
138138
}
139139

140140
/// Deploy bridge contract to Ethereum chain.
@@ -160,5 +160,5 @@ async fn deploy_bridge_contract(
160160
),
161161
)
162162
.await
163-
.map_err(|error| Error::DeployContract(error))
163+
.map_err(Error::DeployContract)
164164
}

bridges/relays/bin-substrate/src/cli/relay_headers_and_messages.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,10 @@ impl RelayHeadersAndMessages {
512512
let left_to_right_messages = left_to_right_messages(MessagesRelayParams {
513513
source_client: left_client.clone(),
514514
source_sign: left_sign.clone(),
515-
source_transactions_mortality: left_transactions_mortality.clone(),
515+
source_transactions_mortality: left_transactions_mortality,
516516
target_client: right_client.clone(),
517517
target_sign: right_sign.clone(),
518-
target_transactions_mortality: right_transactions_mortality.clone(),
518+
target_transactions_mortality: right_transactions_mortality,
519519
source_to_target_headers_relay: Some(left_to_right_on_demand_headers.clone()),
520520
target_to_source_headers_relay: Some(right_to_left_on_demand_headers.clone()),
521521
lane_id: lane,
@@ -531,10 +531,10 @@ impl RelayHeadersAndMessages {
531531
let right_to_left_messages = right_to_left_messages(MessagesRelayParams {
532532
source_client: right_client.clone(),
533533
source_sign: right_sign.clone(),
534-
source_transactions_mortality: right_transactions_mortality.clone(),
534+
source_transactions_mortality: right_transactions_mortality,
535535
target_client: left_client.clone(),
536536
target_sign: left_sign.clone(),
537-
target_transactions_mortality: left_transactions_mortality.clone(),
537+
target_transactions_mortality: left_transactions_mortality,
538538
source_to_target_headers_relay: Some(right_to_left_on_demand_headers.clone()),
539539
target_to_source_headers_relay: Some(left_to_right_on_demand_headers.clone()),
540540
lane_id: lane,

bridges/relays/bin-substrate/src/cli/resubmit_transactions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ mod tests {
552552
// when we resubmit tx for the second time, 1/9 of queue is skipped
553553
context = context.notice_resubmitted_transaction(Hash::from([3; 32]));
554554
assert_eq!(
555-
select_transaction_from_queue(queued_transactions.clone(), &context),
555+
select_transaction_from_queue(queued_transactions, &context),
556556
Some(Bytes(vec![1])),
557557
);
558558
}

bridges/relays/exchange/src/exchange_loop.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ pub async fn run<P: TransactionProofPipeline>(
9999

100100
relay_utils::relay_loop(source_client, target_client)
101101
.with_metrics(Some(metrics_prefix::<P>()), metrics_params)
102-
.loop_metric(|registry, prefix| ExchangeLoopMetrics::new(registry, prefix))?
103-
.standalone_metric(|registry, prefix| GlobalMetrics::new(registry, prefix))?
102+
.loop_metric(ExchangeLoopMetrics::new)?
103+
.standalone_metric(GlobalMetrics::new)?
104104
.expose()
105105
.await?
106106
.run(metrics_prefix::<P>(), move |source_client, target_client, metrics| {

bridges/relays/finality/src/finality_loop.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ pub async fn run<P: FinalitySyncPipeline>(
114114
let exit_signal = exit_signal.shared();
115115
relay_utils::relay_loop(source_client, target_client)
116116
.with_metrics(Some(metrics_prefix::<P>()), metrics_params)
117-
.loop_metric(|registry, prefix| SyncLoopMetrics::new(registry, prefix))?
118-
.standalone_metric(|registry, prefix| GlobalMetrics::new(registry, prefix))?
117+
.loop_metric(SyncLoopMetrics::new)?
118+
.standalone_metric(GlobalMetrics::new)?
119119
.expose()
120120
.await?
121121
.run(metrics_prefix::<P>(), move |source_client, target_client, metrics| {

bridges/relays/headers/src/sync_loop.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ pub async fn run<P: HeadersSyncPipeline, TC: TargetClient<P>>(
147147
let exit_signal = exit_signal.shared();
148148
relay_utils::relay_loop(source_client, target_client)
149149
.with_metrics(Some(metrics_prefix::<P>()), metrics_params)
150-
.loop_metric(|registry, prefix| SyncLoopMetrics::new(registry, prefix))?
151-
.standalone_metric(|registry, prefix| GlobalMetrics::new(registry, prefix))?
150+
.loop_metric(SyncLoopMetrics::new)?
151+
.standalone_metric(GlobalMetrics::new)?
152152
.expose()
153153
.await?
154154
.run(metrics_prefix::<P>(), move |source_client, target_client, metrics| {

bridges/relays/messages/src/message_lane_loop.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ pub async fn run<P: MessageLane>(
268268
relay_utils::relay_loop(source_client, target_client)
269269
.reconnect_delay(params.reconnect_delay)
270270
.with_metrics(Some(metrics_prefix::<P>(&params.lane)), metrics_params)
271-
.loop_metric(|registry, prefix| MessageLaneLoopMetrics::new(registry, prefix))?
272-
.standalone_metric(|registry, prefix| GlobalMetrics::new(registry, prefix))?
271+
.loop_metric(MessageLaneLoopMetrics::new)?
272+
.standalone_metric(GlobalMetrics::new)?
273273
.expose()
274274
.await?
275275
.run(metrics_prefix::<P>(&params.lane), move |source_client, target_client, metrics| {

0 commit comments

Comments
 (0)