X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fwire.rs;h=23c6b62cff074b5f76ec00dab69a683a88259255;hb=bdbb177469c137b958b7dde4f306e1c81b2e7f63;hp=dc4eecde6306748e972657423049eef17b879929;hpb=1d2a27d11963d0d37606458169b9e59e5165f2a9;p=rust-lightning diff --git a/lightning/src/ln/wire.rs b/lightning/src/ln/wire.rs index dc4eecde..23c6b62c 100644 --- a/lightning/src/ln/wire.rs +++ b/lightning/src/ln/wire.rs @@ -60,8 +60,11 @@ pub(crate) enum Message where T: core::fmt::Debug + Type + TestEq { FundingCreated(msgs::FundingCreated), FundingSigned(msgs::FundingSigned), Stfu(msgs::Stfu), + #[cfg(dual_funding)] Splice(msgs::Splice), + #[cfg(dual_funding)] SpliceAck(msgs::SpliceAck), + #[cfg(dual_funding)] SpliceLocked(msgs::SpliceLocked), TxAddInput(msgs::TxAddInput), TxAddOutput(msgs::TxAddOutput), @@ -115,8 +118,11 @@ impl Writeable for Message where T: core::fmt::Debug + Type + TestEq { &Message::FundingCreated(ref msg) => msg.write(writer), &Message::FundingSigned(ref msg) => msg.write(writer), &Message::Stfu(ref msg) => msg.write(writer), + #[cfg(dual_funding)] &Message::Splice(ref msg) => msg.write(writer), + #[cfg(dual_funding)] &Message::SpliceAck(ref msg) => msg.write(writer), + #[cfg(dual_funding)] &Message::SpliceLocked(ref msg) => msg.write(writer), &Message::TxAddInput(ref msg) => msg.write(writer), &Message::TxAddOutput(ref msg) => msg.write(writer), @@ -170,8 +176,11 @@ impl Type for Message where T: core::fmt::Debug + Type + TestEq { &Message::FundingCreated(ref msg) => msg.type_id(), &Message::FundingSigned(ref msg) => msg.type_id(), &Message::Stfu(ref msg) => msg.type_id(), + #[cfg(dual_funding)] &Message::Splice(ref msg) => msg.type_id(), + #[cfg(dual_funding)] &Message::SpliceAck(ref msg) => msg.type_id(), + #[cfg(dual_funding)] &Message::SpliceLocked(ref msg) => msg.type_id(), &Message::TxAddInput(ref msg) => msg.type_id(), &Message::TxAddOutput(ref msg) => msg.type_id(), @@ -270,15 +279,18 @@ fn do_read(buffer: &mut R, message_type: u1 msgs::FundingSigned::TYPE => { Ok(Message::FundingSigned(Readable::read(buffer)?)) }, + #[cfg(dual_funding)] msgs::Splice::TYPE => { Ok(Message::Splice(Readable::read(buffer)?)) }, msgs::Stfu::TYPE => { Ok(Message::Stfu(Readable::read(buffer)?)) }, + #[cfg(dual_funding)] msgs::SpliceAck::TYPE => { Ok(Message::SpliceAck(Readable::read(buffer)?)) }, + #[cfg(dual_funding)] msgs::SpliceLocked::TYPE => { Ok(Message::SpliceLocked(Readable::read(buffer)?)) },