X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fmsgs.rs;h=515dcbba2d2e136846697dc990d582270e07e1d4;hb=495c38c0d9fd6eb7e52ad83c5634d91af33fe446;hp=b6ec022dc14fed1b62281e3b4358677245f78e33;hpb=9e4a35a60d96930c73538e960e48209ac535e7ab;p=rust-lightning diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs index b6ec022d..515dcbba 100644 --- a/lightning/src/ln/msgs.rs +++ b/lightning/src/ln/msgs.rs @@ -1987,10 +1987,8 @@ impl Writeable for OutboundOnionPayload { // We need to update [`ln::outbound_payment::RecipientOnionFields::with_custom_tlvs`] // to reject any reserved types in the experimental range if new ones are ever // standardized. - let preimage = if let Some(ref preimage) = keysend_preimage { - Some((5482373484, preimage.encode())) - } else { None }; - let mut custom_tlvs: Vec<&(u64, Vec)> = custom_tlvs.iter().chain(preimage.iter()).collect(); + let keysend_tlv = keysend_preimage.map(|preimage| (5482373484, preimage.encode())); + let mut custom_tlvs: Vec<&(u64, Vec)> = custom_tlvs.iter().chain(keysend_tlv.iter()).collect(); custom_tlvs.sort_unstable_by_key(|(typ, _)| *typ); _encode_varint_length_prefixed_tlv!(w, { (2, HighZeroBytesDroppedBigSize(*amt_msat), required),