Some cleanup

Author: philipr-za

src/ln/channelmanager.rs

@@ -1941,6 +1941,7 @@ impl ChannelManager {
 					// If the update_add is completely bogus, the call will Err and we will close,
 					// but if we've sent a shutdown and they haven't acknowledged it yet, we just
 					// want to reject the new HTLC and fail it backwards instead of forwarding.
+					println!("Channel no usable");
 					if let PendingHTLCStatus::Forward(PendingForwardHTLCInfo { incoming_shared_secret, .. }) = pending_forward_info {
 						pending_forward_info = PendingHTLCStatus::Fail(HTLCFailureMsg::Relay(msgs::UpdateFailHTLC {
 							channel_id: msg.channel_id,
@@ -1949,6 +1950,7 @@ impl ChannelManager {
 						}));
 					}
 				}
+				println!("just update_add_htlc");
 				chan.update_add_htlc(&msg, pending_forward_info).map_err(|e| MsgHandleErrInternal::from_maybe_close(e))
 			},
 			None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
@@ -7555,12 +7557,11 @@ mod tests {
 		}).expect("RNG is bad!");
 
 		let cur_height = nodes[0].node.latest_block_height.load(Ordering::Acquire) as u32 + 1;
-
 		let onion_keys = ChannelManager::construct_onion_keys(&secp_ctx, &route, &session_priv).unwrap();
-
 		let (onion_payloads, htlc_msat, htlc_cltv) = ChannelManager::build_onion_payloads(&route, cur_height).unwrap();
 		let mut onion_packet = ChannelManager::construct_onion_packet(onion_payloads, onion_keys, &our_payment_preimage);
 
+		//Introduce an incorrect onion_packet_version
 		onion_packet.version = 1;
 
 		let mut channel_state = nodes[0].node.channel_state.lock().unwrap();
@@ -7570,14 +7571,15 @@ mod tests {
 				route: route.clone(),
 				session_priv: session_priv.clone(),
 				first_hop_htlc_msat: htlc_msat,
-			}, onion_packet).unwrap().unwrap()//.map_err(|he| APIError::ChannelUnavailable{err: he.err}).unwrap()
+			}, onion_packet).unwrap().unwrap()
 		};
 
 		println!("Mesg: {:?}", update_add.onion_routing_packet.version);
 
 		let res = nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(),&update_add);
-		//This does create a PendingHTLCStatus::Fail situation that seems is maybe sent back to the node
-		//and is finally handled in channel::revoke_and_ack(...)
+
+
+
 
 		println!("Bolt4: {:?}", res);