Do not rely on auto-deref'ing when aaccessing a Hash{Map,Set}

In newer versions of `hashbrown` this code would be broken. While
we aren't updating `hashbrown` any time soon (as it requires an
MSRV bump), it is useful to swap for a newer `hashbrown` when
fuzzing, which this makes easier.

Author: TheBlueMatt

lightning/src/chain/onchaintx.rs

@@ -475,8 +475,8 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 		// remove it once it reaches the confirmation threshold, or to generate a new claim if the
 		// transaction is reorged out.
 		let mut all_inputs_have_confirmed_spend = true;
-		for outpoint in &request_outpoints {
-			if let Some(first_claim_txid_height) = self.claimable_outpoints.get(outpoint) {
+		for outpoint in request_outpoints.iter() {
+			if let Some(first_claim_txid_height) = self.claimable_outpoints.get(*outpoint) {
 				// We check for outpoint spends within claims individually rather than as a set
 				// since requests can have outpoints split off.
 				if !self.onchain_events_awaiting_threshold_conf.iter()
@@ -810,7 +810,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 							for outpoint in request.outpoints() {
 								log_debug!(logger, "Removing claim tracking for {} due to maturation of claim package {}.",
 									outpoint, log_bytes!(package_id));
-								self.claimable_outpoints.remove(&outpoint);
+								self.claimable_outpoints.remove(outpoint);
 								#[cfg(anchors)]
 								self.pending_claim_events.remove(&package_id);
 							}
@@ -819,7 +819,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 					OnchainEvent::ContentiousOutpoint { package } => {
 						log_debug!(logger, "Removing claim tracking due to maturation of claim tx for outpoints:");
 						log_debug!(logger, " {:?}", package.outpoints());
-						self.claimable_outpoints.remove(&package.outpoints()[0]);
+						self.claimable_outpoints.remove(package.outpoints()[0]);
 					}
 				}
 			} else {
@@ -897,7 +897,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 				//- resurect outpoint back in its claimable set and regenerate tx
 				match entry.event {
 					OnchainEvent::ContentiousOutpoint { package } => {
-						if let Some(ancestor_claimable_txid) = self.claimable_outpoints.get(&package.outpoints()[0]) {
+						if let Some(ancestor_claimable_txid) = self.claimable_outpoints.get(package.outpoints()[0]) {
 							if let Some(request) = self.pending_claim_requests.get_mut(&ancestor_claimable_txid.0) {
 								request.merge_package(package);
 								// Using a HashMap guarantee us than if we have multiple outpoints getting

lightning/src/ln/channelmanager.rs

@@ -1660,7 +1660,7 @@ where
 					}
 					let (shutdown_msg, monitor_update, htlcs) = {
 						let per_peer_state = self.per_peer_state.read().unwrap();
-						match per_peer_state.get(&counterparty_node_id) {
+						match per_peer_state.get(counterparty_node_id) {
 							Some(peer_state) => {
 								let peer_state = peer_state.lock().unwrap();
 								let their_features = &peer_state.latest_features;
@@ -2060,7 +2060,7 @@ where
 			// short_channel_id is non-0 in any ::Forward.
 			if let &PendingHTLCRouting::Forward { ref short_channel_id, .. } = routing {
 				if let Some((err, mut code, chan_update)) = loop {
-					let id_option = self.short_to_chan_info.read().unwrap().get(&short_channel_id).cloned();
+					let id_option = self.short_to_chan_info.read().unwrap().get(short_channel_id).cloned();
 					let mut channel_state = self.channel_state.lock().unwrap();
 					let forwarding_id_opt = match id_option {
 						None => { // unknown_next_peer
@@ -6782,7 +6782,7 @@ where
 			}
 		}
 
-		for (ref funding_txo, ref mut monitor) in args.channel_monitors.iter_mut() {
+		for (funding_txo, monitor) in args.channel_monitors.iter_mut() {
 			if !funding_txo_set.contains(funding_txo) {
 				log_info!(args.logger, "Broadcasting latest holder commitment transaction for closed channel {}", log_bytes!(funding_txo.to_channel_id()));
 				monitor.broadcast_latest_holder_commitment_txn(&args.tx_broadcaster, &args.logger);