Skip to content

Commit 00ffa43

Browse files
committed
Fix loop label shadowing warning
1 parent 74a9be6 commit 00ffa43

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

lightning/src/util/events.rs

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -480,23 +480,29 @@ impl MaybeReadable for Event {
480480
f()
481481
},
482482
9u8 => {
483-
let mut channel_id = [0; 32];
484-
let mut reason = None;
485-
read_tlv_fields!(reader, {
486-
(0, channel_id, required),
487-
(2, reason, ignorable),
488-
});
489-
if reason.is_none() { return Ok(None); }
490-
Ok(Some(Event::ChannelClosed { channel_id, reason: reason.unwrap() }))
483+
let f = || {
484+
let mut channel_id = [0; 32];
485+
let mut reason = None;
486+
read_tlv_fields!(reader, {
487+
(0, channel_id, required),
488+
(2, reason, ignorable),
489+
});
490+
if reason.is_none() { return Ok(None); }
491+
Ok(Some(Event::ChannelClosed { channel_id, reason: reason.unwrap() }))
492+
};
493+
f()
491494
},
492495
11u8 => {
493-
let mut channel_id = [0; 32];
494-
let mut transaction = Transaction{ version: 2, lock_time: 0, input: Vec::new(), output: Vec::new() };
495-
read_tlv_fields!(reader, {
496-
(0, channel_id, required),
497-
(2, transaction, required),
498-
});
499-
Ok(Some(Event::DiscardFunding { channel_id, transaction } ))
496+
let f = || {
497+
let mut channel_id = [0; 32];
498+
let mut transaction = Transaction{ version: 2, lock_time: 0, input: Vec::new(), output: Vec::new() };
499+
read_tlv_fields!(reader, {
500+
(0, channel_id, required),
501+
(2, transaction, required),
502+
});
503+
Ok(Some(Event::DiscardFunding { channel_id, transaction } ))
504+
};
505+
f()
500506
},
501507
// Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
502508
// Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt

0 commit comments

Comments
 (0)