Skip to content

Commit 50745bf

Browse files
valentinewallacevalentinewallace
committed
Rustfmt wire.rs
Easier to review the previous commit this way.
1 parent e9399d7 commit 50745bf

File tree

1 file changed

+92
-38
lines changed

1 file changed

+92
-38
lines changed

‎lightning/src/ln/wire.rs

+92-38
Original file line numberDiff line numberDiff line change
@@ -262,49 +262,101 @@ where
262262
msgs::WarningMessage::TYPE => Ok(Message::Warning(Readable::read(buffer)?)),
263263
msgs::Ping::TYPE => Ok(Message::Ping(Readable::read(buffer)?)),
264264
msgs::Pong::TYPE => Ok(Message::Pong(Readable::read(buffer)?)),
265-
msgs::PeerStorage::TYPE => Ok(Message::PeerStorage(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
266-
msgs::PeerStorageRetrieval::TYPE => {
267-
Ok(Message::PeerStorageRetrieval(LengthReadable::read_from_fixed_length_buffer(buffer)?))
265+
msgs::PeerStorage::TYPE => {
266+
Ok(Message::PeerStorage(LengthReadable::read_from_fixed_length_buffer(buffer)?))
268267
},
268+
msgs::PeerStorageRetrieval::TYPE => Ok(Message::PeerStorageRetrieval(
269+
LengthReadable::read_from_fixed_length_buffer(buffer)?,
270+
)),
269271
msgs::OpenChannel::TYPE => Ok(Message::OpenChannel(Readable::read(buffer)?)),
270272
msgs::OpenChannelV2::TYPE => Ok(Message::OpenChannelV2(Readable::read(buffer)?)),
271273
msgs::AcceptChannel::TYPE => Ok(Message::AcceptChannel(Readable::read(buffer)?)),
272274
msgs::AcceptChannelV2::TYPE => Ok(Message::AcceptChannelV2(Readable::read(buffer)?)),
273-
msgs::FundingCreated::TYPE => Ok(Message::FundingCreated(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
274-
msgs::FundingSigned::TYPE => Ok(Message::FundingSigned(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
275+
msgs::FundingCreated::TYPE => {
276+
Ok(Message::FundingCreated(LengthReadable::read_from_fixed_length_buffer(buffer)?))
277+
},
278+
msgs::FundingSigned::TYPE => {
279+
Ok(Message::FundingSigned(LengthReadable::read_from_fixed_length_buffer(buffer)?))
280+
},
275281
#[cfg(splicing)]
276-
msgs::SpliceInit::TYPE => Ok(Message::SpliceInit(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
277-
msgs::Stfu::TYPE => Ok(Message::Stfu(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
282+
msgs::SpliceInit::TYPE => {
283+
Ok(Message::SpliceInit(LengthReadable::read_from_fixed_length_buffer(buffer)?))
284+
},
285+
msgs::Stfu::TYPE => {
286+
Ok(Message::Stfu(LengthReadable::read_from_fixed_length_buffer(buffer)?))
287+
},
278288
#[cfg(splicing)]
279-
msgs::SpliceAck::TYPE => Ok(Message::SpliceAck(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
289+
msgs::SpliceAck::TYPE => {
290+
Ok(Message::SpliceAck(LengthReadable::read_from_fixed_length_buffer(buffer)?))
291+
},
280292
#[cfg(splicing)]
281-
msgs::SpliceLocked::TYPE => Ok(Message::SpliceLocked(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
282-
msgs::TxAddInput::TYPE => Ok(Message::TxAddInput(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
283-
msgs::TxAddOutput::TYPE => Ok(Message::TxAddOutput(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
284-
msgs::TxRemoveInput::TYPE => Ok(Message::TxRemoveInput(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
285-
msgs::TxRemoveOutput::TYPE => Ok(Message::TxRemoveOutput(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
286-
msgs::TxComplete::TYPE => Ok(Message::TxComplete(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
287-
msgs::TxSignatures::TYPE => Ok(Message::TxSignatures(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
288-
msgs::TxInitRbf::TYPE => Ok(Message::TxInitRbf(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
289-
msgs::TxAckRbf::TYPE => Ok(Message::TxAckRbf(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
290-
msgs::TxAbort::TYPE => Ok(Message::TxAbort(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
291-
msgs::ChannelReady::TYPE => Ok(Message::ChannelReady(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
292-
msgs::Shutdown::TYPE => Ok(Message::Shutdown(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
293-
msgs::ClosingSigned::TYPE => Ok(Message::ClosingSigned(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
293+
msgs::SpliceLocked::TYPE => {
294+
Ok(Message::SpliceLocked(LengthReadable::read_from_fixed_length_buffer(buffer)?))
295+
},
296+
msgs::TxAddInput::TYPE => {
297+
Ok(Message::TxAddInput(LengthReadable::read_from_fixed_length_buffer(buffer)?))
298+
},
299+
msgs::TxAddOutput::TYPE => {
300+
Ok(Message::TxAddOutput(LengthReadable::read_from_fixed_length_buffer(buffer)?))
301+
},
302+
msgs::TxRemoveInput::TYPE => {
303+
Ok(Message::TxRemoveInput(LengthReadable::read_from_fixed_length_buffer(buffer)?))
304+
},
305+
msgs::TxRemoveOutput::TYPE => {
306+
Ok(Message::TxRemoveOutput(LengthReadable::read_from_fixed_length_buffer(buffer)?))
307+
},
308+
msgs::TxComplete::TYPE => {
309+
Ok(Message::TxComplete(LengthReadable::read_from_fixed_length_buffer(buffer)?))
310+
},
311+
msgs::TxSignatures::TYPE => {
312+
Ok(Message::TxSignatures(LengthReadable::read_from_fixed_length_buffer(buffer)?))
313+
},
314+
msgs::TxInitRbf::TYPE => {
315+
Ok(Message::TxInitRbf(LengthReadable::read_from_fixed_length_buffer(buffer)?))
316+
},
317+
msgs::TxAckRbf::TYPE => {
318+
Ok(Message::TxAckRbf(LengthReadable::read_from_fixed_length_buffer(buffer)?))
319+
},
320+
msgs::TxAbort::TYPE => {
321+
Ok(Message::TxAbort(LengthReadable::read_from_fixed_length_buffer(buffer)?))
322+
},
323+
msgs::ChannelReady::TYPE => {
324+
Ok(Message::ChannelReady(LengthReadable::read_from_fixed_length_buffer(buffer)?))
325+
},
326+
msgs::Shutdown::TYPE => {
327+
Ok(Message::Shutdown(LengthReadable::read_from_fixed_length_buffer(buffer)?))
328+
},
329+
msgs::ClosingSigned::TYPE => {
330+
Ok(Message::ClosingSigned(LengthReadable::read_from_fixed_length_buffer(buffer)?))
331+
},
294332
msgs::OnionMessage::TYPE => Ok(Message::OnionMessage(Readable::read(buffer)?)),
295-
msgs::UpdateAddHTLC::TYPE => Ok(Message::UpdateAddHTLC(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
296-
msgs::UpdateFulfillHTLC::TYPE => Ok(Message::UpdateFulfillHTLC(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
297-
msgs::UpdateFailHTLC::TYPE => Ok(Message::UpdateFailHTLC(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
298-
msgs::UpdateFailMalformedHTLC::TYPE => {
299-
Ok(Message::UpdateFailMalformedHTLC(LengthReadable::read_from_fixed_length_buffer(buffer)?))
333+
msgs::UpdateAddHTLC::TYPE => {
334+
Ok(Message::UpdateAddHTLC(LengthReadable::read_from_fixed_length_buffer(buffer)?))
300335
},
301-
msgs::CommitmentSigned::TYPE => Ok(Message::CommitmentSigned(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
302-
msgs::RevokeAndACK::TYPE => Ok(Message::RevokeAndACK(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
303-
msgs::UpdateFee::TYPE => Ok(Message::UpdateFee(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
304-
msgs::ChannelReestablish::TYPE => Ok(Message::ChannelReestablish(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
305-
msgs::AnnouncementSignatures::TYPE => {
306-
Ok(Message::AnnouncementSignatures(LengthReadable::read_from_fixed_length_buffer(buffer)?))
336+
msgs::UpdateFulfillHTLC::TYPE => {
337+
Ok(Message::UpdateFulfillHTLC(LengthReadable::read_from_fixed_length_buffer(buffer)?))
307338
},
339+
msgs::UpdateFailHTLC::TYPE => {
340+
Ok(Message::UpdateFailHTLC(LengthReadable::read_from_fixed_length_buffer(buffer)?))
341+
},
342+
msgs::UpdateFailMalformedHTLC::TYPE => Ok(Message::UpdateFailMalformedHTLC(
343+
LengthReadable::read_from_fixed_length_buffer(buffer)?,
344+
)),
345+
msgs::CommitmentSigned::TYPE => {
346+
Ok(Message::CommitmentSigned(LengthReadable::read_from_fixed_length_buffer(buffer)?))
347+
},
348+
msgs::RevokeAndACK::TYPE => {
349+
Ok(Message::RevokeAndACK(LengthReadable::read_from_fixed_length_buffer(buffer)?))
350+
},
351+
msgs::UpdateFee::TYPE => {
352+
Ok(Message::UpdateFee(LengthReadable::read_from_fixed_length_buffer(buffer)?))
353+
},
354+
msgs::ChannelReestablish::TYPE => {
355+
Ok(Message::ChannelReestablish(LengthReadable::read_from_fixed_length_buffer(buffer)?))
356+
},
357+
msgs::AnnouncementSignatures::TYPE => Ok(Message::AnnouncementSignatures(
358+
LengthReadable::read_from_fixed_length_buffer(buffer)?,
359+
)),
308360
msgs::ChannelAnnouncement::TYPE => {
309361
Ok(Message::ChannelAnnouncement(Readable::read(buffer)?))
310362
},
@@ -313,14 +365,16 @@ where
313365
msgs::QueryShortChannelIds::TYPE => {
314366
Ok(Message::QueryShortChannelIds(Readable::read(buffer)?))
315367
},
316-
msgs::ReplyShortChannelIdsEnd::TYPE => {
317-
Ok(Message::ReplyShortChannelIdsEnd(LengthReadable::read_from_fixed_length_buffer(buffer)?))
368+
msgs::ReplyShortChannelIdsEnd::TYPE => Ok(Message::ReplyShortChannelIdsEnd(
369+
LengthReadable::read_from_fixed_length_buffer(buffer)?,
370+
)),
371+
msgs::QueryChannelRange::TYPE => {
372+
Ok(Message::QueryChannelRange(LengthReadable::read_from_fixed_length_buffer(buffer)?))
318373
},
319-
msgs::QueryChannelRange::TYPE => Ok(Message::QueryChannelRange(LengthReadable::read_from_fixed_length_buffer(buffer)?)),
320374
msgs::ReplyChannelRange::TYPE => Ok(Message::ReplyChannelRange(Readable::read(buffer)?)),
321-
msgs::GossipTimestampFilter::TYPE => {
322-
Ok(Message::GossipTimestampFilter(LengthReadable::read_from_fixed_length_buffer(buffer)?))
323-
},
375+
msgs::GossipTimestampFilter::TYPE => Ok(Message::GossipTimestampFilter(
376+
LengthReadable::read_from_fixed_length_buffer(buffer)?,
377+
)),
324378
_ => {
325379
if let Some(custom) = custom_reader.read(message_type, buffer)? {
326380
Ok(Message::Custom(custom))

0 commit comments

Comments
 (0)