mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 15:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fix XXXs that slipped into router and handle HTLCFailCHannelUpdates
This commit is contained in:
Matt Corallo 2018-10-25 15:19:06 -04:00 • committed by GitHub
commit f5ff5d1ad0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -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

25
src/ln/router.rs
View file

@ -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);
}
},
}
}