f - s/fail_channel_update/network_update in onion_utils.rs

Author: jkczyz

lightning/src/ln/onion_utils.rs

@@ -383,13 +383,13 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(secp_ctx: &
 						} && is_from_final_node) // PERM bit observed below even this error is from the intermediate nodes
 						|| error_code == 21; // Special case error 21 as the Route object is bogus, TODO: Maybe fail the node if the CLTV was reasonable?
 
-						let mut fail_channel_update = None;
+						let mut network_update = None;
 
 						if error_code & NODE == NODE {
-							fail_channel_update = Some(NetworkUpdate::NodeFailure { node_id: route_hop.pubkey, is_permanent: error_code & PERM == PERM });
+							network_update = Some(NetworkUpdate::NodeFailure { node_id: route_hop.pubkey, is_permanent: error_code & PERM == PERM });
 						}
 						else if error_code & PERM == PERM {
-							fail_channel_update = if payment_failed { None } else { Some(NetworkUpdate::ChannelClosed {
+							network_update = if payment_failed { None } else { Some(NetworkUpdate::ChannelClosed {
 								short_channel_id: path[next_route_hop_ix - if next_route_hop_ix == path.len() { 1 } else { 0 }].short_channel_id,
 								is_permanent: true,
 							})};
@@ -413,7 +413,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(secp_ctx: &
 											20 => chan_update.contents.flags & 2 == 0,
 											_ => false, // unknown error code; take channel_update as valid
 										};
-										fail_channel_update = if is_chan_update_invalid {
+										network_update = if is_chan_update_invalid {
 											// This probably indicates the node which forwarded
 											// to the node in question corrupted something.
 											Some(NetworkUpdate::ChannelClosed {
@@ -428,10 +428,10 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(secp_ctx: &
 									}
 								}
 							}
-							if fail_channel_update.is_none() {
+							if network_update.is_none() {
 								// They provided an UPDATE which was obviously bogus, not worth
 								// trying to relay through them anymore.
-								fail_channel_update = Some(NetworkUpdate::NodeFailure {
+								network_update = Some(NetworkUpdate::NodeFailure {
 									node_id: route_hop.pubkey,
 									is_permanent: true,
 								});
@@ -440,7 +440,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(secp_ctx: &
 							// We can't understand their error messages and they failed to
 							// forward...they probably can't understand our forwards so its
 							// really not worth trying any further.
-							fail_channel_update = Some(NetworkUpdate::NodeFailure {
+							network_update = Some(NetworkUpdate::NodeFailure {
 								node_id: route_hop.pubkey,
 								is_permanent: true,
 							});
@@ -449,7 +449,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(secp_ctx: &
 						// TODO: Here (and a few other places) we assume that BADONION errors
 						// are always "sourced" from the node previous to the one which failed
 						// to decode the onion.
-						res = Some((fail_channel_update, !(error_code & PERM == PERM && is_from_final_node)));
+						res = Some((network_update, !(error_code & PERM == PERM && is_from_final_node)));
 
 						let (description, title) = errors::get_onion_error_description(error_code);
 						if debug_field_size > 0 && err_packet.failuremsg.len() >= 4 + debug_field_size {