From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Thu, 25 Oct 2018 19:19:06 +0000 (-0400)
Subject: Merge pull request #220 from TheBlueMatt/2018-10-oops-xxx
X-Git-Tag: v0.0.12~288
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f5ff5d1ad011a43a4ed1b86c29bf7ea67dca6f17;hp=3bcd911fcb112551525521dc3d16b88e07314318;p=rust-lightning

Merge pull request #220 from TheBlueMatt/2018-10-oops-xxx

Fix XXXs that slipped into router and handle HTLCFailCHannelUpdates
---

diff --git a/.travis.yml b/.travis.yml
index 6a21dfa0..efdff130 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ rust:
   - stable
   - beta
   - 1.22.0
+  - 1.29.2
 cache: cargo
 
 before_install:
@@ -12,4 +13,4 @@ before_install:
 script:
   - cargo build --verbose
   - cargo test --verbose
-  - if [ "$(rustup show | grep default | grep stable)" != "" ]; then cd fuzz && cargo test --verbose && ./travis-fuzz.sh; fi
+  - if [ "$(rustup show | grep default | grep 1.29.2)" != "" ]; then cd fuzz && cargo test --verbose && ./travis-fuzz.sh; fi
diff --git a/src/ln/router.rs b/src/ln/router.rs
index 4c3bcb98..0d049f5a 100644
--- a/src/ln/router.rs
+++ b/src/ln/router.rs
@@ -349,18 +349,25 @@ impl RoutingMessageHandler for Router {
 			&msgs::HTLCFailChannelUpdate::ChannelUpdateMessage { ref msg } => {
 				let _ = self.handle_channel_update(msg);
 			},
-			&msgs::HTLCFailChannelUpdate::ChannelClosed { ref short_channel_id, is_permanent:_ } => {
-//XXX
+			&msgs::HTLCFailChannelUpdate::ChannelClosed { ref short_channel_id, ref is_permanent } => {
 				let mut network = self.network_map.write().unwrap();
-				if let Some(chan) = network.channels.remove(short_channel_id) {
-					Self::remove_channel_in_nodes(&mut network.nodes, &chan, *short_channel_id);
+				if *is_permanent {
+					if let Some(chan) = network.channels.remove(short_channel_id) {
+						Self::remove_channel_in_nodes(&mut network.nodes, &chan, *short_channel_id);
+					}
+				} else {
+					if let Some(chan) = network.channels.get_mut(short_channel_id) {
+						chan.one_to_two.enabled = false;
+						chan.two_to_one.enabled = false;
+					}
 				}
 			},
-			&msgs::HTLCFailChannelUpdate::NodeFailure { ref node_id, is_permanent:_ } => {
-//XXX
-				//let mut network = self.network_map.write().unwrap();
-				//TODO: check _blamed_upstream_node
-				self.mark_node_bad(node_id, false);
+			&msgs::HTLCFailChannelUpdate::NodeFailure { ref node_id, ref is_permanent } => {
+				if *is_permanent {
+					//TODO: Wholly remove the node
+				} else {
+					self.mark_node_bad(node_id, false);
+				}
 			},
 		}
 	}