Updated to comply with new clippy formatting rules (#2336)

## Issue Addressed

The latest version of Rust has new clippy rules & the codebase isn't up to date with them.

## Proposed Changes

Small formatting changes that clippy tells me are functionally equivalent

beacon_node/beacon_chain/src/builder.rs

@@ -306,8 +306,8 @@ where
             })?;
 
         let genesis = BeaconSnapshot {
-            beacon_block_root,
             beacon_block,
+            beacon_block_root,
             beacon_state,
         };
 

beacon_node/beacon_chain/src/eth1_chain.rs

@@ -612,11 +612,9 @@ fn collect_valid_votes<T: EthSpec>(
         .eth1_data_votes
         .iter()
         .filter_map(|vote| {
-            if let Some(block_num) = votes_to_consider.get(vote) {
+            votes_to_consider
-                Some((vote.clone(), *block_num))
+                .get(vote)
-            } else {
+                .map(|block_num| (vote.clone(), *block_num))
-                None
-            }
         })
         .for_each(|(eth1_data, block_number)| {
             valid_votes

beacon_node/eth1/src/http.rs

@@ -73,7 +73,7 @@ impl FromStr for Eth1Id {
     type Err = String;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        u64::from_str_radix(s, 10)
+        s.parse::<u64>()
             .map(Into::into)
             .map_err(|e| format!("Failed to parse eth1 network id {}", e))
     }

beacon_node/eth2_libp2p/src/discovery/enr_ext.rs

@@ -299,7 +299,7 @@ mod tests {
         let sk_bytes = hex::decode(sk_hex).unwrap();
         let secret = discv5::enr::ed25519_dalek::SecretKey::from_bytes(&sk_bytes).unwrap();
         let public = discv5::enr::ed25519_dalek::PublicKey::from(&secret);
-        let keypair = discv5::enr::ed25519_dalek::Keypair { public, secret };
+        let keypair = discv5::enr::ed25519_dalek::Keypair { secret, public };
 
         let libp2p_sk = libp2p::identity::ed25519::SecretKey::from_bytes(sk_bytes).unwrap();
         let ed25519_kp: libp2p::identity::ed25519::Keypair = libp2p_sk.into();

beacon_node/eth2_libp2p/src/service.rs

@@ -233,9 +233,9 @@ impl<TSpec: EthSpec> Service<TSpec> {
         }
 
         let service = Service {
-            local_peer_id,
-            bandwidth,
             swarm,
+            bandwidth,
+            local_peer_id,
             log,
         };
 

beacon_node/eth2_libp2p/src/types/topics.rs

@@ -81,8 +81,8 @@ impl GossipTopic {
     pub fn new(kind: GossipKind, encoding: GossipEncoding, fork_digest: [u8; 4]) -> Self {
         GossipTopic {
             encoding,
-            kind,
             fork_digest,
+            kind,
         }
     }
 
@@ -135,8 +135,8 @@ impl GossipTopic {
 
             return Ok(GossipTopic {
                 encoding,
-                kind,
                 fork_digest,
+                kind,
             });
         }
 
@@ -195,7 +195,10 @@ pub fn subnet_id_from_topic_hash(topic_hash: &TopicHash) -> Option<SubnetId> {
 fn committee_topic_index(topic: &str) -> Option<SubnetId> {
     if topic.starts_with(BEACON_ATTESTATION_PREFIX) {
         return Some(SubnetId::new(
-            u64::from_str_radix(topic.trim_start_matches(BEACON_ATTESTATION_PREFIX), 10).ok()?,
+            topic
+                .trim_start_matches(BEACON_ATTESTATION_PREFIX)
+                .parse::<u64>()
+                .ok()?,
         ));
     }
     None

beacon_node/http_api/src/lib.rs

@@ -1355,7 +1355,7 @@ pub fn serve<T: BeaconChainTypes>(
                 let heads = chain
                     .heads()
                     .into_iter()
-                    .map(|(root, slot)| api_types::ChainHeadData { root, slot })
+                    .map(|(root, slot)| api_types::ChainHeadData { slot, root })
                     .collect::<Vec<_>>();
                 Ok(api_types::GenericResponse::from(heads))
             })
@@ -1623,10 +1623,10 @@ pub fn serve<T: BeaconChainTypes>(
                     });
 
                 Ok(api_types::GenericResponse::from(api_types::PeerCount {
-                    disconnecting,
-                    connecting,
                     connected,
+                    connecting,
                     disconnected,
+                    disconnecting,
                 }))
             })
         });

beacon_node/network/src/beacon_processor/worker/rpc_methods.rs

@@ -197,10 +197,7 @@ impl<T: BeaconChainTypes> Worker<T> {
         };
 
         // remove all skip slots
-        let block_roots = block_roots
+        let block_roots = block_roots.into_iter().flatten().collect::<Vec<_>>();
-            .into_iter()
-            .filter_map(|root| root)
-            .collect::<Vec<_>>();
 
         let mut blocks_sent = 0;
         for root in block_roots {

consensus/types/src/slot_epoch_macros.rs

@@ -572,10 +572,8 @@ macro_rules! math_tests {
         #[test]
         fn checked_div() {
             let assert_checked_div = |a: u64, b: u64, result: Option<u64>| {
-                let division_result_as_u64 = match $type(a).safe_div($type(b)).ok() {
+                let division_result_as_u64 =
-                    None => None,
+                    $type(a).safe_div($type(b)).ok().map(|val| val.as_u64());
-                    Some(val) => Some(val.as_u64()),
-                };
                 assert_eq!(division_result_as_u64, result);
             };
 

slasher/src/slasher.rs

@@ -38,10 +38,10 @@ impl<E: EthSpec> Slasher<E> {
         let block_queue = BlockQueue::default();
         Ok(Self {
             db,
-            attester_slashings,
-            proposer_slashings,
             attestation_queue,
             block_queue,
+            attester_slashings,
+            proposer_slashings,
             config,
             log,
         })

testing/eth1_test_rig/src/ganache.rs

@@ -62,8 +62,8 @@ impl GanacheInstance {
         child.stdout = Some(reader.into_inner());
 
         Ok(Self {
-            child,
             port,
+            child,
             web3,
             network_id,
             chain_id,

testing/eth1_test_rig/src/lib.rs

@@ -104,7 +104,7 @@ impl DepositContract {
         })?;
         Contract::from_json(web3.clone().eth(), address, ABI)
             .map_err(|e| format!("Failed to init contract: {:?}", e))
-            .map(move |contract| Self { contract, web3 })
+            .map(move |contract| Self { web3, contract })
     }
 
     /// The deposit contract's address in `0x00ab...` format.

testing/state_transition_vectors/src/exit.rs

@@ -83,8 +83,8 @@ impl ExitTest {
 
         TestVector {
             title,
-            block,
             pre_state,
+            block,
             post_state,
             error,
         }

validator_client/src/http_api/api_secret.rs

@@ -133,7 +133,7 @@ impl ApiSecret {
             ));
         }
 
-        Ok(Self { sk, pk })
+        Ok(Self { pk, sk })
     }
 
     /// Returns the public key of `self` as a 0x-prefixed hex string.