Skip to content

Commit bff159f

Browse files
committed
f - define try_from_tlv_stream_bytes
1 parent e785840 commit bff159f

File tree

3 files changed

+33
-23
lines changed

3 files changed

+33
-23
lines changed

lightning/src/offers/invoice_request.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -333,15 +333,8 @@ impl TryFrom<Vec<u8>> for InvoiceRequest {
333333
type Error = ParseError;
334334

335335
fn try_from(bytes: Vec<u8>) -> Result<Self, Self::Error> {
336-
let mut cursor = io::Cursor::new(bytes);
337-
let tlv_stream: FullInvoiceRequestTlvStream = SeekReadable::read(&mut cursor)?;
338-
339-
if cursor.position() < cursor.get_ref().len() as u64 {
340-
return Err(ParseError::Decode(DecodeError::InvalidValue));
341-
}
342-
343-
let bytes = cursor.into_inner();
344-
InvoiceRequest::try_from((bytes, tlv_stream))
336+
let parsed_invoice_request = ParsedInvoiceRequest::try_from(bytes)?;
337+
InvoiceRequest::try_from(parsed_invoice_request)
345338
}
346339
}
347340

@@ -354,7 +347,9 @@ tlv_stream!(InvoiceRequestTlvStream, InvoiceRequestTlvStreamRef, 80..160, {
354347
(89, payer_note: (String, WithoutLength)),
355348
});
356349

357-
type ParsedInvoiceRequest = (Vec<u8>, FullInvoiceRequestTlvStream);
350+
try_from_tlv_stream_bytes!(FullInvoiceRequestTlvStream, ParsedInvoiceRequest);
351+
352+
struct ParsedInvoiceRequest(Vec<u8>, FullInvoiceRequestTlvStream);
358353

359354
type FullInvoiceRequestTlvStream =
360355
(PayerTlvStream, OfferTlvStream, InvoiceRequestTlvStream, SignatureTlvStream);
@@ -382,7 +377,7 @@ impl TryFrom<ParsedInvoiceRequest> for InvoiceRequest {
382377
type Error = ParseError;
383378

384379
fn try_from(invoice_request: ParsedInvoiceRequest) -> Result<Self, Self::Error> {
385-
let (bytes, tlv_stream) = invoice_request;
380+
let ParsedInvoiceRequest(bytes, tlv_stream) = invoice_request;
386381
let (
387382
payer_tlv_stream, offer_tlv_stream, invoice_request_tlv_stream,
388383
SignatureTlvStream { signature },

lightning/src/offers/offer.rs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ use core::str::FromStr;
7575
use core::time::Duration;
7676
use crate::io;
7777
use crate::ln::features::OfferFeatures;
78-
use crate::ln::msgs::{DecodeError, MAX_VALUE_MSAT};
78+
use crate::ln::msgs::MAX_VALUE_MSAT;
7979
use crate::offers::invoice_request::InvoiceRequestBuilder;
8080
use crate::offers::parse::{Bech32Encode, ParseError, SemanticError};
8181
use crate::onion_message::BlindedPath;
@@ -450,15 +450,8 @@ impl TryFrom<Vec<u8>> for Offer {
450450
type Error = ParseError;
451451

452452
fn try_from(bytes: Vec<u8>) -> Result<Self, Self::Error> {
453-
let mut cursor = io::Cursor::new(bytes);
454-
let tlv_stream: OfferTlvStream = SeekReadable::read(&mut cursor)?;
455-
456-
if cursor.position() < cursor.get_ref().len() as u64 {
457-
return Err(ParseError::Decode(DecodeError::InvalidValue));
458-
}
459-
460-
let bytes = cursor.into_inner();
461-
Offer::try_from((bytes, tlv_stream))
453+
let parsed_offer = ParsedOffer::try_from(bytes)?;
454+
Offer::try_from(parsed_offer)
462455
}
463456
}
464457

@@ -537,11 +530,13 @@ tlv_stream!(OfferTlvStream, OfferTlvStreamRef, 1..80, {
537530
(22, node_id: PublicKey),
538531
});
539532

533+
try_from_tlv_stream_bytes!(OfferTlvStream, ParsedOffer);
534+
540535
impl Bech32Encode for Offer {
541536
const BECH32_HRP: &'static str = "lno";
542537
}
543538

544-
type ParsedOffer = (Vec<u8>, OfferTlvStream);
539+
struct ParsedOffer(Vec<u8>, OfferTlvStream);
545540

546541
impl FromStr for Offer {
547542
type Err = ParseError;
@@ -555,7 +550,7 @@ impl TryFrom<ParsedOffer> for Offer {
555550
type Error = ParseError;
556551

557552
fn try_from(offer: ParsedOffer) -> Result<Self, Self::Error> {
558-
let (bytes, tlv_stream) = offer;
553+
let ParsedOffer(bytes, tlv_stream) = offer;
559554
let contents = OfferContents::try_from(tlv_stream)?;
560555
Ok(Offer { bytes, contents })
561556
}

lightning/src/util/ser_macros.rs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,26 @@ macro_rules! tlv_record_ref_type {
551551
($type:ty) => { &'a $type };
552552
}
553553

554+
macro_rules! try_from_tlv_stream_bytes {
555+
($tlv_stream:ty, $parsed_message:ident) => {
556+
impl TryFrom<Vec<u8>> for $parsed_message {
557+
type Error = $crate::ln::msgs::DecodeError;
558+
559+
fn try_from(bytes: Vec<u8>) -> Result<Self, Self::Error> {
560+
let mut cursor = $crate::io::Cursor::new(bytes);
561+
let tlv_stream: $tlv_stream = SeekReadable::read(&mut cursor)?;
562+
563+
if cursor.position() < cursor.get_ref().len() as u64 {
564+
return Err($crate::ln::msgs::DecodeError::InvalidValue);
565+
}
566+
567+
let bytes = cursor.into_inner();
568+
Ok(Self(bytes, tlv_stream))
569+
}
570+
}
571+
};
572+
}
573+
554574
macro_rules! _impl_writeable_tlv_based_enum_common {
555575
($st: ident, $(($variant_id: expr, $variant_name: ident) =>
556576
{$(($type: expr, $field: ident, $fieldty: tt)),* $(,)*}

0 commit comments

Comments
 (0)