X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannelmanager.rs;h=d206dee4950f3f9908e0cbdd8af6755d485de2a2;hb=1a734492d955e61d43eab4407dd65f556e87ca96;hp=1c620bf407834fef3e125a63aed0acd0e075f9e5;hpb=26fe87989607ff459b7f30cd676a6a2b9f8cf1b0;p=rust-lightning

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 1c620bf4..d206dee4 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -1322,6 +1322,7 @@ pub enum PaymentSendFailure {
 /// Route hints used in constructing invoices for [phantom node payents].
 ///
 /// [phantom node payments]: crate::chain::keysinterface::PhantomKeysManager
+#[derive(Clone)]
 pub struct PhantomRouteHints {
 	/// The list of channels to be included in the invoice route hints.
 	pub channels: Vec<ChannelDetails>,
@@ -1790,7 +1791,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 		let mut channel_state = self.channel_state.lock().unwrap();
 		match channel_state.by_id.entry(temporary_channel_id) {
 			hash_map::Entry::Occupied(_) => {
-				if cfg!(feature = "fuzztarget") {
+				if cfg!(fuzzing) {
 					return Err(APIError::APIMisuseError { err: "Fuzzy bad RNG".to_owned() });
 				} else {
 					panic!("RNG is bad???");
@@ -3257,7 +3258,6 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 
 								macro_rules! check_total_value {
 									($payment_data_total_msat: expr, $payment_secret: expr, $payment_preimage: expr) => {{
-										let mut total_value = 0;
 										let mut payment_received_generated = false;
 										let htlcs = channel_state.claimable_htlcs.entry(payment_hash)
 											.or_insert(Vec::new());
@@ -3268,7 +3268,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 												continue
 											}
 										}
-										htlcs.push(claimable_htlc);
+										let mut total_value = claimable_htlc.value;
 										for htlc in htlcs.iter() {
 											total_value += htlc.value;
 											match &htlc.onion_payload {
@@ -3286,10 +3286,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 										if total_value >= msgs::MAX_VALUE_MSAT || total_value > $payment_data_total_msat {
 											log_trace!(self.logger, "Failing HTLCs with payment_hash {} as the total value {} ran over expected value {} (or HTLCs were inconsistent)",
 												log_bytes!(payment_hash.0), total_value, $payment_data_total_msat);
-											for htlc in htlcs.iter() {
-												fail_htlc!(htlc);
-											}
+											fail_htlc!(claimable_htlc);
 										} else if total_value == $payment_data_total_msat {
+											htlcs.push(claimable_htlc);
 											new_events.push(events::Event::PaymentReceived {
 												payment_hash,
 												purpose: events::PaymentPurpose::InvoicePayment {
@@ -3303,6 +3302,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 											// Nothing to do - we haven't reached the total
 											// payment value yet, wait until we receive more
 											// MPP parts.
+											htlcs.push(claimable_htlc);
 										}
 										payment_received_generated
 									}}
@@ -4504,7 +4504,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 									onion_utils::build_first_hop_failure_packet(incoming_shared_secret, error_code, &{
 										let mut res = Vec::with_capacity(8 + 128);
 										// TODO: underspecified, follow https://github.com/lightningnetwork/lightning-rfc/issues/791
-										res.extend_from_slice(&byte_utils::be16_to_array(0));
+										if error_code == 0x1000 | 20 {
+											res.extend_from_slice(&byte_utils::be16_to_array(0));
+										}
 										res.extend_from_slice(&upd.encode_with_len()[..]);
 										res
 									}[..])
@@ -4930,7 +4932,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 	/// In chanmon_consistency_target, we'd like to be able to restore monitor updating without
 	/// handling all pending events (i.e. not PendingHTLCsForwardable). Thus, we expose monitor
 	/// update events as a separate process method here.
-	#[cfg(feature = "fuzztarget")]
+	#[cfg(fuzzing)]
 	pub fn process_monitor_events(&self) {
 		self.process_pending_monitor_events();
 	}
@@ -5252,7 +5254,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 		}
 	}
 
-	#[cfg(any(test, feature = "fuzztarget", feature = "_test_utils"))]
+	#[cfg(any(test, fuzzing, feature = "_test_utils"))]
 	pub fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
 		let events = core::cell::RefCell::new(Vec::new());
 		let event_handler = |event: &events::Event| events.borrow_mut().push(event.clone());