X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fwire.rs;h=55e31399ae10074d2e72f1b04a4c1c71ed1808df;hb=d00e55077aa613457b6cc1957238a91a700873f8;hp=1a01e33826dbb9790086afb1063219ea2f42c98c;hpb=7b64527b16c846fe41af5d83bf5477f9bd1f3e36;p=rust-lightning

diff --git a/lightning/src/ln/wire.rs b/lightning/src/ln/wire.rs
index 1a01e338..55e31399 100644
--- a/lightning/src/ln/wire.rs
+++ b/lightning/src/ln/wire.rs
@@ -59,6 +59,13 @@ pub(crate) enum Message<T> where T: core::fmt::Debug + Type + TestEq {
 	AcceptChannelV2(msgs::AcceptChannelV2),
 	FundingCreated(msgs::FundingCreated),
 	FundingSigned(msgs::FundingSigned),
+	Stfu(msgs::Stfu),
+	#[cfg(splicing)]
+	Splice(msgs::Splice),
+	#[cfg(splicing)]
+	SpliceAck(msgs::SpliceAck),
+	#[cfg(splicing)]
+	SpliceLocked(msgs::SpliceLocked),
 	TxAddInput(msgs::TxAddInput),
 	TxAddOutput(msgs::TxAddOutput),
 	TxRemoveInput(msgs::TxRemoveInput),
@@ -96,9 +103,66 @@ pub(crate) enum Message<T> where T: core::fmt::Debug + Type + TestEq {
 	Custom(T),
 }
 
-impl<T> Message<T> where T: core::fmt::Debug + Type + TestEq {
+impl<T> Writeable for Message<T> where T: core::fmt::Debug + Type + TestEq {
+	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
+		match self {
+			&Message::Init(ref msg) => msg.write(writer),
+			&Message::Error(ref msg) => msg.write(writer),
+			&Message::Warning(ref msg) => msg.write(writer),
+			&Message::Ping(ref msg) => msg.write(writer),
+			&Message::Pong(ref msg) => msg.write(writer),
+			&Message::OpenChannel(ref msg) => msg.write(writer),
+			&Message::OpenChannelV2(ref msg) => msg.write(writer),
+			&Message::AcceptChannel(ref msg) => msg.write(writer),
+			&Message::AcceptChannelV2(ref msg) => msg.write(writer),
+			&Message::FundingCreated(ref msg) => msg.write(writer),
+			&Message::FundingSigned(ref msg) => msg.write(writer),
+			&Message::Stfu(ref msg) => msg.write(writer),
+			#[cfg(splicing)]
+			&Message::Splice(ref msg) => msg.write(writer),
+			#[cfg(splicing)]
+			&Message::SpliceAck(ref msg) => msg.write(writer),
+			#[cfg(splicing)]
+			&Message::SpliceLocked(ref msg) => msg.write(writer),
+			&Message::TxAddInput(ref msg) => msg.write(writer),
+			&Message::TxAddOutput(ref msg) => msg.write(writer),
+			&Message::TxRemoveInput(ref msg) => msg.write(writer),
+			&Message::TxRemoveOutput(ref msg) => msg.write(writer),
+			&Message::TxComplete(ref msg) => msg.write(writer),
+			&Message::TxSignatures(ref msg) => msg.write(writer),
+			&Message::TxInitRbf(ref msg) => msg.write(writer),
+			&Message::TxAckRbf(ref msg) => msg.write(writer),
+			&Message::TxAbort(ref msg) => msg.write(writer),
+			&Message::ChannelReady(ref msg) => msg.write(writer),
+			&Message::Shutdown(ref msg) => msg.write(writer),
+			&Message::ClosingSigned(ref msg) => msg.write(writer),
+			&Message::OnionMessage(ref msg) => msg.write(writer),
+			&Message::UpdateAddHTLC(ref msg) => msg.write(writer),
+			&Message::UpdateFulfillHTLC(ref msg) => msg.write(writer),
+			&Message::UpdateFailHTLC(ref msg) => msg.write(writer),
+			&Message::UpdateFailMalformedHTLC(ref msg) => msg.write(writer),
+			&Message::CommitmentSigned(ref msg) => msg.write(writer),
+			&Message::RevokeAndACK(ref msg) => msg.write(writer),
+			&Message::UpdateFee(ref msg) => msg.write(writer),
+			&Message::ChannelReestablish(ref msg) => msg.write(writer),
+			&Message::AnnouncementSignatures(ref msg) => msg.write(writer),
+			&Message::ChannelAnnouncement(ref msg) => msg.write(writer),
+			&Message::NodeAnnouncement(ref msg) => msg.write(writer),
+			&Message::ChannelUpdate(ref msg) => msg.write(writer),
+			&Message::QueryShortChannelIds(ref msg) => msg.write(writer),
+			&Message::ReplyShortChannelIdsEnd(ref msg) => msg.write(writer),
+			&Message::QueryChannelRange(ref msg) => msg.write(writer),
+			&Message::ReplyChannelRange(ref msg) => msg.write(writer),
+			&Message::GossipTimestampFilter(ref msg) => msg.write(writer),
+			&Message::Unknown(_) => { Ok(()) },
+			&Message::Custom(ref msg) => msg.write(writer),
+		}
+	}
+}
+
+impl<T> Type for Message<T> where T: core::fmt::Debug + Type + TestEq {
 	/// Returns the type that was used to decode the message payload.
-	pub fn type_id(&self) -> u16 {
+	fn type_id(&self) -> u16 {
 		match self {
 			&Message::Init(ref msg) => msg.type_id(),
 			&Message::Error(ref msg) => msg.type_id(),
@@ -111,6 +175,13 @@ impl<T> Message<T> where T: core::fmt::Debug + Type + TestEq {
 			&Message::AcceptChannelV2(ref msg) => msg.type_id(),
 			&Message::FundingCreated(ref msg) => msg.type_id(),
 			&Message::FundingSigned(ref msg) => msg.type_id(),
+			&Message::Stfu(ref msg) => msg.type_id(),
+			#[cfg(splicing)]
+			&Message::Splice(ref msg) => msg.type_id(),
+			#[cfg(splicing)]
+			&Message::SpliceAck(ref msg) => msg.type_id(),
+			#[cfg(splicing)]
+			&Message::SpliceLocked(ref msg) => msg.type_id(),
 			&Message::TxAddInput(ref msg) => msg.type_id(),
 			&Message::TxAddOutput(ref msg) => msg.type_id(),
 			&Message::TxRemoveInput(ref msg) => msg.type_id(),
@@ -145,7 +216,9 @@ impl<T> Message<T> where T: core::fmt::Debug + Type + TestEq {
 			&Message::Custom(ref msg) => msg.type_id(),
 		}
 	}
+}
 
+impl<T> Message<T> where T: core::fmt::Debug + Type + TestEq {
 	/// Returns whether the message's type is even, indicating both endpoints must support it.
 	pub fn is_even(&self) -> bool {
 		(self.type_id() & 1) == 0
@@ -206,6 +279,21 @@ fn do_read<R: io::Read, T, H: core::ops::Deref>(buffer: &mut R, message_type: u1
 		msgs::FundingSigned::TYPE => {
 			Ok(Message::FundingSigned(Readable::read(buffer)?))
 		},
+		#[cfg(splicing)]
+		msgs::Splice::TYPE => {
+			Ok(Message::Splice(Readable::read(buffer)?))
+		},
+		msgs::Stfu::TYPE => {
+			Ok(Message::Stfu(Readable::read(buffer)?))
+		},
+		#[cfg(splicing)]
+		msgs::SpliceAck::TYPE => {
+			Ok(Message::SpliceAck(Readable::read(buffer)?))
+		},
+		#[cfg(splicing)]
+		msgs::SpliceLocked::TYPE => {
+			Ok(Message::SpliceLocked(Readable::read(buffer)?))
+		},
 		msgs::TxAddInput::TYPE => {
 			Ok(Message::TxAddInput(Readable::read(buffer)?))
 		},
@@ -356,6 +444,10 @@ impl<T: core::fmt::Debug + Writeable> Type for T where T: Encode {
 	fn type_id(&self) -> u16 { T::TYPE }
 }
 
+impl Encode for msgs::Stfu {
+	const TYPE: u16 = 2;
+}
+
 impl Encode for msgs::Init {
 	const TYPE: u16 = 16;
 }
@@ -412,6 +504,19 @@ impl Encode for msgs::AcceptChannelV2 {
 	const TYPE: u16 = 65;
 }
 
+impl Encode for msgs::Splice {
+	// TODO(splicing) Double check with finalized spec; draft spec contains 74, which is probably wrong as it is used by tx_Abort; CLN uses 75
+	const TYPE: u16 = 75;
+}
+
+impl Encode for msgs::SpliceAck {
+	const TYPE: u16 = 76;
+}
+
+impl Encode for msgs::SpliceLocked {
+	const TYPE: u16 = 77;
+}
+
 impl Encode for msgs::TxAddInput {
 	const TYPE: u16 = 66;
 }
@@ -524,7 +629,6 @@ impl Encode for msgs::GossipTimestampFilter {
 mod tests {
 	use super::*;
 	use crate::prelude::*;
-	use core::convert::TryInto;
 	use crate::ln::peer_handler::IgnoringMessageHandler;
 
 	// Big-endian wire encoding of Pong message (type = 19, byteslen = 2).