Skip to content

Commit 3c0a1d7

Browse files
committed
Replace wire::Message's Writeable implementation with unreachable!
Previously, we seemingly implemented `Writeable` for `Message<T>` which however wasn't ever used. It seems this might have only been addded to satisfy the `Type: Writeable` trait bound (?). In any case, having this legit looking implementation that doesn't actually do anything is very confusing. Here, as a quick fix, we hence simply replace it with an `unreachable!` statement.
1 parent bb5504e commit 3c0a1d7

File tree

1 file changed

+2
-57
lines changed

1 file changed

+2
-57
lines changed

lightning/src/ln/wire.rs

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -109,63 +109,8 @@ pub(crate) enum Message<T: core::fmt::Debug + Type + TestEq> {
109109
}
110110

111111
impl<T: core::fmt::Debug + Type + TestEq> Writeable for Message<T> {
112-
fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
113-
match self {
114-
&Message::Init(ref msg) => msg.write(writer),
115-
&Message::Error(ref msg) => msg.write(writer),
116-
&Message::Warning(ref msg) => msg.write(writer),
117-
&Message::Ping(ref msg) => msg.write(writer),
118-
&Message::Pong(ref msg) => msg.write(writer),
119-
&Message::PeerStorage(ref msg) => msg.write(writer),
120-
&Message::PeerStorageRetrieval(ref msg) => msg.write(writer),
121-
&Message::OpenChannel(ref msg) => msg.write(writer),
122-
&Message::OpenChannelV2(ref msg) => msg.write(writer),
123-
&Message::AcceptChannel(ref msg) => msg.write(writer),
124-
&Message::AcceptChannelV2(ref msg) => msg.write(writer),
125-
&Message::FundingCreated(ref msg) => msg.write(writer),
126-
&Message::FundingSigned(ref msg) => msg.write(writer),
127-
&Message::Stfu(ref msg) => msg.write(writer),
128-
&Message::SpliceInit(ref msg) => msg.write(writer),
129-
&Message::SpliceAck(ref msg) => msg.write(writer),
130-
&Message::SpliceLocked(ref msg) => msg.write(writer),
131-
&Message::TxAddInput(ref msg) => msg.write(writer),
132-
&Message::TxAddOutput(ref msg) => msg.write(writer),
133-
&Message::TxRemoveInput(ref msg) => msg.write(writer),
134-
&Message::TxRemoveOutput(ref msg) => msg.write(writer),
135-
&Message::TxComplete(ref msg) => msg.write(writer),
136-
&Message::TxSignatures(ref msg) => msg.write(writer),
137-
&Message::TxInitRbf(ref msg) => msg.write(writer),
138-
&Message::TxAckRbf(ref msg) => msg.write(writer),
139-
&Message::TxAbort(ref msg) => msg.write(writer),
140-
&Message::ChannelReady(ref msg) => msg.write(writer),
141-
&Message::Shutdown(ref msg) => msg.write(writer),
142-
&Message::ClosingSigned(ref msg) => msg.write(writer),
143-
#[cfg(simple_close)]
144-
&Message::ClosingComplete(ref msg) => msg.write(writer),
145-
#[cfg(simple_close)]
146-
&Message::ClosingSig(ref msg) => msg.write(writer),
147-
&Message::OnionMessage(ref msg) => msg.write(writer),
148-
&Message::StartBatch(ref msg) => msg.write(writer),
149-
&Message::UpdateAddHTLC(ref msg) => msg.write(writer),
150-
&Message::UpdateFulfillHTLC(ref msg) => msg.write(writer),
151-
&Message::UpdateFailHTLC(ref msg) => msg.write(writer),
152-
&Message::UpdateFailMalformedHTLC(ref msg) => msg.write(writer),
153-
&Message::CommitmentSigned(ref msg) => msg.write(writer),
154-
&Message::RevokeAndACK(ref msg) => msg.write(writer),
155-
&Message::UpdateFee(ref msg) => msg.write(writer),
156-
&Message::ChannelReestablish(ref msg) => msg.write(writer),
157-
&Message::AnnouncementSignatures(ref msg) => msg.write(writer),
158-
&Message::ChannelAnnouncement(ref msg) => msg.write(writer),
159-
&Message::NodeAnnouncement(ref msg) => msg.write(writer),
160-
&Message::ChannelUpdate(ref msg) => msg.write(writer),
161-
&Message::QueryShortChannelIds(ref msg) => msg.write(writer),
162-
&Message::ReplyShortChannelIdsEnd(ref msg) => msg.write(writer),
163-
&Message::QueryChannelRange(ref msg) => msg.write(writer),
164-
&Message::ReplyChannelRange(ref msg) => msg.write(writer),
165-
&Message::GossipTimestampFilter(ref msg) => msg.write(writer),
166-
&Message::Unknown(_) => Ok(()),
167-
&Message::Custom(ref msg) => msg.write(writer),
168-
}
112+
fn write<W: Writer>(&self, _: &mut W) -> Result<(), io::Error> {
113+
unreachable!("This is never used");
169114
}
170115
}
171116

0 commit comments

Comments
 (0)