From: Matt Corallo <git@bluematt.me>
Date: Sat, 28 Jul 2018 21:39:33 +0000 (-0400)
Subject: Some match -> if let replacement
X-Git-Tag: v0.0.12~358^2~1
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=b22519c0f92a2d581bc637ffd127ae28700ec9f2;p=rust-lightning

Some match -> if let replacement
---

diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index 707a262b1..b1013ad12 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -1624,20 +1624,14 @@ impl ChannelMessageHandler for ChannelManager {
 		// destination. That's OK since those nodes are probably busted or trying to do network
 		// mapping through repeated loops. In either case, we want them to stop talking to us, so
 		// we send permanent_node_failure.
-		match &claimable_htlcs_entry {
-			&hash_map::Entry::Occupied(ref e) => {
-				let mut acceptable_cycle = false;
-				match e.get() {
-					&PendingOutboundHTLC::OutboundRoute { .. } => {
-						acceptable_cycle = pending_forward_info.short_channel_id == 0;
-					},
-					_ => {},
-				}
-				if !acceptable_cycle {
-					return_err!("Payment looped through us twice", 0x4000 | 0x2000 | 2, &[0;0]);
-				}
-			},
-			_ => {},
+		if let &hash_map::Entry::Occupied(ref e) = &claimable_htlcs_entry {
+			let mut acceptable_cycle = false;
+			if let &PendingOutboundHTLC::OutboundRoute { .. } = e.get() {
+				acceptable_cycle = pending_forward_info.short_channel_id == 0;
+			}
+			if !acceptable_cycle {
+				return_err!("Payment looped through us twice", 0x4000 | 0x2000 | 2, &[0;0]);
+			}
 		}
 
 		let (source_short_channel_id, res) = match channel_state.by_id.get_mut(&msg.channel_id) {