X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fevents.rs;h=d63dd88b76163c86fd16410e468eb03f7d95fcc6;hb=bb9df69d0d91cf5ea4cef6b81ab2edd9baddb6be;hp=1780483cb8b9e01bcab8d5f0c18e812522d27a7f;hpb=853007800ebb433f53b5b10e1a941cc65c04e829;p=rust-lightning

diff --git a/lightning/src/util/events.rs b/lightning/src/util/events.rs
index 1780483c..d63dd88b 100644
--- a/lightning/src/util/events.rs
+++ b/lightning/src/util/events.rs
@@ -14,9 +14,10 @@
 //! future, as well as generate and broadcast funding transactions handle payment preimages and a
 //! few other things.
 
+use chain::keysinterface::SpendableOutputDescriptor;
 use ln::msgs;
 use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
-use chain::keysinterface::SpendableOutputDescriptor;
+use routing::network_graph::NetworkUpdate;
 use util::ser::{Writeable, Writer, MaybeReadable, Readable, VecReadWrapper, VecWriteWrapper};
 
 use bitcoin::blockdata::script::Script;
@@ -128,6 +129,15 @@ pub enum Event {
 		/// the payment has failed, not just the route in question. If this is not set, you may
 		/// retry the payment via a different route.
 		rejected_by_dest: bool,
+		/// Any failure information conveyed via the Onion return packet by a node along the failed
+		/// payment route.
+		///
+		/// Should be applied to the [`NetworkGraph`] so that routing decisions can take into
+		/// account the update. [`NetGraphMsgHandler`] is capable of doing this.
+		///
+		/// [`NetworkGraph`]: crate::routing::network_graph::NetworkGraph
+		/// [`NetGraphMsgHandler`]: crate::routing::network_graph::NetGraphMsgHandler
+		network_update: Option<NetworkUpdate>,
 #[cfg(test)]
 		error_code: Option<u16>,
 #[cfg(test)]
@@ -211,7 +221,7 @@ impl Writeable for Event {
 					(0, payment_preimage, required),
 				});
 			},
-			&Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
+			&Event::PaymentFailed { ref payment_hash, ref rejected_by_dest, ref network_update,
 				#[cfg(test)]
 				ref error_code,
 				#[cfg(test)]
@@ -224,6 +234,7 @@ impl Writeable for Event {
 				error_data.write(writer)?;
 				write_tlv_fields!(writer, {
 					(0, payment_hash, required),
+					(1, network_update, option),
 					(2, rejected_by_dest, required),
 				});
 			},
@@ -307,13 +318,16 @@ impl MaybeReadable for Event {
 					let error_data = Readable::read(reader)?;
 					let mut payment_hash = PaymentHash([0; 32]);
 					let mut rejected_by_dest = false;
+					let mut network_update = None;
 					read_tlv_fields!(reader, {
 						(0, payment_hash, required),
+						(1, network_update, ignorable),
 						(2, rejected_by_dest, required),
 					});
 					Ok(Some(Event::PaymentFailed {
 						payment_hash,
 						rejected_by_dest,
+						network_update,
 						#[cfg(test)]
 						error_code,
 						#[cfg(test)]
@@ -485,12 +499,6 @@ pub enum MessageSendEvent {
 		/// The action which should be taken.
 		action: msgs::ErrorAction
 	},
-	/// When a payment fails we may receive updates back from the hop where it failed. In such
-	/// cases this event is generated so that we can inform the network graph of this information.
-	PaymentFailureNetworkUpdate {
-		/// The channel/node update which should be sent to NetGraphMsgHandler
-		update: msgs::HTLCFailChannelUpdate,
-	},
 	/// Query a peer for channels with funding transaction UTXOs in a block range.
 	SendChannelRangeQuery {
 		/// The node_id of this message recipient
@@ -561,11 +569,11 @@ pub trait EventHandler {
 	/// Handles the given [`Event`].
 	///
 	/// See [`EventsProvider`] for details that must be considered when implementing this method.
-	fn handle_event(&self, event: Event);
+	fn handle_event(&self, event: &Event);
 }
 
-impl<F> EventHandler for F where F: Fn(Event) {
-	fn handle_event(&self, event: Event) {
+impl<F> EventHandler for F where F: Fn(&Event) {
+	fn handle_event(&self, event: &Event) {
 		self(event)
 	}
 }