X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fmsgs.rs;h=0e5b2e07e7a4cea649bc44939a67f2c940f71779;hb=69344fab6194c76bb8e9cf8dd52808e5bc8abfcb;hp=281a2a8e977123158f5daeba45ff8666c96ec403;hpb=b5a63070f52dbd2a9cadaf638de3f0b3d702bee7;p=rust-lightning

diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs
index 281a2a8e..0e5b2e07 100644
--- a/lightning/src/ln/msgs.rs
+++ b/lightning/src/ln/msgs.rs
@@ -239,9 +239,9 @@ pub struct FundingSigned {
 	pub signature: Signature,
 }
 
-/// A funding_locked message to be sent or received from a peer
+/// A channel_ready message to be sent or received from a peer
 #[derive(Clone, Debug, PartialEq)]
-pub struct FundingLocked {
+pub struct ChannelReady {
 	/// The channel ID
 	pub channel_id: [u8; 32],
 	/// The per-commitment point of the second commitment transaction
@@ -630,7 +630,10 @@ pub struct UnsignedChannelUpdate {
 	pub fee_base_msat: u32,
 	/// The amount to fee multiplier, in micro-satoshi
 	pub fee_proportional_millionths: u32,
-	pub(crate) excess_data: Vec<u8>,
+	/// Excess data which was signed as a part of the message which we do not (yet) understand how
+	/// to decode. This is stored to ensure forward-compatibility as new fields are added to the
+	/// lightning gossip
+	pub excess_data: Vec<u8>,
 }
 /// A channel_update message to be sent or received from a peer
 #[derive(Clone, Debug, PartialEq)]
@@ -812,8 +815,8 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
 	fn handle_funding_created(&self, their_node_id: &PublicKey, msg: &FundingCreated);
 	/// Handle an incoming funding_signed message from the given peer.
 	fn handle_funding_signed(&self, their_node_id: &PublicKey, msg: &FundingSigned);
-	/// Handle an incoming funding_locked message from the given peer.
-	fn handle_funding_locked(&self, their_node_id: &PublicKey, msg: &FundingLocked);
+	/// Handle an incoming channel_ready message from the given peer.
+	fn handle_channel_ready(&self, their_node_id: &PublicKey, msg: &ChannelReady);
 
 	// Channl close:
 	/// Handle an incoming shutdown message from the given peer.
@@ -1160,7 +1163,7 @@ impl_writeable_msg!(FundingSigned, {
 	signature
 }, {});
 
-impl_writeable_msg!(FundingLocked, {
+impl_writeable_msg!(ChannelReady, {
 	channel_id,
 	next_per_commitment_point,
 }, {
@@ -2259,15 +2262,15 @@ mod tests {
 	}
 
 	#[test]
-	fn encoding_funding_locked() {
+	fn encoding_channel_ready() {
 		let secp_ctx = Secp256k1::new();
 		let (_, pubkey_1,) = get_keys_from!("0101010101010101010101010101010101010101010101010101010101010101", secp_ctx);
-		let funding_locked = msgs::FundingLocked {
+		let channel_ready = msgs::ChannelReady {
 			channel_id: [2; 32],
 			next_per_commitment_point: pubkey_1,
 			short_channel_id_alias: None,
 		};
-		let encoded_value = funding_locked.encode();
+		let encoded_value = channel_ready.encode();
 		let target_value = hex::decode("0202020202020202020202020202020202020202020202020202020202020202031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f").unwrap();
 		assert_eq!(encoded_value, target_value);
 	}