clippy

core/src/banking_stage.rs

@@ -2633,7 +2633,7 @@ mod tests {
                     // should still be unprocessed
                     assert_eq!(
                         buffered_packets.len(),
-                        packets_vec[interrupted_iteration + 1..].iter().count()
+                        packets_vec[interrupted_iteration + 1..].len()
                     );
                     for ((remaining_unprocessed_packet, _, _forwarded), original_packet) in
                         buffered_packets

core/src/broadcast_stage/standard_broadcast_run.rs

@@ -261,7 +261,6 @@ impl StandardBroadcastRun {
             num_expected_batches,
             slot_start_ts: self
                 .slot_broadcast_start
-                .clone()
                 .expect("Start timestamp must exist for a slot if we're broadcasting the slot"),
         });
         get_leader_schedule_time.stop();

core/src/cluster_info_vote_listener.rs

@@ -1430,26 +1430,19 @@ mod tests {
             let slot_vote_tracker = vote_tracker.get_slot_vote_tracker(vote_slot).unwrap();
             let r_slot_vote_tracker = &slot_vote_tracker.read().unwrap();
 
+            assert_eq!(
+                r_slot_vote_tracker
+                    .optimistic_votes_tracker(&vote_bank_hash)
+                    .unwrap()
+                    .stake(),
+                100
+            );
             if events == vec![1] {
                 // Check `gossip_only_stake` is not incremented
-                assert_eq!(
-                    r_slot_vote_tracker
-                        .optimistic_votes_tracker(&vote_bank_hash)
-                        .unwrap()
-                        .stake(),
-                    100
-                );
                 assert_eq!(r_slot_vote_tracker.gossip_only_stake, 0);
             } else {
                 // Check that both the `gossip_only_stake` and `total_voted_stake` both
                 // increased
-                assert_eq!(
-                    r_slot_vote_tracker
-                        .optimistic_votes_tracker(&vote_bank_hash)
-                        .unwrap()
-                        .stake(),
-                    100
-                );
                 assert_eq!(r_slot_vote_tracker.gossip_only_stake, 100);
             }
         }

core/src/commitment_service.rs

@@ -315,15 +315,13 @@ mod tests {
         );
 
         for a in ancestors {
+            let mut expected = BlockCommitment::default();
             if a <= root {
-                let mut expected = BlockCommitment::default();
                 expected.increase_rooted_stake(lamports);
-                assert_eq!(*commitment.get(&a).unwrap(), expected);
             } else {
-                let mut expected = BlockCommitment::default();
                 expected.increase_confirmation_stake(1, lamports);
-                assert_eq!(*commitment.get(&a).unwrap(), expected);
             }
+            assert_eq!(*commitment.get(&a).unwrap(), expected);
         }
         assert_eq!(rooted_stake[0], (root, lamports));
     }

core/src/consensus.rs

@@ -1210,7 +1210,7 @@ impl SavedTower {
     pub fn new<T: Signer>(tower: &Tower, keypair: &Arc<T>) -> Result<Self> {
         let data = bincode::serialize(tower)?;
         let signature = keypair.sign_message(&data);
-        Ok(Self { data, signature })
+        Ok(Self { signature, data })
     }
 
     pub fn verify(&self, pubkey: &Pubkey) -> bool {

core/src/progress_map.rs

@@ -191,11 +191,11 @@ impl ForkProgress {
             num_blocks_on_fork,
             num_dropped_blocks_on_fork,
             propagated_stats: PropagatedStats {
-                prev_leader_slot,
-                is_leader_slot,
-                propagated_validators_stake,
                 propagated_validators,
+                propagated_validators_stake,
                 is_propagated,
+                is_leader_slot,
+                prev_leader_slot,
                 total_epoch_stake,
                 ..PropagatedStats::default()
             },

core/src/retransmit_stage.rs

@@ -175,7 +175,7 @@ fn update_retransmit_stats(
             ),
         );
         let mut packets_by_slot = stats.packets_by_slot.lock().unwrap();
-        let old_packets_by_slot = std::mem::replace(&mut *packets_by_slot, BTreeMap::new());
+        let old_packets_by_slot = std::mem::take(&mut *packets_by_slot);
         drop(packets_by_slot);
 
         for (slot, num_shreds) in old_packets_by_slot {

core/src/rpc.rs

@@ -981,7 +981,7 @@ impl JsonRpcRequestProcessor {
                 return Ok(self
                     .runtime
                     .block_on(bigtable_ledger_storage.get_confirmed_blocks(start_slot, limit))
-                    .unwrap_or_else(|_| vec![]));
+                    .unwrap_or_default());
             }
         }
 
@@ -1247,7 +1247,7 @@ impl JsonRpcRequestProcessor {
             );
             self.blockstore
                 .get_confirmed_signatures_for_address(pubkey, start_slot, end_slot)
-                .unwrap_or_else(|_| vec![])
+                .unwrap_or_default()
         } else {
             vec![]
         }

core/src/rpc_subscriptions.rs

@@ -482,8 +482,8 @@ impl RpcSubscriptions {
         let exit_clone = exit.clone();
         let subscriptions = Subscriptions {
             account_subscriptions,
-            logs_subscriptions,
             program_subscriptions,
+            logs_subscriptions,
             signature_subscriptions,
             gossip_account_subscriptions,
             gossip_logs_subscriptions,

core/src/test_validator.rs

@@ -504,8 +504,8 @@ impl TestValidator {
             preserve_ledger,
             rpc_pubsub_url,
             rpc_url,
-            gossip,
             tpu,
+            gossip,
             validator,
             vote_account_address,
         })