more clippy

Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
paritytech · Dec 14, 2023 · 1021efb · 1021efb
1 parent bd128b3
commit 1021efb
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 23 deletions.
diff --git a/polkadot/node/subsystem-bench/src/availability/mod.rs b/polkadot/node/subsystem-bench/src/availability/mod.rs
@@ -253,7 +253,8 @@ impl TestState {
  candidate_receipt_templates.push(candidate_receipt);
  }
 
- let pov_sizes = config.pov_sizes().to_vec().into_iter().cycle();
+ let pov_sizes = config.pov_sizes().to_owned();
+ let pov_sizes = pov_sizes.into_iter().cycle();
  gum::info!(target: LOG_TARGET, "{}","Created test environment.".bright_blue());
 
  let mut _self = Self {

diff --git a/polkadot/node/subsystem-bench/src/core/configuration.rs b/polkadot/node/subsystem-bench/src/core/configuration.rs
@@ -107,7 +107,7 @@ pub struct TestSequence {
 }
 
 impl TestSequence {
- pub fn to_vec(self) -> Vec<TestConfiguration> {
+ pub fn into_vec(self) -> Vec<TestConfiguration> {
  self.test_configurations
  .into_iter()
  .map(|mut config| {

diff --git a/polkadot/node/subsystem-bench/src/core/display.rs b/polkadot/node/subsystem-bench/src/core/display.rs
@@ -44,7 +44,7 @@ impl MetricCollection {
  pub fn sum_by(&self, name: &str) -> f64 {
  self.all()
  .iter()
- .filter(|metric| &metric.name == name)
+ .filter(|metric| metric.name == name)
  .map(|metric| metric.value)
  .sum()
  }

diff --git a/polkadot/node/subsystem-bench/src/core/mock/av_store.rs b/polkadot/node/subsystem-bench/src/core/mock/av_store.rs
@@ -96,10 +96,10 @@ impl MockAvailabilityStore {
  let msg = ctx.recv().await.expect("Overseer never fails us");
 
  match msg {
- orchestra::FromOrchestra::Signal(signal) => match signal {
- OverseerSignal::Conclude => return,
- _ => {},
- },
+ orchestra::FromOrchestra::Signal(signal) =>
+ if signal == OverseerSignal::Conclude {
+  return
+  },
  orchestra::FromOrchestra::Communication { msg } => match msg {
  AvailabilityStoreMessage::QueryAvailableData(candidate_hash, tx) => {
  gum::debug!(target: LOG_TARGET, candidate_hash = ?candidate_hash, "Responding to QueryAvailableData");

diff --git a/polkadot/node/subsystem-bench/src/core/mock/network_bridge.rs b/polkadot/node/subsystem-bench/src/core/mock/network_bridge.rs
@@ -287,10 +287,10 @@ impl MockNetworkBridgeTx {
  let msg = ctx.recv().await.expect("Overseer never fails us");
 
  match msg {
- orchestra::FromOrchestra::Signal(signal) => match signal {
- OverseerSignal::Conclude => return,
- _ => {},
- },
+ orchestra::FromOrchestra::Signal(signal) =>
+ if signal == OverseerSignal::Conclude {
+  return
+  },
  orchestra::FromOrchestra::Communication { msg } => match msg {
  NetworkBridgeTxMessage::SendRequests(requests, _if_disconnected) => {
  for request in requests {

diff --git a/polkadot/node/subsystem-bench/src/core/mock/runtime_api.rs b/polkadot/node/subsystem-bench/src/core/mock/runtime_api.rs
@@ -84,10 +84,10 @@ impl MockRuntimeApi {
  let msg = ctx.recv().await.expect("Overseer never fails us");
 
  match msg {
- orchestra::FromOrchestra::Signal(signal) => match signal {
- OverseerSignal::Conclude => return,
- _ => {},
- },
+ orchestra::FromOrchestra::Signal(signal) =>
+ if signal == OverseerSignal::Conclude {
+  return
+  },
  orchestra::FromOrchestra::Communication { msg } => {
  gum::debug!(target: LOG_TARGET, msg=?msg, "recv message");
 

diff --git a/polkadot/node/subsystem-bench/src/core/network.rs b/polkadot/node/subsystem-bench/src/core/network.rs
@@ -117,7 +117,7 @@ mod tests {
  let mut reap_amount = 0;
  while rate_limiter.total_ticks < tick_rate {
  reap_amount += 1;
- reap_amount = reap_amount % 100;
+ reap_amount %= 100;
 
  rate_limiter.reap(reap_amount).await;
  total_sent += reap_amount;
@@ -290,11 +290,7 @@ impl Peer {
  }
 
  pub fn is_connected(&self) -> bool {
- if let Peer::Connected(_) = self {
- true
- } else {
- false
- }
+ matches!(self, Peer::Connected(_))
  }
 
  pub fn emulator(&mut self) -> &mut PeerEmulator {
@@ -333,7 +329,7 @@ impl NetworkEmulator {
 
  // Create a `PeerEmulator` for each peer.
  let (stats, mut peers): (_, Vec<_>) = (0..n_peers)
- .zip(authorities.validator_authority_id.clone().into_iter())
+ .zip(authorities.validator_authority_id.clone())
  .map(|(peer_index, authority_id)| {
  validator_authority_id_mapping.insert(authority_id, peer_index);
  let stats = Arc::new(PeerEmulatorStats::new(peer_index, metrics.clone()));

diff --git a/polkadot/node/subsystem-bench/src/subsystem-bench.rs b/polkadot/node/subsystem-bench/src/subsystem-bench.rs
@@ -88,7 +88,7 @@ impl BenchCli {
  let test_sequence =
  core::configuration::TestSequence::new_from_file(Path::new(&options.path))
  .expect("File exists")
- .to_vec();
+ .into_vec();
  let num_steps = test_sequence.len();
  gum::info!(
  "{}",