X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fevents.rs;h=0a886b93f6e01eb3dc70c967bc8d439ee3805b84;hb=84c94a8fd90e61bc0aa27eb57997fc5f1041ccde;hp=5c00a05c370ccc477d3939209daf930ee511a4d5;hpb=0a2a40c4fd05f39b9485cc0f000f7066636783cb;p=rust-lightning

diff --git a/lightning/src/util/events.rs b/lightning/src/util/events.rs
index 5c00a05c..0a886b93 100644
--- a/lightning/src/util/events.rs
+++ b/lightning/src/util/events.rs
@@ -209,7 +209,7 @@ pub enum Event {
 		/// not stop you from registering duplicate payment hashes for inbound payments.
 		payment_hash: PaymentHash,
 		/// The value, in thousandths of a satoshi, that this payment is for.
-		amt: u64,
+		amount_msat: u64,
 		/// Information for claiming this received payment, based on whether the purpose of the
 		/// payment is to pay an invoice or to send a spontaneous payment.
 		purpose: PaymentPurpose,
@@ -233,7 +233,7 @@ pub enum Event {
 		/// registering duplicate payment hashes for inbound payments.
 		payment_hash: PaymentHash,
 		/// The value, in thousandths of a satoshi, that this payment is for.
-		amt: u64,
+		amount_msat: u64,
 		/// The purpose of this claimed payment, i.e. whether the payment was for an invoice or a
 		/// spontaneous payment.
 		purpose: PaymentPurpose,
@@ -364,6 +364,10 @@ pub enum Event {
 		path: Vec<RouteHop>,
 		/// The channel responsible for the failed payment path.
 		///
+		/// Note that for route hints or for the first hop in a path this may be an SCID alias and
+		/// may not refer to a channel in the public network graph. These aliases may also collide
+		/// with channels in the public network graph.
+		///
 		/// If this is `Some`, then the corresponding channel should be avoided when the payment is
 		/// retried. May be `None` for older [`Event`] serializations.
 		short_channel_id: Option<u64>,
@@ -508,7 +512,7 @@ impl Writeable for Event {
 				// We never write out FundingGenerationReady events as, upon disconnection, peers
 				// drop any channels which have not yet exchanged funding_signed.
 			},
-			&Event::PaymentReceived { ref payment_hash, ref amt, ref purpose } => {
+			&Event::PaymentReceived { ref payment_hash, ref amount_msat, ref purpose } => {
 				1u8.write(writer)?;
 				let mut payment_secret = None;
 				let payment_preimage;
@@ -524,7 +528,7 @@ impl Writeable for Event {
 				write_tlv_fields!(writer, {
 					(0, payment_hash, required),
 					(2, payment_secret, option),
-					(4, amt, required),
+					(4, amount_msat, required),
 					(6, 0u64, required), // user_payment_id required for compatibility with 0.0.103 and earlier
 					(8, payment_preimage, option),
 				});
@@ -617,12 +621,12 @@ impl Writeable for Event {
 				// We never write the OpenChannelRequest events as, upon disconnection, peers
 				// drop any channels which have not yet exchanged funding_signed.
 			},
-			&Event::PaymentClaimed { ref payment_hash, ref amt, ref purpose } => {
+			&Event::PaymentClaimed { ref payment_hash, ref amount_msat, ref purpose } => {
 				19u8.write(writer)?;
 				write_tlv_fields!(writer, {
 					(0, payment_hash, required),
 					(2, purpose, required),
-					(4, amt, required),
+					(4, amount_msat, required),
 				});
 			},
 			// Note that, going forward, all new events must only write data inside of
@@ -643,12 +647,12 @@ impl MaybeReadable for Event {
 					let mut payment_hash = PaymentHash([0; 32]);
 					let mut payment_preimage = None;
 					let mut payment_secret = None;
-					let mut amt = 0;
+					let mut amount_msat = 0;
 					let mut _user_payment_id = None::<u64>; // For compatibility with 0.0.103 and earlier
 					read_tlv_fields!(reader, {
 						(0, payment_hash, required),
 						(2, payment_secret, option),
-						(4, amt, required),
+						(4, amount_msat, required),
 						(6, _user_payment_id, option),
 						(8, payment_preimage, option),
 					});
@@ -662,7 +666,7 @@ impl MaybeReadable for Event {
 					};
 					Ok(Some(Event::PaymentReceived {
 						payment_hash,
-						amt,
+						amount_msat,
 						purpose,
 					}))
 				};
@@ -829,17 +833,17 @@ impl MaybeReadable for Event {
 				let f = || {
 					let mut payment_hash = PaymentHash([0; 32]);
 					let mut purpose = None;
-					let mut amt = 0;
+					let mut amount_msat = 0;
 					read_tlv_fields!(reader, {
 						(0, payment_hash, required),
 						(2, purpose, ignorable),
-						(4, amt, required),
+						(4, amount_msat, required),
 					});
 					if purpose.is_none() { return Ok(None); }
 					Ok(Some(Event::PaymentClaimed {
 						payment_hash,
 						purpose: purpose.unwrap(),
-						amt,
+						amount_msat,
 					}))
 				};
 				f()
@@ -898,12 +902,12 @@ pub enum MessageSendEvent {
 		/// The message which should be sent.
 		msg: msgs::FundingSigned,
 	},
-	/// Used to indicate that a funding_locked message should be sent to the peer with the given node_id.
-	SendFundingLocked {
+	/// Used to indicate that a channel_ready message should be sent to the peer with the given node_id.
+	SendChannelReady {
 		/// The node_id of the node which should receive these message(s)
 		node_id: PublicKey,
-		/// The funding_locked message which should be sent.
-		msg: msgs::FundingLocked,
+		/// The channel_ready message which should be sent.
+		msg: msgs::ChannelReady,
 	},
 	/// Used to indicate that an announcement_signatures message should be sent to the peer with the given node_id.
 	SendAnnouncementSignatures {