Rust 1.54.0 lints (#2483)

## Issue Addressed

N/A

## Proposed Changes

- Removing a bunch of unnecessary references
- Updated `Error::VariantError` to `Error::Variant`
- There were additional enum variant lints that I ignored, because I thought our variant names were fine
- removed `MonitoredValidator`'s `pubkey` field, because I couldn't find it used anywhere. It looks like we just use the string version of the pubkey (the `id` field) if there is no index

## Additional Info



Co-authored-by: realbigsean <seananderson33@gmail.com>

beacon_node/eth2_libp2p/src/discovery/enr.rs

@@ -67,7 +67,7 @@ pub fn use_or_load_enr(
                     Ok(disk_enr) => {
                         // if the same node id, then we may need to update our sequence number
                         if local_enr.node_id() == disk_enr.node_id() {
-                            if compare_enr(&local_enr, &disk_enr) {
+                            if compare_enr(local_enr, &disk_enr) {
                                 debug!(log, "ENR loaded from disk"; "file" => ?enr_f);
                                 // the stored ENR has the same configuration, use it
                                 *local_enr = disk_enr;
@@ -92,7 +92,7 @@ pub fn use_or_load_enr(
         }
     }
 
-    save_enr_to_disk(&config.network_dir, &local_enr, log);
+    save_enr_to_disk(&config.network_dir, local_enr, log);
 
     Ok(())
 }
@@ -193,7 +193,7 @@ pub fn load_enr_from_disk(dir: &Path) -> Result<Enr, String> {
 pub fn save_enr_to_disk(dir: &Path, enr: &Enr, log: &slog::Logger) {
     let _ = std::fs::create_dir_all(dir);
     match File::create(dir.join(Path::new(ENR_FILENAME)))
-        .and_then(|mut f| f.write_all(&enr.to_base64().as_bytes()))
+        .and_then(|mut f| f.write_all(enr.to_base64().as_bytes()))
     {
         Ok(_) => {
             debug!(log, "ENR written to disk");

beacon_node/eth2_libp2p/src/discovery/enr_ext.rs

@@ -254,7 +254,7 @@ pub fn peer_id_to_node_id(peer_id: &PeerId) -> Result<discv5::enr::NodeId, Strin
             let uncompressed_key_bytes = &pk.encode_uncompressed()[1..];
             let mut output = [0_u8; 32];
             let mut hasher = Keccak::v256();
-            hasher.update(&uncompressed_key_bytes);
+            hasher.update(uncompressed_key_bytes);
             hasher.finalize(&mut output);
             Ok(discv5::enr::NodeId::parse(&output).expect("Must be correct length"))
         }

beacon_node/eth2_libp2p/src/discovery/mod.rs

@@ -198,7 +198,7 @@ impl<TSpec: EthSpec> Discovery<TSpec> {
         let listen_socket = SocketAddr::new(config.listen_address, config.discovery_port);
 
         // convert the keypair into an ENR key
-        let enr_key: CombinedKey = CombinedKey::from_libp2p(&local_key)?;
+        let enr_key: CombinedKey = CombinedKey::from_libp2p(local_key)?;
 
         let mut discv5 = Discv5::new(local_enr, enr_key, config.discv5_config.clone())
             .map_err(|e| format!("Discv5 service failed. Error: {:?}", e))?;

beacon_node/eth2_libp2p/src/peer_manager/mod.rs

@@ -778,7 +778,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
     ) -> bool {
         {
             let mut peerdb = self.network_globals.peers.write();
-            if peerdb.is_banned(&peer_id) {
+            if peerdb.is_banned(peer_id) {
                 // don't connect if the peer is banned
                 slog::crit!(self.log, "Connection has been allowed to a banned peer"; "peer_id" => %peer_id);
             }
@@ -952,7 +952,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
     /// previous bans from discovery.
     fn unban_peer(&mut self, peer_id: &PeerId) -> Result<(), &'static str> {
         let mut peer_db = self.network_globals.peers.write();
-        peer_db.unban(&peer_id)?;
+        peer_db.unban(peer_id)?;
 
         let seen_ip_addresses = peer_db
             .peer_info(peer_id)

beacon_node/eth2_libp2p/src/peer_manager/peerdb.rs

@@ -319,7 +319,7 @@ impl<TSpec: EthSpec> PeerDB<TSpec> {
         let mut by_status = self
             .peers
             .iter()
-            .filter(|(_, info)| is_status(&info))
+            .filter(|(_, info)| is_status(info))
             .collect::<Vec<_>>();
         by_status.sort_by_key(|(_, info)| info.score());
         by_status.into_iter().rev().collect()
@@ -332,7 +332,7 @@ impl<TSpec: EthSpec> PeerDB<TSpec> {
     {
         self.peers
             .iter()
-            .filter(|(_, info)| is_status(&info))
+            .filter(|(_, info)| is_status(info))
             .max_by_key(|(_, info)| info.score())
             .map(|(id, _)| id)
     }
@@ -1066,7 +1066,7 @@ mod tests {
         let mut socker_addr = Multiaddr::from(ip2);
         socker_addr.push(Protocol::Tcp(8080));
         for p in &peers {
-            pdb.connect_ingoing(&p, socker_addr.clone(), None);
+            pdb.connect_ingoing(p, socker_addr.clone(), None);
             pdb.disconnect_and_ban(p);
             pdb.inject_disconnect(p);
             pdb.disconnect_and_ban(p);
@@ -1078,7 +1078,7 @@ mod tests {
 
         // unban all peers
         for p in &peers {
-            reset_score(&mut pdb, &p);
+            reset_score(&mut pdb, p);
             pdb.unban(p).unwrap();
         }
 

beacon_node/eth2_libp2p/src/service.rs

@@ -578,6 +578,6 @@ fn load_or_build_metadata<E: EthSpec>(
     };
 
     debug!(log, "Metadata sequence number"; "seq_num" => meta_data.seq_number);
-    save_metadata_to_disk(network_dir, meta_data.clone(), &log);
+    save_metadata_to_disk(network_dir, meta_data.clone(), log);
     meta_data
 }